зеркало из https://github.com/mozilla/gecko-dev.git
Bug 905703 - Remove preprocessing from robocop harness and tests. r=nalexander
--HG-- rename : build/mobile/robocop/Actions.java.in => build/mobile/robocop/Actions.java rename : build/mobile/robocop/Assert.java.in => build/mobile/robocop/Assert.java rename : build/mobile/robocop/Driver.java.in => build/mobile/robocop/Driver.java rename : build/mobile/robocop/Element.java.in => build/mobile/robocop/Element.java rename : build/mobile/robocop/FennecInstrumentationTestRunner.java.in => build/mobile/robocop/FennecInstrumentationTestRunner.java rename : build/mobile/robocop/FennecMochitestAssert.java.in => build/mobile/robocop/FennecMochitestAssert.java rename : build/mobile/robocop/FennecNativeActions.java.in => build/mobile/robocop/FennecNativeActions.java rename : build/mobile/robocop/FennecNativeDriver.java.in => build/mobile/robocop/FennecNativeDriver.java rename : build/mobile/robocop/FennecNativeElement.java.in => build/mobile/robocop/FennecNativeElement.java rename : build/mobile/robocop/FennecTalosAssert.java.in => build/mobile/robocop/FennecTalosAssert.java rename : build/mobile/robocop/PaintedSurface.java.in => build/mobile/robocop/PaintedSurface.java rename : build/mobile/robocop/RoboCopException.java.in => build/mobile/robocop/RoboCopException.java rename : build/mobile/robocop/RobocopUtils.java.in => build/mobile/robocop/RobocopUtils.java rename : mobile/android/base/tests/AboutHomeTest.java.in => mobile/android/base/tests/AboutHomeTest.java rename : mobile/android/base/tests/BaseTest.java.in => mobile/android/base/tests/BaseTest.java rename : mobile/android/base/tests/ContentContextMenuTest.java.in => mobile/android/base/tests/ContentContextMenuTest.java rename : mobile/android/base/tests/ContentProviderTest.java.in => mobile/android/base/tests/ContentProviderTest.java rename : mobile/android/base/tests/DatabaseHelper.java.in => mobile/android/base/tests/DatabaseHelper.java rename : mobile/android/base/tests/JavascriptTest.java.in => mobile/android/base/tests/JavascriptTest.java rename : mobile/android/base/tests/MotionEventHelper.java.in => mobile/android/base/tests/MotionEventHelper.java rename : mobile/android/base/tests/MotionEventReplayer.java.in => mobile/android/base/tests/MotionEventReplayer.java rename : mobile/android/base/tests/PixelTest.java.in => mobile/android/base/tests/PixelTest.java rename : mobile/android/base/tests/StringHelper.java.in => mobile/android/base/tests/StringHelper.java rename : mobile/android/base/tests/testAboutPage.java.in => mobile/android/base/tests/testAboutPage.java rename : mobile/android/base/tests/testAddSearchEngine.java.in => mobile/android/base/tests/testAddSearchEngine.java rename : mobile/android/base/tests/testAddonManager.java.in => mobile/android/base/tests/testAddonManager.java rename : mobile/android/base/tests/testAwesomebar.java.in => mobile/android/base/tests/testAwesomebar.java rename : mobile/android/base/tests/testAwesomebarSwipes.java.in => mobile/android/base/tests/testAwesomebarSwipes.java rename : mobile/android/base/tests/testAxisLocking.java.in => mobile/android/base/tests/testAxisLocking.java rename : mobile/android/base/tests/testBookmark.java.in => mobile/android/base/tests/testBookmark.java rename : mobile/android/base/tests/testBookmarkKeyword.java.in => mobile/android/base/tests/testBookmarkKeyword.java rename : mobile/android/base/tests/testBookmarklets.java.in => mobile/android/base/tests/testBookmarklets.java rename : mobile/android/base/tests/testBrowserProvider.java.in => mobile/android/base/tests/testBrowserProvider.java rename : mobile/android/base/tests/testBrowserProviderPerf.java.in => mobile/android/base/tests/testBrowserProviderPerf.java rename : mobile/android/base/tests/testBrowserSearchVisibility.java.in => mobile/android/base/tests/testBrowserSearchVisibility.java rename : mobile/android/base/tests/testCheck.java.in => mobile/android/base/tests/testCheck.java rename : mobile/android/base/tests/testCheck2.java.in => mobile/android/base/tests/testCheck2.java rename : mobile/android/base/tests/testClearPrivateData.java.in => mobile/android/base/tests/testClearPrivateData.java rename : mobile/android/base/tests/testDeviceSearchEngine.java.in => mobile/android/base/tests/testDeviceSearchEngine.java rename : mobile/android/base/tests/testDistribution.java.in => mobile/android/base/tests/testDistribution.java rename : mobile/android/base/tests/testDoorHanger.java.in => mobile/android/base/tests/testDoorHanger.java rename : mobile/android/base/tests/testFindInPage.java.in => mobile/android/base/tests/testFindInPage.java rename : mobile/android/base/tests/testFlingCorrectness.java.in => mobile/android/base/tests/testFlingCorrectness.java rename : mobile/android/base/tests/testFormHistory.java.in => mobile/android/base/tests/testFormHistory.java rename : mobile/android/base/tests/testHistory.java.in => mobile/android/base/tests/testHistory.java rename : mobile/android/base/tests/testImportFromAndroid.java.in => mobile/android/base/tests/testImportFromAndroid.java rename : mobile/android/base/tests/testInputUrlBar.java.in => mobile/android/base/tests/testInputUrlBar.java rename : mobile/android/base/tests/testJNI.java.in => mobile/android/base/tests/testJNI.java rename : mobile/android/base/tests/testJarReader.java.in => mobile/android/base/tests/testJarReader.java rename : mobile/android/base/tests/testLinkContextMenu.java.in => mobile/android/base/tests/testLinkContextMenu.java rename : mobile/android/base/tests/testLoad.java.in => mobile/android/base/tests/testLoad.java rename : mobile/android/base/tests/testMailToContextMenu.java.in => mobile/android/base/tests/testMailToContextMenu.java rename : mobile/android/base/tests/testMasterPassword.java.in => mobile/android/base/tests/testMasterPassword.java rename : mobile/android/base/tests/testNewTab.java.in => mobile/android/base/tests/testNewTab.java rename : mobile/android/base/tests/testOrderedBroadcast.java.in => mobile/android/base/tests/testOrderedBroadcast.java rename : mobile/android/base/tests/testOverscroll.java.in => mobile/android/base/tests/testOverscroll.java rename : mobile/android/base/tests/testPan.java.in => mobile/android/base/tests/testPan.java rename : mobile/android/base/tests/testPanCorrectness.java.in => mobile/android/base/tests/testPanCorrectness.java rename : mobile/android/base/tests/testPasswordEncrypt.java.in => mobile/android/base/tests/testPasswordEncrypt.java rename : mobile/android/base/tests/testPasswordProvider.java.in => mobile/android/base/tests/testPasswordProvider.java rename : mobile/android/base/tests/testPermissions.java.in => mobile/android/base/tests/testPermissions.java rename : mobile/android/base/tests/testPictureLinkContextMenu.java.in => mobile/android/base/tests/testPictureLinkContextMenu.java rename : mobile/android/base/tests/testPrefsObserver.java.in => mobile/android/base/tests/testPrefsObserver.java rename : mobile/android/base/tests/testPrivateBrowsing.java.in => mobile/android/base/tests/testPrivateBrowsing.java rename : mobile/android/base/tests/testPromptGridInput.java.in => mobile/android/base/tests/testPromptGridInput.java rename : mobile/android/base/tests/testReaderMode.java.in => mobile/android/base/tests/testReaderMode.java rename : mobile/android/base/tests/testSearchSuggestions.java.in => mobile/android/base/tests/testSearchSuggestions.java rename : mobile/android/base/tests/testSettingsMenuItems.java.in => mobile/android/base/tests/testSettingsMenuItems.java rename : mobile/android/base/tests/testShareLink.java.in => mobile/android/base/tests/testShareLink.java rename : mobile/android/base/tests/testSharedPreferences.java.in => mobile/android/base/tests/testSharedPreferences.java rename : mobile/android/base/tests/testSystemPages.java.in => mobile/android/base/tests/testSystemPages.java rename : mobile/android/base/tests/testTabHistory.java.in => mobile/android/base/tests/testTabHistory.java rename : mobile/android/base/tests/testThumbnails.java.in => mobile/android/base/tests/testThumbnails.java rename : mobile/android/base/tests/testVkbOverlap.java.in => mobile/android/base/tests/testVkbOverlap.java rename : mobile/android/base/tests/test_bug720538.java.in => mobile/android/base/tests/test_bug720538.java extra : rebase_source : ce4905c426eaf5cd47b7b1457ddbd6d3d5b55c00
This commit is contained in:
Brian Nicholson
Родитель
de1f0214e6
Коммит
282dae1ab8
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
|
@ -8,7 +8,7 @@
|
|||
<uses-sdk android:minSdkVersion="8" />
|
||||
|
||||
<instrumentation
|
||||
android:name="@ANDROID_PACKAGE_NAME@.FennecInstrumentationTestRunner"
|
||||
android:name="org.mozilla.gecko.FennecInstrumentationTestRunner"
|
||||
android:targetPackage="@ANDROID_PACKAGE_NAME@" />
|
||||
|
||||
<application
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
public interface Assert {
|
||||
void dumpLog(String message);
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import java.util.List;
|
||||
import android.app.Activity;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
/**
|
||||
* Element provides access to a specific UI view (android.view.View).
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import android.os.Bundle;
|
||||
import android.test.InstrumentationTestRunner;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import java.util.LinkedList;
|
||||
import android.os.SystemClock;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import java.lang.reflect.InvocationTargetException;
|
||||
import java.lang.reflect.Method;
|
||||
|
|
@ -28,7 +27,7 @@ import android.view.ViewConfiguration;
|
|||
|
||||
import com.jayway.android.robotium.solo.Solo;
|
||||
|
||||
import static @ANDROID_PACKAGE_NAME@.FennecNativeDriver.LogLevel;
|
||||
import static org.mozilla.gecko.FennecNativeDriver.LogLevel;
|
||||
|
||||
public class FennecNativeActions implements Actions {
|
||||
private Solo mSolo;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import java.io.BufferedOutputStream;
|
||||
import java.io.BufferedReader;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.view.View;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
|
||||
public class FennecTalosAssert implements Assert {
|
||||
|
|
@ -30,18 +30,14 @@ _JAVA_HARNESS := \
|
|||
PaintedSurface.java \
|
||||
$(NULL)
|
||||
|
||||
# pre-process harness sources
|
||||
PP_TARGETS += java-harness
|
||||
java-harness := $(addprefix $(srcdir)/,$(addsuffix .in,$(_JAVA_HARNESS)))
|
||||
java-harness-dep := $(addprefix $(CURDIR)/,$(_JAVA_HARNESS))
|
||||
java-harness_PATH := $(CURDIR)
|
||||
java-harness := $(addprefix $(srcdir)/,$(_JAVA_HARNESS))
|
||||
java-tests := $(wildcard $(TESTPATH)/*.java)
|
||||
|
||||
# pre-process test sources
|
||||
PP_TARGETS += java-tests
|
||||
java-tests-src := $(wildcard $(TESTPATH)/*.java.in)
|
||||
java-tests-dep := $(patsubst $(TESTPATH)/%.java.in,$(dir-tests)/%.java,$(java-tests-src))
|
||||
java-tests := $(java-tests-src)
|
||||
java-tests_PATH := $(dir-tests)
|
||||
# pre-process TestConstants.java.in
|
||||
PP_TARGETS += testconstants
|
||||
testconstants-dep := $(dir-tests)/TestConstants.java
|
||||
testconstants := $(TESTPATH)/TestConstants.java.in
|
||||
testconstants_PATH := $(dir-tests)
|
||||
|
||||
PP_TARGETS += manifest
|
||||
manifest := $(srcdir)/AndroidManifest.xml.in
|
||||
|
|
@ -69,15 +65,15 @@ MOCHITEST_ROBOCOP_FILES := \
|
|||
|
||||
GARBAGE += \
|
||||
AndroidManifest.xml \
|
||||
$(java-tests-dep) \
|
||||
$(java-harness-dep) \
|
||||
$(robocop-deps) \
|
||||
$(testconstants-dep) \
|
||||
$(NULL)
|
||||
|
||||
JAVAFILES += \
|
||||
$(java-harness) \
|
||||
$(java-tests) \
|
||||
$(robocop-deps) \
|
||||
$(java-harness-dep) \
|
||||
$(java-tests-dep) \
|
||||
$(testconstants-dep) \
|
||||
$(NULL)
|
||||
|
||||
DEFINES += \
|
||||
|
|
@ -89,8 +85,3 @@ include $(topsrcdir)/config/rules.mk
|
|||
tools:: $(ANDROID_APK_NAME).apk
|
||||
|
||||
GENERATED_DIRS += $(dir-tests)
|
||||
|
||||
# PP_java-tests not fully usable here
|
||||
# Intermediate step toward a library rule.
|
||||
$(dir-tests)/%.java: $(TESTPATH)/%.java.in $(call mkdir_deps,$(dir-tests))
|
||||
$(PYTHON) $(topsrcdir)/config/Preprocessor.py $(DEFINES) $< > $@
|
||||
|
|
|
|||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this file,
|
||||
* You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import java.io.BufferedWriter;
|
||||
import java.io.File;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
public class RoboCopException extends RuntimeException {
|
||||
|
||||
|
|
@ -1,10 +1,8 @@
|
|||
#filter substitution
|
||||
|
||||
/* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package @ANDROID_PACKAGE_NAME@;
|
||||
package org.mozilla.gecko;
|
||||
|
||||
import android.app.Activity;
|
||||
|
||||
|
|
@ -1,8 +1,7 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import com.jayway.android.robotium.solo.Condition;
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -1,9 +1,8 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import com.jayway.android.robotium.solo.Condition;
|
||||
import com.jayway.android.robotium.solo.Solo;
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.app.Instrumentation;
|
||||
|
|
@ -45,7 +44,7 @@ abstract class BaseTest extends ActivityInstrumentationTestCase2<Activity> {
|
|||
public static final int TEST_TALOS = 1;
|
||||
|
||||
private static final String TARGET_PACKAGE_ID = "org.mozilla.gecko";
|
||||
private static final String LAUNCH_ACTIVITY_FULL_CLASSNAME ="@ANDROID_PACKAGE_NAME@.App";
|
||||
private static final String LAUNCH_ACTIVITY_FULL_CLASSNAME = TestConstants.ANDROID_PACKAGE_NAME + ".App";
|
||||
private static final int VERIFY_URL_TIMEOUT = 2000;
|
||||
private static final int MAX_LIST_ATTEMPTS = 3;
|
||||
private static final int MAX_WAIT_ENABLED_TEXT_MS = 10000;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.content.ContentResolver;
|
||||
import android.util.DisplayMetrics;
|
||||
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import android.content.ContentProvider;
|
||||
import android.content.ContentValues;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.ContentResolver;
|
||||
|
|
@ -39,7 +38,7 @@ class DatabaseHelper {
|
|||
protected Uri buildUri(BrowserDataType dataType) {
|
||||
Uri uri = null;
|
||||
if (dataType == BrowserDataType.BOOKMARKS || dataType == BrowserDataType.HISTORY) {
|
||||
uri = Uri.parse("content://@ANDROID_PACKAGE_NAME@.db.browser/" + dataType.toString().toLowerCase());
|
||||
uri = Uri.parse("content://" + TestConstants.ANDROID_PACKAGE_NAME + ".db.browser/" + dataType.toString().toLowerCase());
|
||||
} else {
|
||||
mAsserter.ok(false, "The wrong data type has been provided = " + dataType.toString(), "Please provide the correct data type");
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.util.Log;
|
||||
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import android.app.Instrumentation;
|
||||
import android.os.SystemClock;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import java.io.BufferedReader;
|
||||
import java.io.InputStream;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
abstract class PixelTest extends BaseTest {
|
||||
private static final long PAINT_CLEAR_DELAY = 10000; // milliseconds
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
class StringHelper {
|
||||
// Note: DEFAULT_BOOKMARKS_TITLES.length == DEFAULT_BOOKMARKS_URLS.length
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
#filter substitution
|
||||
/* -*- Mode: Java; c-basic-offset: 4; tab-width: 20; indent-tabs-mode: nil; -*-
|
||||
* This Source Code Form is subject to the terms of the Mozilla Public
|
||||
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
||||
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
||||
|
||||
package org.mozilla.gecko;
|
||||
|
||||
public class TestConstants {
|
||||
public static final String ANDROID_PACKAGE_NAME = "@ANDROID_PACKAGE_NAME@";
|
||||
}
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/* Tests related to the about: page:
|
||||
* - check that about: loads from the URL bar
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.view.View;
|
||||
import android.widget.ListAdapter;
|
||||
import android.widget.ListView;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.util.DisplayMetrics;
|
||||
|
||||
import org.json.JSONArray;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
public class testAwesomebar extends BaseTest {
|
||||
@Override
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import com.jayway.android.robotium.solo.Solo;
|
||||
|
||||
|
|
@ -7,7 +6,7 @@ import android.widget.ListView;
|
|||
import android.widget.TabWidget;
|
||||
import android.support.v4.view.ViewPager;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/* Tests swiping between tabs on the awesome bar and other basic
|
||||
awesome bar tab selections.
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/**
|
||||
* Basic test for axis locking behaviour.
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.view.View;
|
||||
import android.widget.ListView;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
public class testBookmarkKeyword extends AboutHomeTest {
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.database.Cursor;
|
||||
|
||||
import android.widget.ListView;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.content.ContentUris;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.content.ContentValues;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.support.v4.app.Fragment;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
public class testCheck extends PixelTest {
|
||||
private void pause(int length) {
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
public class testCheck2 extends PixelTest {
|
||||
@Override
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import java.util.ArrayList;
|
||||
|
||||
public class testClearPrivateData extends PixelTest {
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
|
||||
public class testDeviceSearchEngine extends JavascriptTest {
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.content.SharedPreferences;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.app.Activity;
|
||||
import android.graphics.Color;
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/**
|
||||
* Basic fling correctness test.
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.content.ContentResolver;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.widget.ListView;
|
||||
import android.app.Activity;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.app.Activity;
|
||||
import android.provider.Browser;
|
||||
import android.content.ContentValues;
|
||||
|
|
@ -117,7 +116,7 @@ public class testImportFromAndroid extends AboutHomeTest {
|
|||
|
||||
// Add a few history items in Firefox Mobile
|
||||
ContentResolver resolver = getActivity().getContentResolver();
|
||||
Uri uri = Uri.parse("content://@ANDROID_PACKAGE_NAME@.db.browser/history");
|
||||
Uri uri = Uri.parse("content://" + TestConstants.ANDROID_PACKAGE_NAME + ".db.browser/history");
|
||||
uri = uri.buildUpon().appendQueryParameter("profile", "default")
|
||||
.appendQueryParameter("sync", "true").build();
|
||||
for (String url:androidData) {
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.app.Activity;
|
||||
import android.view.View;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
|
||||
public class testJNI extends JavascriptTest {
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import java.lang.ClassLoader;
|
||||
import java.io.InputStream;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
public class testLinkContextMenu extends ContentContextMenuTest {
|
||||
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
/**
|
||||
* A basic page load test.
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
public class testMailToContextMenu extends ContentContextMenuTest {
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/* This patch tests the Master Password feature first by enabling the password,
|
||||
then testing it on a login page and finally disabling the password */
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.app.Activity;
|
||||
import android.view.View;
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import org.json.JSONArray;
|
||||
import org.json.JSONException;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/**
|
||||
* Basic test to check bounce-back from overscroll.
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
/**
|
||||
* A panning performance test.
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/**
|
||||
* A basic panning correctness test.
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.content.ContentValues;
|
||||
import android.content.ContentResolver;
|
||||
import android.database.Cursor;
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import android.content.ContentValues;
|
||||
import android.content.ContentResolver;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.widget.CheckBox;
|
||||
import java.util.ArrayList;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
public class testPictureLinkContextMenu extends ContentContextMenuTest {
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.app.Instrumentation;
|
||||
|
||||
import org.json.JSONArray;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import android.graphics.drawable.Drawable;
|
||||
import android.widget.EditText;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import com.jayway.android.robotium.solo.Solo;
|
||||
import android.widget.ListView;
|
||||
import android.view.View;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.app.Activity;
|
||||
import android.content.Context;
|
||||
import android.support.v4.app.Fragment;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
import java.lang.reflect.Field;
|
||||
import java.util.Arrays;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.app.Activity;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
|
||||
public class testSharedPreferences extends JavascriptTest {
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
/** This patch tests the System Pages first by loading system pages from
|
||||
* the awesome bar and then from Firefox menu
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
public class testTabHistory extends BaseTest {
|
||||
|
||||
|
|
@ -1,5 +1,4 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import android.content.ContentResolver;
|
||||
import android.graphics.Bitmap;
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
import android.net.Uri;
|
||||
|
||||
/**
|
||||
|
|
@ -1,7 +1,6 @@
|
|||
#filter substitution
|
||||
package @ANDROID_PACKAGE_NAME@.tests;
|
||||
package org.mozilla.gecko.tests;
|
||||
|
||||
import @ANDROID_PACKAGE_NAME@.*;
|
||||
import org.mozilla.gecko.*;
|
||||
|
||||
public class test_bug720538 extends PixelTest {
|
||||
@Override
|
||||
|
|
@ -645,8 +645,8 @@ def main():
|
|||
|
||||
options.app = "am"
|
||||
options.browserArgs = ["instrument", "-w", "-e", "deviceroot", deviceRoot, "-e", "class"]
|
||||
options.browserArgs.append("%s.tests.%s" % (options.remoteappname, test['name']))
|
||||
options.browserArgs.append("org.mozilla.roboexample.test/%s.FennecInstrumentationTestRunner" % options.remoteappname)
|
||||
options.browserArgs.append("org.mozilla.gecko.tests.%s" % test['name'])
|
||||
options.browserArgs.append("org.mozilla.roboexample.test/org.mozilla.gecko.FennecInstrumentationTestRunner")
|
||||
|
||||
# If the test is for checking the import from bookmarks then make sure there is data to import
|
||||
if test['name'] == "testImportFromAndroid":
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче