Merge "Migrate Test Targets to New Android Ownership Model" into main am: 19f9d8c7b3 am: 47c1f1d4ca
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/calendar/+/2946236
Change-Id: I4b39a0315234b6c3ecfdbca246c9a267df35a816
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/tests/Android.bp b/tests/Android.bp
index 9f979dd..822c6ad 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -28,5 +28,6 @@
static_libs: [
"calendar-common",
"junit",
+ "androidx.test.rules",
],
}
diff --git a/tests/src/com/android/calendarcommon2/DurationTest.java b/tests/src/com/android/calendarcommon2/DurationTest.java
index 39320a3..7af64b1 100644
--- a/tests/src/com/android/calendarcommon2/DurationTest.java
+++ b/tests/src/com/android/calendarcommon2/DurationTest.java
@@ -17,9 +17,9 @@
package com.android.calendarcommon2;
-import junit.framework.TestCase;
+import androidx.test.filters.SmallTest;
-import android.test.suitebuilder.annotation.SmallTest;
+import junit.framework.TestCase;
public class DurationTest extends TestCase {
diff --git a/tests/src/com/android/calendarcommon2/EventRecurrenceTest.java b/tests/src/com/android/calendarcommon2/EventRecurrenceTest.java
index c25e3ec..7f8979c 100644
--- a/tests/src/com/android/calendarcommon2/EventRecurrenceTest.java
+++ b/tests/src/com/android/calendarcommon2/EventRecurrenceTest.java
@@ -16,10 +16,10 @@
package com.android.calendarcommon2;
-import com.android.calendarcommon2.EventRecurrence.InvalidFormatException;
+import androidx.test.filters.SmallTest;
+import androidx.test.filters.Suppress;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.test.suitebuilder.annotation.Suppress;
+import com.android.calendarcommon2.EventRecurrence.InvalidFormatException;
import junit.framework.TestCase;
diff --git a/tests/src/com/android/calendarcommon2/RRuleTest.java b/tests/src/com/android/calendarcommon2/RRuleTest.java
index 18217a3..454640d 100644
--- a/tests/src/com/android/calendarcommon2/RRuleTest.java
+++ b/tests/src/com/android/calendarcommon2/RRuleTest.java
@@ -19,11 +19,12 @@
package com.android.calendarcommon2;
-import com.android.calendarcommon2.RecurrenceSet;
import android.os.Debug;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.Suppress;
+
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.Suppress;
+
import junit.framework.TestCase;
/**
diff --git a/tests/src/com/android/calendarcommon2/RecurrenceProcessorTest.java b/tests/src/com/android/calendarcommon2/RecurrenceProcessorTest.java
index 3cd9177..8ce7fce 100644
--- a/tests/src/com/android/calendarcommon2/RecurrenceProcessorTest.java
+++ b/tests/src/com/android/calendarcommon2/RecurrenceProcessorTest.java
@@ -18,11 +18,12 @@
package com.android.calendarcommon2;
import android.os.Debug;
-import android.test.suitebuilder.annotation.LargeTest;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.text.TextUtils;
import android.util.Log;
+
+import androidx.test.filters.LargeTest;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+
import junit.framework.TestCase;
import java.util.TreeSet;
diff --git a/tests/src/com/android/calendarcommon2/RecurrenceSetTest.java b/tests/src/com/android/calendarcommon2/RecurrenceSetTest.java
index ac4f89f..d6bae94 100644
--- a/tests/src/com/android/calendarcommon2/RecurrenceSetTest.java
+++ b/tests/src/com/android/calendarcommon2/RecurrenceSetTest.java
@@ -16,13 +16,13 @@
package com.android.calendarcommon2;
-import com.android.calendarcommon2.ICalendar;
-import com.android.calendarcommon2.RecurrenceSet;
import android.content.ContentValues;
-import android.test.suitebuilder.annotation.SmallTest;
-import android.util.Log;
import android.provider.CalendarContract;
+import android.util.Log;
+
+import androidx.test.filters.SmallTest;
+
import junit.framework.TestCase;
import java.util.Arrays;
diff --git a/tests/src/com/android/calendarcommon2/TimeTest.java b/tests/src/com/android/calendarcommon2/TimeTest.java
index df27c4f..288dad5 100644
--- a/tests/src/com/android/calendarcommon2/TimeTest.java
+++ b/tests/src/com/android/calendarcommon2/TimeTest.java
@@ -15,10 +15,11 @@
*/
package com.android.calendarcommon2;
-import android.test.suitebuilder.annotation.MediumTest;
-import android.test.suitebuilder.annotation.SmallTest;
import android.util.TimeFormatException;
+import androidx.test.filters.MediumTest;
+import androidx.test.filters.SmallTest;
+
import junit.framework.TestCase;
/**