From bdbde55592792efe350acd6a46733f439f6a3f3d Mon Sep 17 00:00:00 2001 From: Aurimas Liutikas Date: Tue, 19 Dec 2017 13:21:10 -0800 Subject: [PATCH] Annotate an assortment of coretest with @LargeTest Non-annotated tests do not run, thus adding @LargeTest to an assortment of tests that were missing annotations. Found these classes with: fn "*Test.java" | xargs grep -L "@LargeTest" | xargs grep -L "@MediumTest" | \ xargs grep -L "@SmallTest" | sort Bug: 70846562 Test: make -j80 FrameworksCoreTests Change-Id: Ifd466251b92728f9bbfa3cbd8fd21d34490f4eb1 --- .../coretests/src/android/animation/AnimatorInflaterTest.java | 2 ++ .../coretests/src/android/animation/StateListAnimatorTest.java | 3 ++- .../src/android/app/ApplicationPackageManagerTest.java | 2 ++ core/tests/coretests/src/android/app/InstrumentationTest.java | 2 ++ .../coretests/src/android/app/activity/BroadcastTest.java | 3 ++- .../coretests/src/android/app/activity/IntentSenderTest.java | 4 ++-- .../tests/coretests/src/android/app/backup/BackupDataTest.java | 2 ++ .../tests/coretests/src/android/app/backup/FullBackupTest.java | 2 ++ .../src/android/app/timezone/DistroFormatVersionTest.java | 2 ++ .../src/android/app/timezone/DistroRulesVersionTest.java | 2 ++ .../coretests/src/android/app/timezone/RulesStateTest.java | 2 ++ .../src/android/app/timezone/RulesUpdaterContractTest.java | 2 ++ .../coretests/src/android/content/RestrictionsManagerTest.java | 2 ++ .../android/content/pm/MacAuthenticatedInputStreamTest.java | 2 ++ .../src/android/content/pm/ParceledListSliceTest.java | 2 ++ .../src/android/content/pm/RegisteredServicesCacheTest.java | 2 ++ core/tests/coretests/src/android/content/pm/SignatureTest.java | 3 +++ .../src/android/content/pm/VerificationParamsTest.java | 2 ++ .../src/android/content/pm/VerifierDeviceIdentityTest.java | 2 ++ .../android/graphics/drawable/AdaptiveIconDrawableTest.java | 2 ++ .../src/android/hardware/display/VirtualDisplayTest.java | 2 ++ core/tests/coretests/src/android/metrics/LogMakerTest.java | 4 ++++ .../tests/coretests/src/android/metrics/MetricsReaderTest.java | 2 ++ .../coretests/src/android/preference/ListPreferenceTest.java | 2 ++ .../tests/coretests/src/android/transition/TransitionTest.java | 2 ++ core/tests/coretests/src/android/util/ArrayMapTest.java | 2 ++ core/tests/coretests/src/android/util/Base64Test.java | 10 ++++++---- core/tests/coretests/src/android/util/LocalLogTest.java | 4 +++- .../coretests/src/android/util/LongSparseLongArrayTest.java | 3 +++ .../coretests/src/android/view/ScaleGestureDetectorTest.java | 2 ++ core/tests/coretests/src/android/view/ViewAttachTest.java | 2 ++ .../src/android/view/accessibility/AccessibilityCacheTest.java | 3 ++- .../view/accessibility/AccessibilityInteractionClientTest.java | 2 ++ .../android/view/accessibility/AccessibilityNodeInfoTest.java | 2 ++ .../src/android/view/inputmethod/InputMethodInfoTest.java | 2 ++ .../src/android/view/menu/MenuLayoutLandscapeTest.java | 2 ++ .../src/android/view/menu/MenuLayoutPortraitTest.java | 7 +++---- .../coretests/src/android/widget/DatePickerFocusTest.java | 2 ++ .../src/android/widget/SelectionActionModeHelperTest.java | 2 ++ .../src/android/widget/focus/HorizontalFocusSearchTest.java | 2 ++ .../src/android/widget/focus/VerticalFocusSearchTest.java | 2 ++ .../arrowscroll/ListWithFirstScreenUnSelectableTest.java | 4 +++- 42 files changed, 95 insertions(+), 15 deletions(-) diff --git a/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java b/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java index 3c8185328582..e26bdf53b872 100644 --- a/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java +++ b/core/tests/coretests/src/android/animation/AnimatorInflaterTest.java @@ -15,6 +15,7 @@ */ package android.animation; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import java.util.HashSet; @@ -24,6 +25,7 @@ import java.util.concurrent.TimeUnit; import com.android.frameworks.coretests.R; +@LargeTest public class AnimatorInflaterTest extends ActivityInstrumentationTestCase2 { Set identityHashes = new HashSet(); diff --git a/core/tests/coretests/src/android/animation/StateListAnimatorTest.java b/core/tests/coretests/src/android/animation/StateListAnimatorTest.java index 38df78d3bad5..a9961e19e0c6 100644 --- a/core/tests/coretests/src/android/animation/StateListAnimatorTest.java +++ b/core/tests/coretests/src/android/animation/StateListAnimatorTest.java @@ -17,6 +17,7 @@ package android.animation; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.test.UiThreadTest; import android.util.StateSet; @@ -27,7 +28,7 @@ import com.android.frameworks.coretests.R; import java.util.concurrent.atomic.AtomicInteger; - +@LargeTest public class StateListAnimatorTest extends ActivityInstrumentationTestCase2 { public StateListAnimatorTest() { diff --git a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java index f60bf94f8c99..063bef7387c6 100644 --- a/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java +++ b/core/tests/coretests/src/android/app/ApplicationPackageManagerTest.java @@ -22,6 +22,7 @@ import android.content.pm.IPackageManager; import android.content.pm.PackageInfo; import android.os.storage.StorageManager; import android.os.storage.VolumeInfo; +import android.support.test.filters.LargeTest; import junit.framework.TestCase; @@ -34,6 +35,7 @@ import java.util.List; import static android.os.storage.VolumeInfo.STATE_MOUNTED; import static android.os.storage.VolumeInfo.STATE_UNMOUNTED; +@LargeTest public class ApplicationPackageManagerTest extends TestCase { private static final String sInternalVolPath = "/data"; private static final String sAdoptedVolPath = "/mnt/expand/123"; diff --git a/core/tests/coretests/src/android/app/InstrumentationTest.java b/core/tests/coretests/src/android/app/InstrumentationTest.java index ee3834cabbc2..9b59da48e760 100644 --- a/core/tests/coretests/src/android/app/InstrumentationTest.java +++ b/core/tests/coretests/src/android/app/InstrumentationTest.java @@ -17,8 +17,10 @@ package android.app; import android.os.Bundle; +import android.support.test.filters.LargeTest; import android.test.InstrumentationTestCase; +@LargeTest public class InstrumentationTest extends InstrumentationTestCase { /** diff --git a/core/tests/coretests/src/android/app/activity/BroadcastTest.java b/core/tests/coretests/src/android/app/activity/BroadcastTest.java index e9e8bfcb09c5..13e70ebdb2e3 100644 --- a/core/tests/coretests/src/android/app/activity/BroadcastTest.java +++ b/core/tests/coretests/src/android/app/activity/BroadcastTest.java @@ -27,12 +27,13 @@ import android.os.Bundle; import android.os.IBinder; import android.os.Parcel; import android.os.UserHandle; +import android.support.test.filters.LargeTest; import android.test.FlakyTest; -import android.test.suitebuilder.annotation.Suppress; import android.util.Log; import java.util.Arrays; +@LargeTest public class BroadcastTest extends ActivityTestsBase { public static final int BROADCAST_TIMEOUT = 5 * 1000; diff --git a/core/tests/coretests/src/android/app/activity/IntentSenderTest.java b/core/tests/coretests/src/android/app/activity/IntentSenderTest.java index 3c309154eedc..8c1d79b5d89c 100644 --- a/core/tests/coretests/src/android/app/activity/IntentSenderTest.java +++ b/core/tests/coretests/src/android/app/activity/IntentSenderTest.java @@ -20,10 +20,10 @@ import android.app.Activity; import android.app.PendingIntent; import android.content.Intent; import android.content.IntentFilter; -import android.test.suitebuilder.annotation.Suppress; import android.os.Bundle; -import android.test.suitebuilder.annotation.Suppress; +import android.support.test.filters.LargeTest; +@LargeTest public class IntentSenderTest extends BroadcastTest { public void testRegisteredReceivePermissionGranted() throws Exception { diff --git a/core/tests/coretests/src/android/app/backup/BackupDataTest.java b/core/tests/coretests/src/android/app/backup/BackupDataTest.java index 0c204e098405..5b8e481cf573 100644 --- a/core/tests/coretests/src/android/app/backup/BackupDataTest.java +++ b/core/tests/coretests/src/android/app/backup/BackupDataTest.java @@ -23,6 +23,7 @@ import android.content.res.AssetManager; import android.os.Bundle; import android.os.Environment; import android.os.ParcelFileDescriptor; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.test.InstrumentationTestCase; import android.util.Base64; @@ -41,6 +42,7 @@ import java.io.InputStreamReader; import java.lang.Exception; import java.nio.ByteBuffer; +@LargeTest public class BackupDataTest extends AndroidTestCase { private static final String KEY1 = "key1"; private static final String KEY2 = "key2a"; diff --git a/core/tests/coretests/src/android/app/backup/FullBackupTest.java b/core/tests/coretests/src/android/app/backup/FullBackupTest.java index 3869cd29f69f..bc6fc15db163 100644 --- a/core/tests/coretests/src/android/app/backup/FullBackupTest.java +++ b/core/tests/coretests/src/android/app/backup/FullBackupTest.java @@ -20,6 +20,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import android.content.Context; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.ArrayMap; import android.util.ArraySet; @@ -36,6 +37,7 @@ import java.util.List; import java.util.Map; import java.util.Set; +@LargeTest public class FullBackupTest extends AndroidTestCase { private XmlPullParserFactory mFactory; private XmlPullParser mXpp; diff --git a/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java b/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java index 70a0877beb5f..e20645c7d3c8 100644 --- a/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java +++ b/core/tests/coretests/src/android/app/timezone/DistroFormatVersionTest.java @@ -21,12 +21,14 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.os.Parcel; +import android.support.test.filters.LargeTest; import org.junit.Test; /** * Tests for {@link DistroFormatVersion}. */ +@LargeTest public class DistroFormatVersionTest { @Test diff --git a/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java b/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java index eecae46910fd..b69054cebbd2 100644 --- a/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java +++ b/core/tests/coretests/src/android/app/timezone/DistroRulesVersionTest.java @@ -21,12 +21,14 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.os.Parcel; +import android.support.test.filters.LargeTest; import org.junit.Test; /** * Tests for {@link DistroRulesVersion}. */ +@LargeTest public class DistroRulesVersionTest { @Test diff --git a/core/tests/coretests/src/android/app/timezone/RulesStateTest.java b/core/tests/coretests/src/android/app/timezone/RulesStateTest.java index 99abe243556c..dd462403ed82 100644 --- a/core/tests/coretests/src/android/app/timezone/RulesStateTest.java +++ b/core/tests/coretests/src/android/app/timezone/RulesStateTest.java @@ -23,12 +23,14 @@ import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; import android.os.Parcel; +import android.support.test.filters.LargeTest; import org.junit.Test; /** * Tests for {@link RulesState}. */ +@LargeTest public class RulesStateTest { @Test diff --git a/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java b/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java index 91f8ebc9ec1c..e4aac509c2ef 100644 --- a/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java +++ b/core/tests/coretests/src/android/app/timezone/RulesUpdaterContractTest.java @@ -24,6 +24,7 @@ import static org.mockito.hamcrest.MockitoHamcrest.argThat; import android.content.Context; import android.content.Intent; +import android.support.test.filters.LargeTest; import org.hamcrest.BaseMatcher; import org.hamcrest.Description; @@ -33,6 +34,7 @@ import org.junit.Test; /** * Tests for {@link RulesUpdaterContract}. */ +@LargeTest public class RulesUpdaterContractTest { @Test diff --git a/core/tests/coretests/src/android/content/RestrictionsManagerTest.java b/core/tests/coretests/src/android/content/RestrictionsManagerTest.java index d92eece8afca..10d74f7d2945 100644 --- a/core/tests/coretests/src/android/content/RestrictionsManagerTest.java +++ b/core/tests/coretests/src/android/content/RestrictionsManagerTest.java @@ -17,6 +17,7 @@ package android.content; import android.os.Bundle; import android.os.Parcelable; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import java.util.Arrays; @@ -24,6 +25,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; +@LargeTest public class RestrictionsManagerTest extends AndroidTestCase { private RestrictionsManager mRm; diff --git a/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java b/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java index 948e7220978b..659f9ea77956 100644 --- a/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java +++ b/core/tests/coretests/src/android/content/pm/MacAuthenticatedInputStreamTest.java @@ -16,6 +16,7 @@ package android.content.pm; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import java.io.ByteArrayInputStream; @@ -27,6 +28,7 @@ import javax.crypto.spec.SecretKeySpec; import libcore.io.Streams; +@LargeTest public class MacAuthenticatedInputStreamTest extends AndroidTestCase { private static final SecretKey HMAC_KEY_1 = new SecretKeySpec("test_key_1".getBytes(), "HMAC"); diff --git a/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java index a9d19b4b295c..952bb5530c15 100644 --- a/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java +++ b/core/tests/coretests/src/android/content/pm/ParceledListSliceTest.java @@ -2,6 +2,7 @@ package android.content.pm; import android.os.Parcel; import android.os.Parcelable; +import android.support.test.filters.LargeTest; import junit.framework.TestCase; @@ -9,6 +10,7 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; +@LargeTest public class ParceledListSliceTest extends TestCase { public void testSmallList() throws Exception { diff --git a/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java b/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java index 271c6392bdf4..d3d1f22af3cb 100644 --- a/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java +++ b/core/tests/coretests/src/android/content/pm/RegisteredServicesCacheTest.java @@ -21,6 +21,7 @@ import android.os.FileUtils; import android.os.Parcel; import android.os.Parcelable; import android.os.UserHandle; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.AttributeSet; import android.util.SparseArray; @@ -43,6 +44,7 @@ import java.util.Set; /** * Tests for {@link android.content.pm.RegisteredServicesCache} */ +@LargeTest public class RegisteredServicesCacheTest extends AndroidTestCase { private static final int U0 = 0; private static final int U1 = 1; diff --git a/core/tests/coretests/src/android/content/pm/SignatureTest.java b/core/tests/coretests/src/android/content/pm/SignatureTest.java index 89d599742e90..a3fa1a9c06cf 100644 --- a/core/tests/coretests/src/android/content/pm/SignatureTest.java +++ b/core/tests/coretests/src/android/content/pm/SignatureTest.java @@ -16,8 +16,11 @@ package android.content.pm; +import android.support.test.filters.LargeTest; + import junit.framework.TestCase; +@LargeTest public class SignatureTest extends TestCase { /** Cert A with valid syntax */ diff --git a/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java b/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java index d963812db622..68942cbd54ad 100644 --- a/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java +++ b/core/tests/coretests/src/android/content/pm/VerificationParamsTest.java @@ -19,6 +19,7 @@ package android.content.pm; import android.content.pm.VerificationParams; import android.net.Uri; import android.os.Parcel; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; /** @@ -27,6 +28,7 @@ import android.test.AndroidTestCase; * To test run: * ./development/testrunner/runtest.py frameworks-core -c android.content.pm.VerificationParamsTest */ +@LargeTest public class VerificationParamsTest extends AndroidTestCase { private final static String VERIFICATION_URI_STRING = "http://verification.uri/path"; diff --git a/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java b/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java index cb13eb7c846e..88d7a59a98e2 100644 --- a/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java +++ b/core/tests/coretests/src/android/content/pm/VerifierDeviceIdentityTest.java @@ -17,9 +17,11 @@ package android.content.pm; import android.os.Parcel; +import android.support.test.filters.LargeTest; import java.util.Random; +@LargeTest public class VerifierDeviceIdentityTest extends android.test.AndroidTestCase { private static final long TEST_1 = 0x7A5F00FF5A55AAA5L; diff --git a/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java b/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java index 7550cb5211b9..b28a4b5ae628 100644 --- a/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java +++ b/core/tests/coretests/src/android/graphics/drawable/AdaptiveIconDrawableTest.java @@ -15,6 +15,7 @@ import android.graphics.Path.Direction; import android.graphics.Rect; import android.graphics.RectF; import android.graphics.Region; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.Log; import android.util.PathParser; @@ -23,6 +24,7 @@ import java.io.FileOutputStream; import java.util.Arrays; import org.junit.Test; +@LargeTest public class AdaptiveIconDrawableTest extends AndroidTestCase { public static final String TAG = AdaptiveIconDrawableTest.class.getSimpleName(); diff --git a/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java b/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java index a2e9ae89e255..f30b1a29c781 100644 --- a/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java +++ b/core/tests/coretests/src/android/hardware/display/VirtualDisplayTest.java @@ -30,6 +30,7 @@ import android.os.Bundle; import android.os.Handler; import android.os.Looper; import android.os.SystemClock; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; import android.util.DisplayMetrics; import android.util.Log; @@ -49,6 +50,7 @@ import java.util.concurrent.locks.ReentrantLock; * Contains additional tests that cannot be included in CTS because they require * system permissions. See also the CTS version of VirtualDisplayTest. */ +@LargeTest public class VirtualDisplayTest extends AndroidTestCase { private static final String TAG = "VirtualDisplayTest"; diff --git a/core/tests/coretests/src/android/metrics/LogMakerTest.java b/core/tests/coretests/src/android/metrics/LogMakerTest.java index ada59cd84931..3be776deb9f1 100644 --- a/core/tests/coretests/src/android/metrics/LogMakerTest.java +++ b/core/tests/coretests/src/android/metrics/LogMakerTest.java @@ -15,9 +15,13 @@ */ package android.metrics; +import android.support.test.filters.LargeTest; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; + import junit.framework.TestCase; +@LargeTest public class LogMakerTest extends TestCase { public void testSerialize() { diff --git a/core/tests/coretests/src/android/metrics/MetricsReaderTest.java b/core/tests/coretests/src/android/metrics/MetricsReaderTest.java index d10b3519bccf..784a12fa1f57 100644 --- a/core/tests/coretests/src/android/metrics/MetricsReaderTest.java +++ b/core/tests/coretests/src/android/metrics/MetricsReaderTest.java @@ -16,6 +16,7 @@ package android.metrics; import android.metrics.MetricsReader.Event; +import android.support.test.filters.LargeTest; import com.android.internal.logging.nano.MetricsProto.MetricsEvent; @@ -23,6 +24,7 @@ import junit.framework.TestCase; import java.util.Collection; +@LargeTest public class MetricsReaderTest extends TestCase { private static final int FULL_N = 10; private static final int CHECKPOINTED_N = 4; diff --git a/core/tests/coretests/src/android/preference/ListPreferenceTest.java b/core/tests/coretests/src/android/preference/ListPreferenceTest.java index 41f8e03f46ce..72f62f167989 100644 --- a/core/tests/coretests/src/android/preference/ListPreferenceTest.java +++ b/core/tests/coretests/src/android/preference/ListPreferenceTest.java @@ -17,8 +17,10 @@ package android.preference; import android.preference.ListPreference; +import android.support.test.filters.LargeTest; import android.test.AndroidTestCase; +@LargeTest public class ListPreferenceTest extends AndroidTestCase { public void testListPreferenceSummaryFromEntries() { String[] entries = { "one", "two", "three" }; diff --git a/core/tests/coretests/src/android/transition/TransitionTest.java b/core/tests/coretests/src/android/transition/TransitionTest.java index ab4320c65eb2..7e629f944684 100644 --- a/core/tests/coretests/src/android/transition/TransitionTest.java +++ b/core/tests/coretests/src/android/transition/TransitionTest.java @@ -19,6 +19,7 @@ package android.transition; import android.animation.AnimatorSetActivity; import android.app.Activity; import android.graphics.Rect; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.transition.Transition.EpicenterCallback; import android.util.ArrayMap; @@ -30,6 +31,7 @@ import com.android.frameworks.coretests.R; import java.lang.reflect.Field; +@LargeTest public class TransitionTest extends ActivityInstrumentationTestCase2 { Activity mActivity; public TransitionTest() { diff --git a/core/tests/coretests/src/android/util/ArrayMapTest.java b/core/tests/coretests/src/android/util/ArrayMapTest.java index 32aa29fa3339..f0cc7f77fe63 100644 --- a/core/tests/coretests/src/android/util/ArrayMapTest.java +++ b/core/tests/coretests/src/android/util/ArrayMapTest.java @@ -14,6 +14,7 @@ package android.util; +import android.support.test.filters.LargeTest; import android.util.ArrayMap; import junit.framework.TestCase; @@ -24,6 +25,7 @@ import java.util.ConcurrentModificationException; /** * Unit tests for ArrayMap that don't belong in CTS. */ +@LargeTest public class ArrayMapTest extends TestCase { private static final String TAG = "ArrayMapTest"; ArrayMap map = new ArrayMap<>(); diff --git a/core/tests/coretests/src/android/util/Base64Test.java b/core/tests/coretests/src/android/util/Base64Test.java index 53368d40104e..3aee5839983e 100644 --- a/core/tests/coretests/src/android/util/Base64Test.java +++ b/core/tests/coretests/src/android/util/Base64Test.java @@ -16,15 +16,17 @@ package android.util; -import java.io.IOException; -import java.io.InputStream; -import java.util.Arrays; -import junit.framework.TestCase; +import android.support.test.filters.LargeTest; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.Arrays; import java.util.Random; +import junit.framework.TestCase; +@LargeTest public class Base64Test extends TestCase { private static final String TAG = "Base64Test"; diff --git a/core/tests/coretests/src/android/util/LocalLogTest.java b/core/tests/coretests/src/android/util/LocalLogTest.java index a63c8a084964..5144c85e72a2 100644 --- a/core/tests/coretests/src/android/util/LocalLogTest.java +++ b/core/tests/coretests/src/android/util/LocalLogTest.java @@ -16,6 +16,8 @@ package android.util; +import android.support.test.filters.LargeTest; + import junit.framework.TestCase; import java.io.PrintWriter; @@ -24,7 +26,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; - +@LargeTest public class LocalLogTest extends TestCase { public void testA() { diff --git a/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java b/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java index cb468bc68eeb..3f03db9dc1fb 100644 --- a/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java +++ b/core/tests/coretests/src/android/util/LongSparseLongArrayTest.java @@ -16,6 +16,8 @@ package android.util; +import android.support.test.filters.LargeTest; + import junit.framework.TestCase; import java.util.HashMap; @@ -26,6 +28,7 @@ import java.util.Random; /** * Tests for {@link LongSparseLongArray}. */ +@LargeTest public class LongSparseLongArrayTest extends TestCase { private static final String TAG = "LongSparseLongArrayTest"; diff --git a/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java b/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java index 23d025164ed1..fba8eae6c3dd 100644 --- a/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java +++ b/core/tests/coretests/src/android/view/ScaleGestureDetectorTest.java @@ -17,6 +17,7 @@ package android.view; import android.content.Context; +import android.support.test.filters.LargeTest; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; import android.test.ActivityInstrumentationTestCase2; @@ -36,6 +37,7 @@ import org.junit.runner.RunWith; import static android.support.test.espresso.matcher.ViewMatchers.withId; import static android.support.test.espresso.Espresso.onView; +@LargeTest public class ScaleGestureDetectorTest extends ActivityInstrumentationTestCase2 { private ScaleGesture mScaleGestureActivity; diff --git a/core/tests/coretests/src/android/view/ViewAttachTest.java b/core/tests/coretests/src/android/view/ViewAttachTest.java index 44fcd13b5313..aa8f8d82e725 100644 --- a/core/tests/coretests/src/android/view/ViewAttachTest.java +++ b/core/tests/coretests/src/android/view/ViewAttachTest.java @@ -20,6 +20,7 @@ import android.content.Context; import android.content.pm.ActivityInfo; import android.graphics.PixelFormat; import android.os.SystemClock; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.test.UiThreadTest; import android.view.View; @@ -28,6 +29,7 @@ import android.view.WindowManager; import com.android.frameworks.coretests.R; +@LargeTest public class ViewAttachTest extends ActivityInstrumentationTestCase2 { diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java index 2f32d13693c7..4de8155663f5 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityCacheTest.java @@ -28,6 +28,7 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.support.test.filters.LargeTest; import android.support.test.runner.AndroidJUnit4; import android.view.View; @@ -42,7 +43,7 @@ import java.util.Arrays; import java.util.List; import java.util.concurrent.atomic.AtomicInteger; - +@LargeTest @RunWith(AndroidJUnit4.class) public class AccessibilityCacheTest { private static final int WINDOW_ID_1 = 0xBEEF; diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java index c1b2309ae64a..318d122b3f2f 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityInteractionClientTest.java @@ -22,6 +22,7 @@ import static org.mockito.MockitoAnnotations.initMocks; import android.os.Bundle; import android.os.RemoteException; +import android.support.test.filters.LargeTest; import android.support.test.runner.AndroidJUnit4; import libcore.util.EmptyArray; @@ -36,6 +37,7 @@ import java.util.List; /** * Tests for AccessibilityInteractionClient */ +@LargeTest @RunWith(AndroidJUnit4.class) public class AccessibilityInteractionClientTest { private static final int MOCK_CONNECTION_ID = 0xabcd; diff --git a/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java b/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java index 79e6316ed614..b135025f6d21 100644 --- a/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java +++ b/core/tests/coretests/src/android/view/accessibility/AccessibilityNodeInfoTest.java @@ -18,6 +18,7 @@ package android.view.accessibility; import static org.junit.Assert.fail; +import android.support.test.filters.LargeTest; import android.support.test.runner.AndroidJUnit4; import android.util.ArraySet; import android.view.accessibility.AccessibilityNodeInfo.AccessibilityAction; @@ -29,6 +30,7 @@ import org.junit.runner.RunWith; import java.util.ArrayList; +@LargeTest @RunWith(AndroidJUnit4.class) public class AccessibilityNodeInfoTest { diff --git a/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java b/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java index e3c91e64f69c..9edbf3efeebb 100644 --- a/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java +++ b/core/tests/coretests/src/android/view/inputmethod/InputMethodInfoTest.java @@ -26,6 +26,7 @@ import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.os.Bundle; import android.os.Parcel; +import android.support.test.filters.LargeTest; import android.support.test.InstrumentationRegistry; import android.support.test.runner.AndroidJUnit4; @@ -34,6 +35,7 @@ import com.android.frameworks.coretests.R; import org.junit.Test; import org.junit.runner.RunWith; +@LargeTest @RunWith(AndroidJUnit4.class) public class InputMethodInfoTest { diff --git a/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java index 9347b27bbf5d..8ed0d86d850d 100644 --- a/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java +++ b/core/tests/coretests/src/android/view/menu/MenuLayoutLandscapeTest.java @@ -21,8 +21,10 @@ import com.android.internal.view.menu.IconMenuView; import com.android.internal.view.menu.MenuBuilder; import android.content.pm.ActivityInfo; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase; +@LargeTest public class MenuLayoutLandscapeTest extends ActivityInstrumentationTestCase { private static final String LONG_TITLE = "Really really really really really really really really really really long title"; private static final String SHORT_TITLE = "Item"; diff --git a/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java b/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java index b053699673aa..ccf12643593b 100644 --- a/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java +++ b/core/tests/coretests/src/android/view/menu/MenuLayoutPortraitTest.java @@ -16,13 +16,12 @@ package android.view.menu; -import android.util.KeyUtils; -import com.android.internal.view.menu.IconMenuView; -import com.android.internal.view.menu.MenuBuilder; - import android.content.pm.ActivityInfo; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase; +import android.util.KeyUtils; +@LargeTest public class MenuLayoutPortraitTest extends ActivityInstrumentationTestCase { private static final String LONG_TITLE = "Really really really really really really really really really really long title"; private static final String SHORT_TITLE = "Item"; diff --git a/core/tests/coretests/src/android/widget/DatePickerFocusTest.java b/core/tests/coretests/src/android/widget/DatePickerFocusTest.java index 513e40f4bcc3..be85450be429 100644 --- a/core/tests/coretests/src/android/widget/DatePickerFocusTest.java +++ b/core/tests/coretests/src/android/widget/DatePickerFocusTest.java @@ -19,6 +19,7 @@ package android.widget; import android.app.Activity; import android.app.Instrumentation; import android.os.SystemClock; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.view.KeyEvent; import android.view.View; @@ -28,6 +29,7 @@ import com.android.frameworks.coretests.R; /** * Test {@link DatePicker} focus changes. */ +@LargeTest public class DatePickerFocusTest extends ActivityInstrumentationTestCase2 { private Activity mActivity; diff --git a/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java b/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java index 28a3b67f7b0d..2add22105681 100644 --- a/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java +++ b/core/tests/coretests/src/android/widget/SelectionActionModeHelperTest.java @@ -22,6 +22,7 @@ import static java.util.function.Function.identity; import android.graphics.PointF; import android.graphics.RectF; +import android.support.test.filters.LargeTest; import org.junit.Test; import org.junit.runner.RunWith; @@ -31,6 +32,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +@LargeTest @RunWith(JUnit4.class) public final class SelectionActionModeHelperTest { diff --git a/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java index b591e5f4f690..43986eed9b14 100644 --- a/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java +++ b/core/tests/coretests/src/android/widget/focus/HorizontalFocusSearchTest.java @@ -18,6 +18,7 @@ package android.widget.focus; import android.widget.focus.HorizontalFocusSearch; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase; import android.test.suitebuilder.annotation.Suppress; import android.widget.LinearLayout; @@ -32,6 +33,7 @@ import static android.widget.focus.VerticalFocusSearchTest.NewFocusSearchAlg; * various widths and vertical placements. */ // Suppress until bug http://b/issue?id=1416545 is fixed. +@LargeTest @Suppress public class HorizontalFocusSearchTest extends ActivityInstrumentationTestCase { diff --git a/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java index f05d83abde5e..f01422ebfc52 100644 --- a/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java +++ b/core/tests/coretests/src/android/widget/focus/VerticalFocusSearchTest.java @@ -18,6 +18,7 @@ package android.widget.focus; import android.widget.focus.VerticalFocusSearch; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase; import android.test.suitebuilder.annotation.Suppress; import android.view.FocusFinder; @@ -31,6 +32,7 @@ import android.widget.LinearLayout; * various widths and horizontal placements. */ // Suppress until bug http://b/issue?id=1416545 is fixed +@LargeTest @Suppress public class VerticalFocusSearchTest extends ActivityInstrumentationTestCase { diff --git a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java index 400fd7d9247a..9a8e63421d61 100644 --- a/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java +++ b/core/tests/coretests/src/android/widget/listview/arrowscroll/ListWithFirstScreenUnSelectableTest.java @@ -16,12 +16,14 @@ package android.widget.listview.arrowscroll; -import android.widget.listview.ListWithFirstScreenUnSelectable; +import android.support.test.filters.LargeTest; import android.test.ActivityInstrumentationTestCase2; import android.view.KeyEvent; import android.widget.ListView; +import android.widget.listview.ListWithFirstScreenUnSelectable; import android.widget.AdapterView; +@LargeTest public class ListWithFirstScreenUnSelectableTest extends ActivityInstrumentationTestCase2 { private ListView mListView; -- 2.11.0