wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1063028 - Change tests/browser/junit3 Java package root to be org.mozilla.gecko. r=rnewman

Browse Source 
--HG--
rename : mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java => mobile/android/tests/browser/junit3/src/BrowserTestCase.java
rename : mobile/android/tests/browser/junit3/src/tests/TestDistribution.java => mobile/android/tests/browser/junit3/src/TestDistribution.java
rename : mobile/android/tests/browser/junit3/src/tests/TestGeckoMenu.java => mobile/android/tests/browser/junit3/src/TestGeckoMenu.java
rename : mobile/android/tests/browser/junit3/src/tests/TestGeckoProfilesProvider.java => mobile/android/tests/browser/junit3/src/TestGeckoProfilesProvider.java
rename : mobile/android/tests/browser/junit3/src/tests/TestGeckoSharedPrefs.java => mobile/android/tests/browser/junit3/src/TestGeckoSharedPrefs.java
rename : mobile/android/tests/browser/junit3/src/tests/TestImageDownloader.java => mobile/android/tests/browser/junit3/src/TestImageDownloader.java
rename : mobile/android/tests/browser/junit3/src/tests/TestJarReader.java => mobile/android/tests/browser/junit3/src/TestJarReader.java
rename : mobile/android/tests/browser/junit3/src/tests/TestRawResource.java => mobile/android/tests/browser/junit3/src/TestRawResource.java
rename : mobile/android/tests/browser/junit3/src/tests/TestSuggestedSites.java => mobile/android/tests/browser/junit3/src/TestSuggestedSites.java
rename : mobile/android/tests/browser/junit3/src/tests/TestTopSitesCursorWrapper.java => mobile/android/tests/browser/junit3/src/TestTopSitesCursorWrapper.java
This commit is contained in:
Nick Alexander 2014-09-08 12:58:33 -07:00
parent 417ec280f9
commit 9c07686b35
14 changed files with 43 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/android/tests/browser/junit3/AndroidManifest.xml.in
View File

@ -22,6 +22,6 @@
<instrumentation
android:label="@string/app_name"
android:name="org.mozilla.gecko.browser.harness.BrowserInstrumentationTestRunner"
android:name="org.mozilla.gecko.harness.BrowserInstrumentationTestRunner"
android:targetPackage="@ANDROID_BROWSER_TARGET_PACKAGE_NAME@" />
</manifest>

18
mobile/android/tests/browser/junit3/moz.build
View File

@ -8,16 +8,16 @@ DEFINES['ANDROID_PACKAGE_NAME'] = CONFIG['ANDROID_PACKAGE_NAME']
jar = add_java_jar('browser-junit3')
jar.sources += [
'src/BrowserTestCase.java',
'src/harness/BrowserInstrumentationTestRunner.java',
'src/harness/BrowserTestListener.java',
'src/tests/BrowserTestCase.java',
'src/tests/TestDistribution.java',
'src/tests/TestGeckoSharedPrefs.java',
'src/tests/TestImageDownloader.java',
'src/tests/TestJarReader.java',
'src/tests/TestRawResource.java',
'src/tests/TestSuggestedSites.java',
'src/tests/TestTopSitesCursorWrapper.java',
'src/TestDistribution.java',
'src/TestGeckoSharedPrefs.java',
'src/TestImageDownloader.java',
'src/TestJarReader.java',
'src/TestRawResource.java',
'src/TestSuggestedSites.java',
'src/TestTopSitesCursorWrapper.java',
]
jar.generated_sources = [] # None yet -- try to keep it this way.
jar.javac_flags += ['-Xlint:all,-unchecked']
@ -36,4 +36,4 @@ main.recursive_make_targets += [OBJDIR + '/generated/' + f for f in jar.generate
main.referenced_projects += ['Fennec']
main.add_classpathentry('src', SRCDIR + '/src',
dstdir='src/org/mozilla/gecko/browser')
dstdir='src/org/mozilla/gecko')

2
mobile/android/tests/browser/junit3/src/tests/BrowserTestCase.java → mobile/android/tests/browser/junit3/src/BrowserTestCase.java
View File

@ -1,7 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.tests;
package org.mozilla.gecko;
import org.mozilla.gecko.AppConstants;

2
mobile/android/tests/browser/junit3/src/tests/TestDistribution.java → mobile/android/tests/browser/junit3/src/TestDistribution.java
View File

@ -2,7 +2,7 @@
* 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.browser.tests;
package org.mozilla.gecko;
import org.mozilla.gecko.distribution.ReferrerDescriptor;

2
mobile/android/tests/browser/junit3/src/tests/TestGeckoMenu.java → mobile/android/tests/browser/junit3/src/TestGeckoMenu.java
View File

@ -2,7 +2,7 @@
* 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.browser.tests;
package org.mozilla.gecko;
import org.mozilla.gecko.AppConstants;
import org.mozilla.gecko.menu.GeckoMenu;

2
mobile/android/tests/browser/junit3/src/tests/TestGeckoProfilesProvider.java → mobile/android/tests/browser/junit3/src/TestGeckoProfilesProvider.java
View File

