diff options
author | yolandyan <yolandyan@google.com> | 2015-10-19 18:06:46 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-20 01:07:25 +0000 |
commit | d3825fe7fbfe780da6967c026248842d9f39b11d (patch) | |
tree | cb21596df8fb316cad9ba455e1967d75aaf2f8eb /android_webview/tools | |
parent | 100888961b73a5b51b50db7d614ed0ec117d0c5f (diff) | |
download | chromium_src-d3825fe7fbfe780da6967c026248842d9f39b11d.zip chromium_src-d3825fe7fbfe780da6967c026248842d9f39b11d.tar.gz chromium_src-d3825fe7fbfe780da6967c026248842d9f39b11d.tar.bz2 |
Move WebViewLayoutTestRunner.java to WebViewShellTestRunner.java to
allow both layout tests and page cycler to use this test runner
This is to solve the conflict in the following 2 CLs
https://codereview.chromium.org/1402833002
https://codereview.chromium.org/1410023002
Review URL: https://codereview.chromium.org/1413663006
Cr-Commit-Position: refs/heads/master@{#354944}
Diffstat (limited to 'android_webview/tools')
-rw-r--r-- | android_webview/tools/PageCycler/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewShellTestRunner.java (renamed from android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java) | 6 | ||||
-rw-r--r-- | android_webview/tools/WebViewShellTest/AndroidManifest.xml | 2 | ||||
-rw-r--r-- | android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java | 5 |
4 files changed, 8 insertions, 7 deletions
diff --git a/android_webview/tools/PageCycler/AndroidManifest.xml b/android_webview/tools/PageCycler/AndroidManifest.xml index 49fb1e3..f96b90c 100644 --- a/android_webview/tools/PageCycler/AndroidManifest.xml +++ b/android_webview/tools/PageCycler/AndroidManifest.xml @@ -25,7 +25,7 @@ android:exported="true"/> </application> - <instrumentation android:name="org.chromium.base.test.BaseInstrumentationTestRunner" + <instrumentation android:name="org.chromium.webview_shell.WebViewShellTestRunner" android:targetPackage="org.chromium.webview_shell" android:label="Page cycler for org.chromium.webview_shell" /> </manifest> diff --git a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewShellTestRunner.java index 44b745f..cc22113 100644 --- a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTestRunner.java +++ b/android_webview/tools/WebViewShell/src/org/chromium/webview_shell/WebViewShellTestRunner.java @@ -2,7 +2,7 @@ // 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.test; +package org.chromium.webview_shell; import android.os.Bundle; import android.test.AndroidTestRunner; @@ -13,7 +13,7 @@ import org.chromium.test.reporter.TestStatusListener; /** * Customized test runner for running instrumentation tests in WebViewBrowserTests. */ -public class WebViewLayoutTestRunner extends InstrumentationTestRunner { +public class WebViewShellTestRunner extends InstrumentationTestRunner { private String mModeArgument; private static final String MODE_REBASELINE = "rebaseline"; @@ -35,4 +35,4 @@ public class WebViewLayoutTestRunner extends InstrumentationTestRunner { runner.addTestListener(new TestStatusListener(getContext())); return runner; } -}
\ No newline at end of file +} diff --git a/android_webview/tools/WebViewShellTest/AndroidManifest.xml b/android_webview/tools/WebViewShellTest/AndroidManifest.xml index 00ebd4c..24f9af2 100644 --- a/android_webview/tools/WebViewShellTest/AndroidManifest.xml +++ b/android_webview/tools/WebViewShellTest/AndroidManifest.xml @@ -30,7 +30,7 @@ android:exported="true"/> </application> - <instrumentation android:name="org.chromium.webview_shell.test.WebViewLayoutTestRunner" + <instrumentation android:name="org.chromium.webview_shell.WebViewShellTestRunner" android:targetPackage="org.chromium.webview_shell" android:label="Layout tests for org.chromium.webview_shell" /> </manifest> diff --git a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java b/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java index 8285679..51d17ae 100644 --- a/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java +++ b/android_webview/tools/WebViewShellTest/src/org/chromium/webview_shell/test/WebViewLayoutTest.java @@ -12,6 +12,7 @@ import junit.framework.ComparisonFailure; import org.chromium.base.Log; import org.chromium.webview_shell.WebViewLayoutTestActivity; +import org.chromium.webview_shell.WebViewShellTestRunner; import java.io.BufferedReader; import java.io.File; @@ -65,8 +66,8 @@ public class WebViewLayoutTest } @Override - public WebViewLayoutTestRunner getInstrumentation() { - return (WebViewLayoutTestRunner) super.getInstrumentation(); + public WebViewShellTestRunner getInstrumentation() { + return (WebViewShellTestRunner) super.getInstrumentation(); } @MediumTest |