summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorVadim Tryshev <vadimt@google.com>2019-05-02 23:02:04 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2019-05-02 23:02:04 +0000
commit479c3d445edd74778d9d655327fc0c95254e85f6 (patch)
tree06c00aa649fe613ee2e7e891e5d40d57d0dc7b3a /tests
parenta34072b76b2fbbf8343a9791e35f22971a0d5fd0 (diff)
parent0b927428d6845ee2561d74e06da2a1d7fee8a3dd (diff)
downloadandroid_packages_apps_Trebuchet-479c3d445edd74778d9d655327fc0c95254e85f6.tar.gz
android_packages_apps_Trebuchet-479c3d445edd74778d9d655327fc0c95254e85f6.tar.bz2
android_packages_apps_Trebuchet-479c3d445edd74778d9d655327fc0c95254e85f6.zip
Merge "Enabling portrait widgets tests without converting to TAPL" into ub-launcher3-qt-dev
Diffstat (limited to 'tests')
-rw-r--r--tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java8
-rw-r--r--tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java4
2 files changed, 6 insertions, 6 deletions
diff --git a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
index 84452b416..06a8bca13 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddConfigWidgetTest.java
@@ -71,25 +71,25 @@ public class AddConfigWidgetTest extends AbstractLauncherUiTest {
}
@Test
- @Ignore // Convert test to TAPL and enable them; b/131116002
+ // Convert test to TAPL b/131116002
public void testWidgetConfig() throws Throwable {
runTest(false, true);
}
@Test
- @Ignore // Convert test to TAPL and enable them; b/131116002
+ @Ignore // b/121280703
public void testWidgetConfig_rotate() throws Throwable {
runTest(true, true);
}
@Test
- @Ignore // Convert test to TAPL and enable them; b/131116002
+ // Convert test to TAPL b/131116002
public void testConfigCancelled() throws Throwable {
runTest(false, false);
}
@Test
- @Ignore // Convert test to TAPL and enable them; b/131116002
+ @Ignore // b/121280703
public void testConfigCancelled_rotate() throws Throwable {
runTest(true, false);
}
diff --git a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
index 90c339fda..7bebf2f15 100644
--- a/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
+++ b/tests/src/com/android/launcher3/ui/widget/AddWidgetTest.java
@@ -49,19 +49,19 @@ public class AddWidgetTest extends AbstractLauncherUiTest {
@Rule public ShellCommandRule mGrantWidgetRule = ShellCommandRule.grantWidgetBind();
@Test
- @Ignore // Convert test to TAPL and enable them; b/131116002
public void testDragIcon_portrait() throws Throwable {
lockRotation(true);
performTest();
}
@Test
- @Ignore // Convert test to TAPL and enable them; b/131116002
+ @Ignore // b/121280703
public void testDragIcon_landscape() throws Throwable {
lockRotation(false);
performTest();
}
+ // b/131116002
private void performTest() throws Throwable {
clearHomescreen();
mActivityMonitor.startLauncher();