summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-06-17 18:44:19 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-06-17 18:44:19 +0000
commit38a3b1d34589c41c61c7f6949607749120322f55 (patch)
treeeec0c0e34aafe45c4fbac51a8424caaf770d3c52
parentbb6a9c5d27b5df2ab1a68fee9424a1bdd12d0e79 (diff)
parent949dc2601ec4888c277592f5f0a43a22e446bcb9 (diff)
downloadPartnerBookmarksProvider-38a3b1d34589c41c61c7f6949607749120322f55.tar.gz
Merge "Merge Android 14 QPR3 to AOSP main" into mainHEADmastermain
-rw-r--r--tests/Android.bp5
-rw-r--r--tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java4
2 files changed, 5 insertions, 4 deletions
diff --git a/tests/Android.bp b/tests/Android.bp
index 177201b..ee9c1ea 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -25,6 +25,9 @@ android_test {
srcs: ["src/**/*.java"],
sdk_version: "current",
libs: ["android.test.base.stubs"],
- static_libs: ["junit"],
+ static_libs: [
+ "junit",
+ "androidx.test.rules",
+ ],
instrumentation_for: "PartnerBookmarksProvider",
}
diff --git a/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java b/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java
index 57f61e4..eacefb8 100644
--- a/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java
+++ b/tests/src/com/android/providers/partnerbookmarks/PartnerBookmarksProviderTest.java
@@ -19,10 +19,8 @@ package com.android.providers.partnerbookmarks;
import android.content.ContentProviderClient;
import android.database.Cursor;
import android.test.AndroidTestCase;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
-import junit.framework.TestCase;
+import androidx.test.filters.SmallTest;
public class PartnerBookmarksProviderTest extends AndroidTestCase {
private static final String TAG = "PartnerBookmarksProviderTest";