diff options
author | Hyunyoung Song <hyunyoungs@google.com> | 2016-05-05 21:14:17 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2016-05-05 21:14:17 +0000 |
commit | d9d76820c52de9228446296c1aeaaae06e6c5248 (patch) | |
tree | b15becd183cd860735c9155ef497ff6535d6b5fd | |
parent | 45e99c93f22f6afcd3bc1c4b85172927d5478356 (diff) | |
parent | 3074965cdb63adc8f834afefb282f43d3d9e4c2f (diff) | |
download | android_packages_apps_Trebuchet-d9d76820c52de9228446296c1aeaaae06e6c5248.tar.gz android_packages_apps_Trebuchet-d9d76820c52de9228446296c1aeaaae06e6c5248.tar.bz2 android_packages_apps_Trebuchet-d9d76820c52de9228446296c1aeaaae06e6c5248.zip |
Merge "Add test size annotation." into ub-launcher3-calgary
am: 3074965cdb
* commit '3074965cdb63adc8f834afefb282f43d3d9e4c2f':
Add test size annotation.
Change-Id: Ie97ee19ea9446884ed3b4d98609778a72f1b5c50
4 files changed, 8 insertions, 0 deletions
diff --git a/tests/src/com/android/launcher3/BindWidgetTest.java b/tests/src/com/android/launcher3/BindWidgetTest.java index 4e8881cf0..34b117430 100644 --- a/tests/src/com/android/launcher3/BindWidgetTest.java +++ b/tests/src/com/android/launcher3/BindWidgetTest.java @@ -19,6 +19,7 @@ import android.os.ParcelFileDescriptor; import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiSelector; import android.test.InstrumentationTestCase; +import android.test.suitebuilder.annotation.LargeTest; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.PackageInstallerCompat; @@ -38,6 +39,7 @@ import java.util.concurrent.atomic.AtomicReference; * * Note running these tests will clear the workspace on the device. */ +@LargeTest @TargetApi(Build.VERSION_CODES.LOLLIPOP) public class BindWidgetTest extends InstrumentationTestCase { diff --git a/tests/src/com/android/launcher3/QuickAddWidgetTest.java b/tests/src/com/android/launcher3/QuickAddWidgetTest.java index 027c46597..007829435 100644 --- a/tests/src/com/android/launcher3/QuickAddWidgetTest.java +++ b/tests/src/com/android/launcher3/QuickAddWidgetTest.java @@ -9,6 +9,7 @@ import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject2; import android.support.test.uiautomator.Until; import android.test.InstrumentationTestCase; +import android.test.suitebuilder.annotation.LargeTest; import android.view.MotionEvent; import android.view.ViewConfiguration; @@ -17,6 +18,7 @@ import java.util.List; /** * Add an arbitrary widget from the widget picker very quickly to test potential race conditions. */ +@LargeTest public class QuickAddWidgetTest extends InstrumentationTestCase { // Disabled because it's flaky and not particularly useful. But this class could still be useful // as an example if we want other UI tests in the future. diff --git a/tests/src/com/android/launcher3/RotationPreferenceTest.java b/tests/src/com/android/launcher3/RotationPreferenceTest.java index 0168ee66f..7259d35c2 100644 --- a/tests/src/com/android/launcher3/RotationPreferenceTest.java +++ b/tests/src/com/android/launcher3/RotationPreferenceTest.java @@ -8,10 +8,12 @@ import android.support.test.uiautomator.UiDevice; import android.support.test.uiautomator.UiObject; import android.support.test.uiautomator.UiSelector; import android.test.InstrumentationTestCase; +import android.test.suitebuilder.annotation.MediumTest; /** * Test for auto rotate preference. */ +@MediumTest public class RotationPreferenceTest extends InstrumentationTestCase { private UiDevice mDevice; diff --git a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java index 46dac0aab..ccd8f7361 100644 --- a/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java +++ b/tests/src/com/android/launcher3/model/GridSizeMigrationTaskTest.java @@ -5,6 +5,7 @@ import android.content.Intent; import android.database.Cursor; import android.graphics.Point; import android.test.ProviderTestCase2; +import android.test.suitebuilder.annotation.MediumTest; import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherModel; @@ -19,6 +20,7 @@ import java.util.HashSet; /** * Unit tests for {@link GridSizeMigrationTask} */ +@MediumTest public class GridSizeMigrationTaskTest extends ProviderTestCase2<TestLauncherProvider> { private static final long DESKTOP = LauncherSettings.Favorites.CONTAINER_DESKTOP; |