Snap for 11380007 from 9cabf2612f0e1230651b23b529d957e939d99a71 to 24Q2-releaseandroid-14.0.0_r54android-14.0.0_r53android-14.0.0_r52android-14.0.0_r51android-14.0.0_r50android14-qpr3-s2-releaseandroid14-qpr3-release

Change-Id: Iad30584a5ef83f961e7bad089e2a12560b6e824b

7 files changed, 22 insertions, 18 deletions

diff --git a/tests/Android.bp b/tests/Android.bp
index 938b51c..bcf67cc 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -27,5 +27,6 @@ android_test {
     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;
 
 /**