diff options
| author | 2022-05-26 20:55:24 +0000 | |
|---|---|---|
| committer | 2022-05-26 20:55:24 +0000 | |
| commit | 18aebd5bd6be5a8d367c98274048647e15704254 (patch) | |
| tree | 8628dc88ae2d465778a2cf81efbf169185fcde48 /java/tests | |
| parent | 9b351a5407545e7b91cb3ee8bd67f48d85919313 (diff) | |
| parent | 78c688196851ff51969ff70f6b0e09d703e0e672 (diff) | |
Ignore UnbundledChooserActivityTest am: 78c6881968
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/18614358
Change-Id: Id31d4e49ac1fa3ed52651be5d7bc0b28a3a7867d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java/tests')
| -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; |