Add a test with both native and support Fragment Intent

DayS · DayS · commit f0865bbfb99a · 2013-10-23T18:49:16.000+02:00
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/generation/ActivityIntentFragmentTest.java
@@ -10,8 +10,8 @@
 public class ActivityIntentFragmentTest extends AAProcessorTestHelper {
 
 	// Couldn't find better than this for now
-	private static final String INTENT_FRAGMENT_SIGNATURE = "public static ActivityInManifest_.IntentBuilder_ intent(Fragment fragment)";
-	private static final String INTENT_FRAGMENT_SUPPORT_SIGNATURE = "public static ActivityInManifest_.IntentBuilder_ intent(Fragment supportFragment)";
+	private static final String INTENT_FRAGMENT_SIGNATURE = ".*public static ActivityInManifest_\\.IntentBuilder_ intent\\((android\\.app\\.)?Fragment fragment\\).*";
+	private static final String INTENT_FRAGMENT_SUPPORT_SIGNATURE = ".*public static ActivityInManifest_\\.IntentBuilder_ intent\\((android\\.support\\.v4\\.app\\.)?Fragment supportFragment\\).*";
 
 	@Before
 	public void setup() {
@@ -25,7 +25,7 @@ public void activity_intentFragment_minSdkFroyo_compileWithFroyo() {
 		File generatedFile = toGeneratedFile(ActivityInManifest.class);
 
 		assertCompilationSuccessful(result);
-		assertGeneratedClassDoesntContains(generatedFile, INTENT_FRAGMENT_SIGNATURE);
+		assertGeneratedClassDoesntMatches(generatedFile, INTENT_FRAGMENT_SIGNATURE);
 	}
 
 	@Test
@@ -36,7 +36,7 @@ public void activity_intentFragment_minSdkFroyo_compileWithJB() {
 		File generatedFile = toGeneratedFile(ActivityInManifest.class);
 
 		assertCompilationSuccessful(result);
-		assertGeneratedClassDoesntContains(generatedFile, INTENT_FRAGMENT_SIGNATURE);
+		assertGeneratedClassDoesntMatches(generatedFile, INTENT_FRAGMENT_SIGNATURE);
 	}
 
 	@Test
@@ -47,7 +47,7 @@ public void activity_intentFragment_minSdkJB_compileWithJB() {
 		File generatedFile = toGeneratedFile(ActivityInManifest.class);
 
 		assertCompilationSuccessful(result);
-		assertGeneratedClassContains(generatedFile, INTENT_FRAGMENT_SIGNATURE);
+		assertGeneratedClassMatches(generatedFile, INTENT_FRAGMENT_SIGNATURE);
 	}
 
 	@Test
@@ -59,7 +59,19 @@ public void activity_intentFragment_compileWithSupport() {
 		File generatedFile = toGeneratedFile(ActivityInManifest.class);
 
 		assertCompilationSuccessful(result);
-		assertGeneratedClassContains(generatedFile, INTENT_FRAGMENT_SUPPORT_SIGNATURE);
+		assertGeneratedClassMatches(generatedFile, INTENT_FRAGMENT_SUPPORT_SIGNATURE);
+	}
+
+	@Test
+	public void activity_intentFragment_minSdkJB_compileWithJBAndSupport() {
+		// To simulate compilation with SDK > 11, we add Fragment in classpath
+		addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinJB.xml");
+		CompileResult result = compileFiles(toPath(ActivityIntentFragmentTest.class, "Fragment.java"), toPath(ActivityIntentFragmentTest.class, "support/Fragment.java"), ActivityInManifest.class);
+		File generatedFile = toGeneratedFile(ActivityInManifest.class);
+
+		assertCompilationSuccessful(result);
+		assertGeneratedClassMatches(generatedFile, INTENT_FRAGMENT_SIGNATURE);
+		assertGeneratedClassMatches(generatedFile, INTENT_FRAGMENT_SUPPORT_SIGNATURE);
 	}
 
 }
diff --git a/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java b/AndroidAnnotations/androidannotations/src/test/java/org/androidannotations/utils/ProcessorTestHelper.java
@@ -58,20 +58,20 @@ public CompileResult(List<Diagnostic<? extends JavaFileObject>> diagnostics) {
 	protected static final String SOURCE_FILE_SUFFIX = ".java";
 	protected static final String OUTPUT_DIRECTORY = "target/generated-test";
 
-	public static void assertGeneratedClassContains(File output, String value) {
+	public static void assertGeneratedClassMatches(File output, String value) {
 		String[] outputContent = getContents(output);
 		for (String line : outputContent) {
-			if (line.contains(value)) {
+			if (line.matches(value)) {
 				return;
 			}
 		}
 		fail("Expected value \"" + value + "\" couldn't be found in file " + output.getAbsolutePath());
 	}
 
-	public static void assertGeneratedClassDoesntContains(File output, String value) {
+	public static void assertGeneratedClassDoesntMatches(File output, String value) {
 		String[] outputContent = getContents(output);
 		for (String line : outputContent) {
-			if (line.contains(value)) {
+			if (line.matches(value)) {
 				fail("Value \"" + value + "\" shouldn't be in file " + output.getAbsolutePath());
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -58,20 +58,20 @@ public CompileResult(List<Diagnostic<? extends JavaFileObject>> diagnostics) {`
`58`	`58`	`protected static final String SOURCE_FILE_SUFFIX = ".java";`
`59`	`59`	`protected static final String OUTPUT_DIRECTORY = "target/generated-test";`
`60`	`60`
`61`		`- public static void assertGeneratedClassContains(File output, String value) {`
	`61`	`+ public static void assertGeneratedClassMatches(File output, String value) {`
`62`	`62`	`String[] outputContent = getContents(output);`
`63`	`63`	`for (String line : outputContent) {`
`64`		`- if (line.contains(value)) {`
	`64`	`+ if (line.matches(value)) {`
`65`	`65`	`return;`
`66`	`66`	`}`
`67`	`67`	`}`
`68`	`68`	`fail("Expected value \"" + value + "\" couldn't be found in file " + output.getAbsolutePath());`
`69`	`69`	`}`
`70`	`70`
`71`		`- public static void assertGeneratedClassDoesntContains(File output, String value) {`
	`71`	`+ public static void assertGeneratedClassDoesntMatches(File output, String value) {`
`72`	`72`	`String[] outputContent = getContents(output);`
`73`	`73`	`for (String line : outputContent) {`
`74`		`- if (line.contains(value)) {`
	`74`	`+ if (line.matches(value)) {`
`75`	`75`	`fail("Value \"" + value + "\" shouldn't be in file " + output.getAbsolutePath());`
`76`	`76`	`}`
`77`	`77`	`}`