diff options
| author | 2023-05-04 19:59:24 +0000 | |
|---|---|---|
| committer | 2023-05-04 19:59:24 +0000 | |
| commit | 472506fb6780c670a8438d01f36f05f2bf581677 (patch) | |
| tree | 773222023e9c5272687c1b8ffb0c2449aad11260 /java | |
| parent | 33627ce2095e0553f4c86700519fff22a29d314f (diff) | |
| parent | d572ef6c2ba73880edecd66c86835e78763d9400 (diff) | |
Merge "Removes dependency on TestNG library." into udc-dev am: d572ef6c2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/22469288
Change-Id: I843fab483fa47bd5924dd35c3ab4db3ac19a59de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'java')
| -rw-r--r-- | java/tests/Android.bp | 1 | ||||
| -rw-r--r-- | java/tests/src/com/android/intentresolver/ResolverActivityTest.java | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/java/tests/Android.bp b/java/tests/Android.bp index 12cb390e..c381d0a8 100644 --- a/java/tests/Android.bp +++ b/java/tests/Android.bp @@ -29,7 +29,6 @@ android_test { "androidx.lifecycle_lifecycle-runtime-ktx", "truth-prebuilt", "testables", - "testng", "kotlinx_coroutines_test", ], test_suites: ["general-tests"], diff --git a/java/tests/src/com/android/intentresolver/ResolverActivityTest.java b/java/tests/src/com/android/intentresolver/ResolverActivityTest.java index 12b71970..5cece092 100644 --- a/java/tests/src/com/android/intentresolver/ResolverActivityTest.java +++ b/java/tests/src/com/android/intentresolver/ResolverActivityTest.java @@ -33,10 +33,10 @@ import static org.hamcrest.CoreMatchers.allOf; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.not; import static org.hamcrest.MatcherAssert.assertThat; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.fail; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.when; -import static org.testng.Assert.assertFalse; -import static org.testng.Assert.fail; import android.content.Intent; import android.content.pm.ResolveInfo; @@ -510,7 +510,7 @@ public class ResolverActivityTest { waitForIdle(); TextView headerText = activity.findViewById(com.android.internal.R.id.title); String initialText = headerText.getText().toString(); - assertFalse(initialText.isEmpty(), "Header text is empty."); + assertFalse("Header text is empty.", initialText.isEmpty()); assertThat(headerText.getVisibility(), is(View.VISIBLE)); } |