commit d0ec3cdde1494606da16a6aa4b66bb931f7ea56f
author Felipe Leme <felipeal@google.com> Thu Aug 09 16:49:17 2018 -0700
committer Felipe Leme <felipeal@google.com> Fri Aug 10 11:56:20 2018 -0700
tree 270857a07c3cb811100826988f0e1c45303b5df4
parent 63ed9bda107f37b23955fffd3e31b68bbc5d395c

Fixed tests that were broken due to a bad merge.

Fixes: 112436631

Test: atest WebViewActivityTest

Change-Id: Ia310a5cc387b3005b81e35bf9dd50d7f7fa48c6d

tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java

diff --git a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java
index 08d4c70..e51bbfc 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivity.java
@@ -17,6 +17,8 @@
 
 import static android.autofillservice.cts.Timeouts.WEBVIEW_TIMEOUT;
 
+import static com.google.common.truth.Truth.assertThat;
+
 import android.content.Context;
 import android.os.Bundle;
 import android.os.SystemClock;
@@ -112,6 +114,7 @@
 
             });
             mWebView.loadUrl(FAKE_URL);
+            assertThat(mWebView.isAutofillEnabled()).isTrue();
         });
 
         // Wait until it's loaded.

tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java

diff --git a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java
index 57bca35..7149899 100644
--- a/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java
+++ b/tests/autofillservice/src/android/autofillservice/cts/WebViewActivityTest.java
@@ -71,7 +71,6 @@
     @Before
     public void setActivity() {
         mActivity = mActivityRule.getActivity();
-        assertAutofillEnabledOnWebView();
     }
 
     @BeforeClass
@@ -611,8 +610,4 @@
                 ID_OUTSIDE2);
         Helper.assertTextAndValue(outside2SaveNode, "SWEETER");
     }
-
-    private void assertAutofillEnabledOnWebView() {
-        assertThat(mActivity.mWebView.isAutofillEnabled()).isTrue();
-    }
 }