@ -2,7 +2,7 @@
* 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.browser.tests;
package org.mozilla.gecko;
import java.io.File;
import java.util.HashMap;

6
mobile/android/tests/browser/junit3/src/tests/TestGeckoSharedPrefs.java → mobile/android/tests/browser/junit3/src/TestGeckoSharedPrefs.java
View File

@ -1,23 +1,19 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.tests;
package org.mozilla.gecko;
import java.util.Arrays;
import java.util.Collections;
import java.util.EnumSet;
import java.util.Map;
import java.util.HashSet;
import java.util.Set;
import org.mozilla.gecko.GeckoProfile;
import org.mozilla.gecko.GeckoSharedPrefs;
import org.mozilla.gecko.GeckoSharedPrefs.Flags;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.SharedPreferences.Editor;
import android.os.Build;
import android.preference.PreferenceManager;
import android.test.RenamingDelegatingContext;

2
mobile/android/tests/browser/junit3/src/tests/TestImageDownloader.java → mobile/android/tests/browser/junit3/src/TestImageDownloader.java
View File

@ -1,7 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.tests;
package org.mozilla.gecko;
import android.content.Context;
import android.content.res.Resources;

2
mobile/android/tests/browser/junit3/src/tests/TestJarReader.java → mobile/android/tests/browser/junit3/src/TestJarReader.java
View File

@ -1,7 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.tests;
package org.mozilla.gecko;
import java.io.InputStream;

17
mobile/android/tests/browser/junit3/src/tests/TestRawResource.java → mobile/android/tests/browser/junit3/src/TestRawResource.java
View File

@ -1,19 +1,18 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.tests;
package org.mozilla.gecko;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
import org.mozilla.gecko.util.RawResource;
import android.content.Context;
import android.content.res.Resources;
import android.test.mock.MockContext;
import android.test.mock.MockResources;
import android.util.TypedValue;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.io.IOException;
import org.mozilla.gecko.util.RawResource;
/**
* Tests whether RawResource.getAsString() produces the right String
@ -64,4 +63,4 @@ public class TestRawResource extends BrowserTestCase {
assertEquals(RAW_CONTENTS, result);
}
}
}

38
mobile/android/tests/browser/junit3/src/tests/TestSuggestedSites.java → mobile/android/tests/browser/junit3/src/TestSuggestedSites.java
View File

@ -1,48 +1,40 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.tests;
import android.content.Context;
import android.content.ContentResolver;
import android.content.res.Resources;
import android.content.SharedPreferences;
import android.database.Cursor;
import android.database.ContentObserver;
import android.net.Uri;
import android.os.Handler;
import android.os.SystemClock;
import android.test.mock.MockResources;
import android.test.RenamingDelegatingContext;
package org.mozilla.gecko;
import java.io.ByteArrayInputStream;
import java.io.File;
import java.io.FileOutputStream;
import java.io.InputStream;
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URI;
import java.io.InputStream;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.jar.JarInputStream;
import java.util.Map;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.Set;
import org.json.JSONArray;
import org.json.JSONObject;
import org.mozilla.gecko.BrowserLocaleManager;
import org.mozilla.gecko.R;
import org.mozilla.gecko.db.BrowserContract;
import org.mozilla.gecko.db.SuggestedSites;
import org.mozilla.gecko.distribution.Distribution;
import org.mozilla.gecko.GeckoSharedPrefs;
import org.mozilla.gecko.preferences.GeckoPreferences;
import android.content.ContentResolver;
import android.content.Context;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.database.ContentObserver;
import android.database.Cursor;
import android.net.Uri;
import android.os.SystemClock;
import android.test.RenamingDelegatingContext;
import android.test.mock.MockResources;
public class TestSuggestedSites extends BrowserTestCase {
private static class TestContext extends RenamingDelegatingContext {
private static final String PREFIX = "TestSuggestedSites-";
@ -94,12 +86,10 @@ public class TestSuggestedSites extends BrowserTestCase {
}
private static class TestDistribution extends Distribution {
private final Context context;
private final Map<Locale, File> filesPerLocale;
public TestDistribution(Context context) {
super(context);
this.context = context;
this.filesPerLocale = new HashMap<Locale, File>();
}

4
mobile/android/tests/browser/junit3/src/tests/TestTopSitesCursorWrapper.java → mobile/android/tests/browser/junit3/src/TestTopSitesCursorWrapper.java
View File

@ -1,7 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.tests;
package org.mozilla.gecko;
import android.database.Cursor;
import android.database.MatrixCursor;
@ -385,4 +385,4 @@ public class TestTopSitesCursorWrapper extends BrowserTestCase {
c.close();
}
}
}

2
mobile/android/tests/browser/junit3/src/harness/BrowserInstrumentationTestRunner.java
View File

@ -1,7 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.harness;
package org.mozilla.gecko.harness;
import android.os.Bundle;
import android.test.AndroidTestRunner;

2
mobile/android/tests/browser/junit3/src/harness/BrowserTestListener.java
View File

@ -1,7 +1,7 @@
/* Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/ */
package org.mozilla.gecko.browser.harness;
package org.mozilla.gecko.harness;
import junit.framework.AssertionFailedError;
import junit.framework.Test;