aboutsummaryrefslogtreecommitdiff
path: root/tests/src/com/android
diff options
context:
space:
mode:
authorXin Li <delphij@google.com>2024-06-17 18:51:28 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-06-17 18:51:28 +0000
commit5a3571811cde5908cd082b13d1699ed6658bede7 (patch)
treed4f192b4e2d151d482e238d2ccf7ec68b47fef8d /tests/src/com/android
parent19f9d8c7b37e67fe3ac839cf9385caa178f6a47c (diff)
parent35d1e928688745133dd9498a05fe5d1bff0fdfe9 (diff)
downloadcalendar-master.tar.gz
Merge "Merge Android 14 QPR3 to AOSP main" into mainHEADmastermain
Diffstat (limited to 'tests/src/com/android')
-rw-r--r--tests/src/com/android/calendarcommon2/DurationTest.java4
-rw-r--r--tests/src/com/android/calendarcommon2/EventRecurrenceTest.java6
-rw-r--r--tests/src/com/android/calendarcommon2/RRuleTest.java7
-rw-r--r--tests/src/com/android/calendarcommon2/RecurrenceProcessorTest.java9
-rw-r--r--tests/src/com/android/calendarcommon2/RecurrenceSetTest.java8
-rw-r--r--tests/src/com/android/calendarcommon2/TimeTest.java5
6 files changed, 21 insertions, 18 deletions
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;
/**