From 9cabf2612f0e1230651b23b529d957e939d99a71 Mon Sep 17 00:00:00 2001 From: Fangqiu Su Date: Tue, 19 Dec 2023 18:13:58 +0000 Subject: Update the imports to androidx.test.filters.* Bug: 316941721 Test: mmma . Change-Id: Ica83671c2c0892f282c26ba3c96f993a0b6fe699 --- tests/src/com/android/calendarcommon2/DurationTest.java | 4 ++-- tests/src/com/android/calendarcommon2/EventRecurrenceTest.java | 6 +++--- tests/src/com/android/calendarcommon2/RRuleTest.java | 7 ++++--- .../src/com/android/calendarcommon2/RecurrenceProcessorTest.java | 9 +++++---- tests/src/com/android/calendarcommon2/RecurrenceSetTest.java | 8 ++++---- tests/src/com/android/calendarcommon2/TimeTest.java | 5 +++-- 6 files changed, 21 insertions(+), 18 deletions(-) (limited to 'tests/src/com/android') 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; /** -- cgit v1.2.3