Skip to content

Commit 9df2a3c

Browse files
committed
Extend ActivityIntentFragmentTest
So it now uses the ActivityCompat support class in some cases for the new withOptions method.
1 parent 475436f commit 9df2a3c

File tree

3 files changed

+47
-3
lines changed

3 files changed

+47
-3
lines changed

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

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,14 @@ public void setUp() {
3636
@Test
3737
public void activityIntentFragmentMinSdkFroyoCompilesWithFroyo() {
3838
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinFroyo.xml");
39-
CompileResult result = compileFiles(ActivityInManifest.class);
39+
// we need android.os.Build in the classpath
40+
CompileResult result = compileFiles(ActivityInManifest.class /*
41+
* ,toPath(
42+
* ActivityIntentFragmentTest
43+
* .class,
44+
* "Build.java"
45+
* )
46+
*/);
4047
File generatedFile = toGeneratedFile(ActivityInManifest.class);
4148

4249
assertCompilationSuccessful(result);
@@ -68,9 +75,25 @@ public void activityIntentFragmentMinSdkJBCompileWithJB() {
6875
@Test
6976
public void activityIntentFragmentCompilesWithSupport() {
7077
// To simulate android support v4 in classpath, we add
71-
// android.support.v4.Fragment in classpath
78+
// android.support.v4.Fragment and android.support.v4.app.ActivityCompat
79+
// in classpath
7280
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinFroyo.xml");
73-
CompileResult result = compileFiles(toPath(ActivityIntentFragmentTest.class, "support/Fragment.java"), ActivityInManifest.class);
81+
CompileResult result = compileFiles(toPath(ActivityIntentFragmentTest.class, "support/Fragment.java"), //
82+
toPath(ActivityIntentFragmentTest.class, "support/ActivityCompat.java"), ActivityInManifest.class);
83+
File generatedFile = toGeneratedFile(ActivityInManifest.class);
84+
85+
assertCompilationSuccessful(result);
86+
assertGeneratedClassMatches(generatedFile, INTENT_FRAGMENT_SUPPORT_SIGNATURE);
87+
}
88+
89+
@Test
90+
public void activityIntentFragmentCompilesWithSupportContainingBundleOptions() {
91+
// To simulate android support v4 in classpath, we add
92+
// android.support.v4.Fragment and android.support.v4.app.ActivityCompat
93+
// in classpath
94+
addManifestProcessorParameter(ActivityIntentFragmentTest.class, "AndroidManifestMinFroyo.xml");
95+
CompileResult result = compileFiles(toPath(ActivityIntentFragmentTest.class, "support/Fragment.java"), //
96+
toPath(ActivityIntentFragmentTest.class, "ActivityCompat.java"), ActivityInManifest.class);
7497
File generatedFile = toGeneratedFile(ActivityInManifest.class);
7598

7699
assertCompilationSuccessful(result);
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package android.support.v4.app;
2+
3+
import android.app.Activity;
4+
import android.content.Intent;
5+
import android.os.Bundle;
6+
7+
public class ActivityCompat {
8+
9+
public static void startActivity(Activity activity, Intent intent, Bundle options) {
10+
11+
}
12+
13+
public static void startActivityForResult(Activity activity, Intent intent, int requestCode, Bundle options) {
14+
15+
}
16+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
package android.support.v4.app;
2+
3+
public class ActivityCompat {
4+
5+
}

0 commit comments

Comments
 (0)