[Android WebViewShell] Make WebViewLayoutTest runnable with test_runner.py

android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewLayoutTest.java

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.webview_shell;
 
+import android.os.Environment;
 import android.test.ActivityInstrumentationTestCase2;
 
 import org.chromium.base.Log;
 
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 
 /**
  * Tests running end-to-end layout tests.
  */
 public class WebViewLayoutTest
         extends ActivityInstrumentationTestCase2<WebViewLayoutTestActivity> {
 
     private static final String TAG = "WebViewLayoutTest";
-    private static final String PATH_PREFIX = "/data/local/tmp/webview_test/";
+
+    private static final String EXTERNAL_PREFIX =
+            Environment.getExternalStorageDirectory().getAbsolutePath() + "/";
+    private static final String BASE_WEBVIEW_TEST_PATH = "android_webview/tools/WebViewShell/test/";
+    private static final String PATH_WEBVIEW_PREFIX = EXTERNAL_PREFIX + BASE_WEBVIEW_TEST_PATH;
+
     private static final long TIMEOUT_SECONDS = 20;
+
     private WebViewLayoutTestActivity mTestActivity;
 
     public WebViewLayoutTest() {
         super(WebViewLayoutTestActivity.class);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         mTestActivity = (WebViewLayoutTestActivity) getActivity();
     }
 
     @Override
     protected void tearDown() throws Exception {
         mTestActivity.finish();
         super.tearDown();
     }
 
     @Override
     public WebViewLayoutTestRunner getInstrumentation() {
         return (WebViewLayoutTestRunner) super.getInstrumentation();
     }
 
     public void testSimple() throws Exception {
-        runTest("experimental/basic-logging.html", "experimental/basic-logging-expected.txt");
+        runTest("experimental/basic-logging.html",
+                "experimental/basic-logging-expected.txt");
     }
 
     public void testGlobalInterface() throws Exception {
         runTest("webexposed/global-interface-listing.html",

[jbudorick, 2015/06/29 17:49:05]

This suite failed locally for me because this file doesn't seem to exist in the
repository, unlike basic-logging.html in testSimple.

[timvolodine, 2015/06/29 18:06:31]

correct, the global-interface-listing.html (and the corresponding js file) are
actually copied from blink, i.e. third_party/WebKit/LayoutTests/.. The idea is
to actually reuse the blink layout tests, but with different expectations.

The actual recipe here https://codereview.chromium.org/1215703004/ does the
copying before running test_runner with isolate. Please feel free to comment
there as well as this is my first recipe implementation ;)

[jbudorick, 2015/06/29 18:11:19]

In that case, both files should be listed in the isolate file above, and the
corresponding copy logic in the recipe should be removed.

[timvolodine, 2015/06/29 18:19:32]

that won't work unfortunately as all the test files need to be in one directory
(i.e. android_webview/tools/WebView/test/..) because they reference a common
js-test.js file which is different for webview (as opposed to the one in blink)

[jbudorick, 2015/06/29 18:35:21]

If we need our own js-test.js, why don't we have our own
global-interface-listing.html that references it?

I'm primarily concerned that, as is, this test fails if not run by a bot. That's
not a state we want to be in.

[timvolodine, 2015/06/29 18:46:31]

because the blink html files + what they reference except js-test.js should be
the same, so if somebody changes a layout test in blink it will automatically
'propagate' to webview.

For running the tests locally there is a WebViewShell/test/test_runner.sh
script. Now that I think about it it would probably need a small modification to
run with this patch, but it should run fine with the trunk checkout.

[jbudorick, 2015/06/29 18:55:24]

Then what about listing the blink files in the .isolate, then having this test
(or setUp, or something inside the APK) copy them to the necessary locations?
I don't like the idea of having bots run tests differently than devs.

[timvolodine, 2015/06/30 17:39:44]

ok, thanks for the suggestion John! I've updated the patch to do minimal copying
in the apk (i.e. only js-test.js needs copy). That way the recipe doesn't need
to copy anything and the required files are listed in the .isolate.

                 "webexposed/global-interface-listing-expected.txt");
     }
 
     // test helper methods
     private void runTest(final String fileName, final String fileNameExpected)
             throws FileNotFoundException, IOException, InterruptedException, TimeoutException {
-        loadUrlWebViewAsync("file://" + PATH_PREFIX + fileName, mTestActivity);
+        loadUrlWebViewAsync("file://" + PATH_WEBVIEW_PREFIX + fileName, mTestActivity);
 
         if (getInstrumentation().isRebaseline()) {
             // this is the rebase line process;
             mTestActivity.waitForFinish(TIMEOUT_SECONDS, TimeUnit.SECONDS);
             String result = mTestActivity.getTestResult();
             writeFile(fileNameExpected, result, mTestActivity.getFilesDir());
             Log.i(TAG, "file: " + fileNameExpected + " --> rebaselined, length=" + result.length());
         } else {
-            String expected = readFile(PATH_PREFIX + fileNameExpected);
+            String expected = readFile(PATH_WEBVIEW_PREFIX + fileNameExpected);
             mTestActivity.waitForFinish(TIMEOUT_SECONDS, TimeUnit.SECONDS);
             String result = mTestActivity.getTestResult();
             assertEquals(expected, result);
         }
     }
 
     private void loadUrlWebViewAsync(final String fileUrl,
             final WebViewLayoutTestActivity activity) {
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
@@ skipping 34 matching lines @@
             throw new IOException("failed to create directories: " + path);
 
         FileOutputStream outputStream = new FileOutputStream(fileOut);
         try {
             outputStream.write(contents.getBytes());
         } finally {
             outputStream.close();
         }
     }
 }