Skip to content

Commit 9fbab59

Browse files
yDelouisyDelouis
committed
Merge pull request androidannotations#1295 from WonderCsabo/checkstyleForTestSources
Include test sources in Checkstyle audit
2 parents 3942383 + b2bc892 commit 9fbab59

67 files changed

Lines changed: 402 additions & 425 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/copyannotations/CopyOtherAnnotationsTest.java‎

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
public class CopyOtherAnnotationsTest extends AAProcessorTestHelper {
2424

2525
@Before
26-
public void setup() {
26+
public void setUp() {
2727
addManifestProcessorParameter(CopyOtherAnnotationsTest.class);
2828
addProcessor(AndroidAnnotationProcessor.class);
2929
}
@@ -35,20 +35,23 @@ public void testGeneratedClassWithCopiedAnnotationsCompiles() {
3535

3636
@Test
3737
public void testGeneratedClassHasCopiedNonAAAnnotations() {
38+
// CHECKSTYLE:OFF
3839
String[] classHeader = { //
3940
"@XmlType", //
4041
"@TestTargetClass(String.class)", //
4142
"@WebServiceRefs({", //
4243
" @WebServiceRef(type = String.class)", //
4344
"})", //
44-
"public final class HasOtherAnnotations_" };
45-
45+
"public final class HasOtherAnnotations_", };
46+
47+
// CHECKSTYLE:ON
4648
compileFiles(HasOtherAnnotations.class);
4749
assertGeneratedClassContains(toGeneratedFile(HasOtherAnnotations.class), classHeader);
4850
}
4951

5052
@Test
5153
public void testOverridenMethodHasCopiedNonAAAnnotations() {
54+
// CHECKSTYLE:OFF
5255
String[] methodSignature = { //
5356
" @Addressing(responses = (javax.xml.ws.soap.AddressingFeature.Responses.ALL))", //
5457
" @Action(input = \"someString\")", //
@@ -57,8 +60,9 @@ public void testOverridenMethodHasCopiedNonAAAnnotations() {
5760
" \"hi\"", //
5861
" })", //
5962
" @Override", //
60-
" public void onEvent(final Event event) {" };
61-
63+
" public void onEvent(final Event event) {", };
64+
// CHECKSTYLE:ON
65+
6266
compileFiles(HasOtherAnnotations.class);
6367
assertGeneratedClassContains(toGeneratedFile(HasOtherAnnotations.class), methodSignature);
6468
}
@@ -67,21 +71,23 @@ public void testOverridenMethodHasCopiedNonAAAnnotations() {
6771
public void testOverrideDoesNotAddedTwice() {
6872
addProcessorParameter("trace", "true");
6973
compileFiles(HasOtherAnnotations.class);
70-
74+
75+
// CHECKSTYLE:OFF
7176
String[] methodSignature = { //
7277
" @java.lang.Override", //
7378
" @java.lang.Override", //
74-
" public String toString() {" };
75-
79+
" public String toString() {", };
80+
// CHECKSTYLE:ON
81+
7682
assertGeneratedClassDoesNotContain(toGeneratedFile(HasOtherAnnotations.class), methodSignature);
7783
}
78-
84+
7985
@Test
8086
public void testInheritedAnnotationsNotCopied() {
8187
compileFiles(HasOtherAnnotations.class);
82-
83-
String[] annotation = { "@RunWith(Runner.class)" };
84-
88+
89+
String[] annotation = { "@RunWith(Runner.class)", };
90+
8591
assertGeneratedClassDoesNotContain(toGeneratedFile(HasOtherAnnotations.class), annotation);
8692
}
8793
}

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/EBeanTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -23,18 +23,18 @@
2323
public class EBeanTest extends AAProcessorTestHelper {
2424

2525
@Before
26-
public void setup() {
26+
public void setUp() {
2727
addManifestProcessorParameter(EBeanTest.class);
2828
addProcessor(AndroidAnnotationProcessor.class);
2929
}
3030

3131
@Test
32-
public void activity_subclass_in_manifest_compiles() {
33-
assertCompilationSuccessful(compileFiles(
34-
SomeActivity.class,
35-
SomeImplementation.class,
36-
SomeGenericBean.class,
37-
SomeGenericBeanExt.class));
38-
}
32+
public void activitySubclassInManifestCompiles() {
33+
assertCompilationSuccessful(compileFiles(
34+
SomeActivity.class,
35+
SomeImplementation.class,
36+
SomeGenericBean.class,
37+
SomeGenericBeanExt.class));
38+
}
3939

4040
}

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeActivity.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class SomeActivity extends Activity {
2828
@Bean(SomeImplementation.class)
2929
SomeInterface someInterface;
3030

31-
@Bean
32-
SomeGenericBean<Object> objectSomeGenericBean;
31+
@Bean
32+
SomeGenericBean<Object> objectSomeGenericBean;
3333

3434
}

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/ebean/SomeGenericBean.java‎

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,19 @@
2424
@EBean
2525
public class SomeGenericBean<T> {
2626

27-
@Background
28-
void someMethod(List<? super T> list){
27+
@Background
28+
void someMethod(List<? super T> list) {
2929
}
3030

31-
void someOtherMethod(List<? super T> list){
32-
}
33-
34-
@Background
35-
<N extends T> void someParameterizedMethod(List<? super N> lst, List<? extends N> lst2) {
36-
}
31+
void someOtherMethod(List<? super T> list) {
32+
}
3733

38-
@UiThread
39-
<T, S extends Number> void emptyUiMethod(List<? extends T> param, List<? super S> param2) {
40-
}
34+
@Background
35+
<N extends T> void someParameterizedMethod(List<? super N> lst, List<? extends N> lst2) {
36+
}
4137

38+
@UiThread
39+
<T, S extends Number> void emptyUiMethod(List<? extends T> param, List<? super S> param2) {
40+
}
4241

4342
}

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/eviewgroup/EViewGroupTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222

2323
public class EViewGroupTest extends AAProcessorTestHelper {
2424
@Before
25-
public void setup() {
25+
public void setUp() {
2626
addManifestProcessorParameter(EViewGroupTest.class);
2727
addProcessor(AndroidAnnotationProcessor.class);
2828
}
2929

3030
@Test
31-
public void view_group_with_generic_compiles() {
31+
public void viewGroupWithGenericCompiles() {
3232
assertCompilationSuccessful(compileFiles(
3333
SomeGenericViewGroup.class,
3434
SomeGenericViewGroupExt.class));

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ public class ActivityIntentFragmentTest extends AAProcessorTestHelper {
2929
private static final String INTENT_FRAGMENT_SUPPORT_SIGNATURE = ".*public static ActivityInManifest_\\.IntentBuilder_ intent\\((android\\.support\\.v4\\.app\\.)?Fragment supportFragment\\).*";
3030

3131
@Before
32-
public void setup() {
32+
public void setUp() {
3333
addProcessor(AndroidAnnotationProcessor.class);
3434
}
3535

3636
@Test
37-
public void activity_intentFragment_minSdkFroyo_compileWithFroyo() {
37+
public void activityIntentFragmentMinSdkFroyoCompilesWithFroyo() {
3838
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinFroyo.xml");
3939
CompileResult result = compileFiles(ActivityInManifest.class);
4040
File generatedFile = toGeneratedFile(ActivityInManifest.class);
@@ -44,7 +44,7 @@ public void activity_intentFragment_minSdkFroyo_compileWithFroyo() {
4444
}
4545

4646
@Test
47-
public void activity_intentFragment_minSdkFroyo_compileWithJB() {
47+
public void activityIntentFragmentMinSdkFroyoCompilesWithJB() {
4848
// To simulate compilation with SDK > 11, we add Fragment in classpath
4949
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinFroyo.xml");
5050
CompileResult result = compileFiles(toPath(ActivityIntentFragmentTest.class, "Fragment.java"), ActivityInManifest.class);
@@ -55,7 +55,7 @@ public void activity_intentFragment_minSdkFroyo_compileWithJB() {
5555
}
5656

5757
@Test
58-
public void activity_intentFragment_minSdkJB_compileWithJB() {
58+
public void activityIntentFragmentMinSdkJBCompileWithJB() {
5959
// To simulate compilation with SDK > 11, we add Fragment in classpath
6060
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinJB.xml");
6161
CompileResult result = compileFiles(toPath(ActivityIntentFragmentTest.class, "Fragment.java"), ActivityInManifest.class);
@@ -66,7 +66,7 @@ public void activity_intentFragment_minSdkJB_compileWithJB() {
6666
}
6767

6868
@Test
69-
public void activity_intentFragment_compileWithSupport() {
69+
public void activityIntentFragmentCompilesWithSupport() {
7070
// To simulate android support v4 in classpath, we add
7171
// android.support.v4.Fragment in classpath
7272
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinFroyo.xml");
@@ -78,7 +78,7 @@ public void activity_intentFragment_compileWithSupport() {
7878
}
7979

8080
@Test
81-
public void activity_intentFragment_minSdkJB_compileWithJBAndSupport() {
81+
public void activityIntentFragmentMinSdkJBCompilesWithJBAndSupport() {
8282
// To simulate compilation with SDK > 11, we add Fragment in classpath
8383
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinJB.xml");
8484
CompileResult result = compileFiles(toPath(ActivityIntentFragmentTest.class, "Fragment.java"), toPath(ActivityIntentFragmentTest.class, "support/Fragment.java"), ActivityInManifest.class);

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackPressedApiDependenciesTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525
public class OnBackPressedApiDependenciesTest extends AAProcessorTestHelper {
2626

2727
@Before
28-
public void setup() {
28+
public void setUp() {
2929
addManifestProcessorParameter(OnBackPressedApiDependenciesTest.class);
3030
addProcessor(AndroidAnnotationProcessor.class);
3131
ensureOutputDirectoryIsEmpty();
3232
}
3333

3434
@Test
35-
public void activity_with_on_back_pressed_generate_api_dependency() throws IOException {
35+
public void activityWithOnBackPressedGeneratesApiDependency() throws IOException {
3636
CompileResult result = compileFiles(ActivityWithOnBackPressedMethod.class);
3737
assertCompilationSuccessful(result);
3838
}
3939

4040
@Test
41-
public void activity_without_on_back_pressed_do_not_generate_api_dependency() throws IOException {
41+
public void activityWithoutOnBackPressedDoesNotGenerateApiDependency() throws IOException {
4242
CompileResult result = compileFiles(ActivityWithBackgroundMethod.class);
4343
assertCompilationSuccessful(result);
4444
}

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/OnBackgroundApiDependenciesTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,20 +25,20 @@
2525
public class OnBackgroundApiDependenciesTest extends AAProcessorTestHelper {
2626

2727
@Before
28-
public void setup() {
28+
public void setUp() {
2929
addManifestProcessorParameter(OnBackgroundApiDependenciesTest.class);
3030
addProcessor(AndroidAnnotationProcessor.class);
3131
ensureOutputDirectoryIsEmpty();
3232
}
3333

3434
@Test
35-
public void activity_with_background_annotated_method_generate_api_dependency() throws IOException {
35+
public void activityWithBackgroundAnnotatedMethodGenerateApiDependency() throws IOException {
3636
CompileResult result = compileFiles(ActivityWithBackgroundMethod.class);
3737
assertCompilationSuccessful(result);
3838
}
3939

4040
@Test
41-
public void activity_without_background_annotated_method_generate_api_dependency() throws IOException {
41+
public void activityWithoutBackgroundAnnotatedMethodGenerateApiDependency() throws IOException {
4242
CompileResult result = compileFiles(ActivityWithOnBackPressedMethod.class);
4343
assertCompilationSuccessful(result);
4444
}

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/SharedPrefsApiDependenciesTest.java‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -42,42 +42,42 @@
4242

4343
public class SharedPrefsApiDependenciesTest extends AAProcessorTestHelper {
4444

45-
private static final Class<?>[] SHARED_PREF_API_DEPENDENCIES = new Class<?>[] { AbstractPrefEditorField.class,//
46-
AbstractPrefField.class,//
47-
BooleanPrefEditorField.class,//
48-
BooleanPrefField.class,//
49-
EditorHelper.class,//
50-
FloatPrefEditorField.class,//
51-
FloatPrefField.class,//
52-
IntPrefEditorField.class,//
53-
IntPrefField.class,//
54-
LongPrefEditorField.class,//
55-
LongPrefField.class,//
56-
SharedPreferencesCompat.class,//
57-
SharedPreferencesHelper.class,//
58-
StringPrefEditorField.class,//
59-
StringPrefField.class, //
60-
StringSetPrefEditorField.class,//
61-
StringSetPrefField.class //
45+
private static final Class<?>[] SHARED_PREF_API_DEPENDENCIES = new Class<?>[] { AbstractPrefEditorField.class, //
46+
AbstractPrefField.class, //
47+
BooleanPrefEditorField.class, //
48+
BooleanPrefField.class, //
49+
EditorHelper.class, //
50+
FloatPrefEditorField.class, //
51+
FloatPrefField.class, //
52+
IntPrefEditorField.class, //
53+
IntPrefField.class, //
54+
LongPrefEditorField.class, //
55+
LongPrefField.class, //
56+
SharedPreferencesCompat.class, //
57+
SharedPreferencesHelper.class, //
58+
StringPrefEditorField.class, //
59+
StringPrefField.class, //
60+
StringSetPrefEditorField.class, //
61+
StringSetPrefField.class, //
6262
};
6363

6464
@Before
65-
public void setup() {
65+
public void setUp() {
6666
addManifestProcessorParameter(SharedPrefsApiDependenciesTest.class);
6767
addProcessor(AndroidAnnotationProcessor.class);
6868
ensureOutputDirectoryIsEmpty();
6969
}
7070

7171
@Test
72-
public void class_with_prefs_do_not_generate_api_dependencies() throws IOException {
72+
public void classWithPrefsDoesNotGenerateApiDependencies() throws IOException {
7373
compileFiles(SharedPrefs.class);
7474
for (Class<?> apiDependency : SHARED_PREF_API_DEPENDENCIES) {
7575
assertClassSourcesNotGeneratedToOutput(apiDependency);
7676
}
7777
}
7878

7979
@Test
80-
public void class_without_prefs_do_not_generate_api_dependencies() throws IOException {
80+
public void classWithoutPrefsDoesNotGenerateApiDependencies() throws IOException {
8181
compileFiles(SomeClass.class);
8282
for (Class<?> apiDependency : SHARED_PREF_API_DEPENDENCIES) {
8383
assertClassSourcesNotGeneratedToOutput(apiDependency);

‎AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/hierarchyviewer/HierarchyViewerActivityTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,27 +25,27 @@
2525
public class HierarchyViewerActivityTest extends AAProcessorTestHelper {
2626

2727
@Before
28-
public void setup() {
28+
public void setUp() {
2929
addManifestProcessorParameter(HierarchyViewerActivityTest.class);
3030
addProcessor(AndroidAnnotationProcessor.class);
3131
}
3232

3333
@Test
34-
public void hierarchy_viewer_activity_compiles() {
34+
public void hierarchyViewerActivityCompiles() {
3535
addManifestProcessorParameter(HierarchyViewerActivityTest.class, "AndroidManifest.xml");
3636
CompileResult result = compileFiles(HierarchyViewerActivity.class);
3737
assertCompilationSuccessful(result);
3838
}
3939

4040
@Test
41-
public void hierarchy_viewer_activity_with_no_debbugable_does_not_compile() throws IOException {
41+
public void hierarchyViewerActivityWithNoDebbugableDoesNotCompile() throws IOException {
4242
addManifestProcessorParameter(HierarchyViewerActivityTest.class, "NoDebbugableManifest.xml");
4343
CompileResult result = compileFiles(HierarchyViewerActivity.class);
4444
assertCompilationErrorOn(HierarchyViewerActivity.class, "@HierarchyViewerSupport", result);
4545
}
4646

4747
@Test
48-
public void hierarchy_viewer_activity_with_no_internet_permission_does_not_compile() throws IOException {
48+
public void hierarchyViewerActivityWithNoInternetPermissionDoesNotCompile() throws IOException {
4949
addManifestProcessorParameter(HierarchyViewerActivityTest.class, "NoInternetPermissionManifest.xml");
5050
CompileResult result = compileFiles(HierarchyViewerActivity.class);
5151
assertCompilationErrorOn(HierarchyViewerActivity.class, "@HierarchyViewerSupport", result);

0 commit comments

Comments
 (0)