diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/tests/AndroidTest.xml | 22 | ||||
| -rw-r--r-- | java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java | 2 |
2 files changed, 14 insertions, 10 deletions
diff --git a/java/tests/AndroidTest.xml b/java/tests/AndroidTest.xml index d1d77c10..3daafee2 100644 --- a/java/tests/AndroidTest.xml +++ b/java/tests/AndroidTest.xml @@ -14,15 +14,17 @@ limitations under the License. --> <configuration description="Run IntentResolver Tests."> - <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> - <option name="test-file-name" value="IntentResolverUnitTests.apk" /> - </target_preparer> + <!-- Restore these lines once the unbundled chooser is re-enabled. + <target_preparer class="com.android.tradefed.targetprep.TestAppInstallSetup"> + <option name="test-file-name" value="IntentResolverUnitTests.apk" /> + </target_preparer> - <option name="test-suite-tag" value="apct" /> - <option name="test-tag" value="IntentResolverUnitTests" /> - <test class="com.android.tradefed.testtype.AndroidJUnitTest" > - <option name="package" value="com.android.intentresolver.tests" /> - <option name="runner" value="android.testing.TestableInstrumentation" /> - <option name="hidden-api-checks" value="false"/> - </test> + <option name="test-suite-tag" value="apct" /> + <option name="test-tag" value="IntentResolverUnitTests" /> + <test class="com.android.tradefed.testtype.AndroidJUnitTest" > + <option name="package" value="com.android.intentresolver.tests" /> + <option name="runner" value="android.testing.TestableInstrumentation" /> + <option name="hidden-api-checks" value="false"/> + </test> + --> </configuration> diff --git a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java index 7dda0366..dd3b00ed 100644 --- a/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java +++ b/java/tests/src/com/android/intentresolver/UnbundledChooserActivityTest.java @@ -29,6 +29,7 @@ import androidx.test.platform.app.InstrumentationRegistry; import com.android.internal.app.ChooserActivity; import com.android.internal.app.ChooserActivityTest; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.Parameterized; @@ -38,6 +39,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.function.Function; +@Ignore("can't run until unbundled chooser is back in builds") @RunWith(Parameterized.class) public class UnbundledChooserActivityTest extends ChooserActivityTest { private static final Function<PackageManager, PackageManager> DEFAULT_PM = pm -> pm; |