@@ -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 );
0 commit comments