commit 0e149d2d34b28191bd20c31db311a0c4c9389c9a
author Daniel Chapin <chapin@google.com> Wed Jan 29 02:32:21 2020 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Wed Jan 29 02:59:14 2020 +0000
tree aa0962d44cee153290657354aaa4bb2326935dd1
parent 62680fd53fe1499a3fd40758c21a2d33cfad1820

Revert "Update toast tests for system UI move"

Revert submission 10169253-custom-toast-2

Reason for revert: b/148438364
Reverted Changes:
I8355c5c62: Disable feature-flag before CTS targeted at SDK 29...
Id0021cdc6: Move text toast creation to system UI
I586cdec1c: Update toast tests for system UI move
I8516e6569: Add ToastUI component to ARC
Id415df7d9: Configure ToastUI in SystemUIGoogle for DI
Id0021cdc6: Move text toast creation to system UI

Change-Id: I3425c6298a9f89bb866d8b888e2523c2ef404eef
(cherry picked from commit b87aa702b8aa05b2fb868182dad7d78a73cf8f96)

tests/tests/widget/src/android/widget/cts/ToastTest.java

diff --git a/tests/tests/widget/src/android/widget/cts/ToastTest.java b/tests/tests/widget/src/android/widget/cts/ToastTest.java
index fd19757..e9ad80d 100644
--- a/tests/tests/widget/src/android/widget/cts/ToastTest.java
+++ b/tests/tests/widget/src/android/widget/cts/ToastTest.java
@@ -516,19 +516,19 @@
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_SHORT, toast.getDuration());
         View view = toast.getView();
-        assertNull(view);
+        assertNotNull(view);
 
         toast = Toast.makeText(mContext, "cts", Toast.LENGTH_LONG);
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_LONG, toast.getDuration());
         view = toast.getView();
-        assertNull(view);
+        assertNotNull(view);
 
         toast = Toast.makeText(mContext, null, Toast.LENGTH_LONG);
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_LONG, toast.getDuration());
         view = toast.getView();
-        assertNull(view);
+        assertNotNull(view);
     }
 
     @UiThreadTest
@@ -545,13 +545,13 @@
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_LONG, toast.getDuration());
         View view = toast.getView();
-        assertNull(view);
+        assertNotNull(view);
 
         toast = Toast.makeText(mContext, R.string.hello_android, Toast.LENGTH_SHORT);
         assertNotNull(toast);
         assertEquals(Toast.LENGTH_SHORT, toast.getDuration());
         view = toast.getView();
-        assertNull(view);
+        assertNotNull(view);
     }
 
     @UiThreadTest
@@ -592,10 +592,10 @@
     }
 
     @UiThreadTest
-    @Test(expected = IllegalStateException.class)
-    public void testSetTextFromStringNonNullView() {
+    @Test(expected=RuntimeException.class)
+    public void testSetTextFromStringNullView() {
         Toast toast = Toast.makeText(mContext, R.string.text, Toast.LENGTH_LONG);
-        toast.setView(new TextView(mContext));
+        toast.setView(null);
         toast.setText(null);
     }