Merge "Fixing broken instrumentation tests when run from command line" into ub-launcher3-calgary (f3055208) · Commits · e / os / BlissLauncher3

build.gradle

+0 −1

Original line number	Diff line number	Diff line
		@@ -40,7 +40,6 @@ android {

		androidTest {
		java.srcDirs = ['tests/src']
		res.srcDirs = ['tests/res']
		manifest.srcFile "tests/AndroidManifest.xml"
		}
		}

src/com/android/launcher3/LauncherProvider.java

+16 −19

Original line number	Diff line number	Diff line
		@@ -527,13 +527,8 @@ public class LauncherProvider extends ContentProvider {
		private long mMaxScreenId = -1;

		DatabaseHelper(Context context, LauncherProvider provider) {
		super(new NoLocaleSqliteContext(context), LauncherFiles.LAUNCHER_DB,
		null, DATABASE_VERSION);
		mContext = context;
		mProvider = provider;

		mAppWidgetHost = new AppWidgetHost(context, Launcher.APPWIDGET_HOST_ID);

		this(context, provider, LauncherFiles.LAUNCHER_DB,
		new AppWidgetHost(context, Launcher.APPWIDGET_HOST_ID));
		// Table creation sometimes fails silently, which leads to a crash loop.
		// This way, we will try to create a table every time after crash, so the device
		// would eventually be able to recover.
		@@ -544,28 +539,30 @@ public class LauncherProvider extends ContentProvider {
		addWorkspacesTable(getWritableDatabase(), true);
		}

		// In the case where neither onCreate nor onUpgrade gets called, we read the maxId from
		// the DB here
		if (mMaxItemId == -1) {
		mMaxItemId = initializeMaxItemId(getWritableDatabase());
		}
		if (mMaxScreenId == -1) {
		mMaxScreenId = initializeMaxScreenId(getWritableDatabase());
		}
		initIds();
		}

		/**
		* Constructor used only in tests.
		*/
		public DatabaseHelper(Context context, LauncherProvider provider, String tableName) {
		public DatabaseHelper(
		Context context, LauncherProvider provider, String tableName, AppWidgetHost host) {
		super(new NoLocaleSqliteContext(context), tableName, null, DATABASE_VERSION);
		mContext = context;
		mProvider = provider;
		mAppWidgetHost = host;
		}

		mAppWidgetHost = null;
		protected void initIds() {
		// In the case where neither onCreate nor onUpgrade gets called, we read the maxId from
		// the DB here
		if (mMaxItemId == -1) {
		mMaxItemId = initializeMaxItemId(getWritableDatabase());
		}
		if (mMaxScreenId == -1) {
		mMaxScreenId = initializeMaxScreenId(getWritableDatabase());
		}
		}

		private boolean tableExists(String tableName) {
		Cursor c = getReadableDatabase().query(

tests/Android.mk

+0 −3

Original line number	Diff line number	Diff line
		@@ -16,13 +16,10 @@
		LOCAL_PATH := $(call my-dir)
		include $(CLEAR_VARS)

		src_dirs := src
		LOCAL_MODULE_TAGS := tests
		LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator

		LOCAL_SRC_FILES := $(call all-java-files-under, src)
		LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))
		LOCAL_AAPT_FLAGS := --auto-add-overlay

		LOCAL_SDK_VERSION := 23

tests/AndroidManifest.xml

+4 −2

Original line number	Diff line number	Diff line
		@@ -20,12 +20,14 @@

		<uses-sdk tools:overrideLibrary="android.support.test.uiautomator.v18"/>

		<application>
		<application android:debuggable="true">
		<uses-library android:name="android.test.runner" />
		</application>

		<instrumentation
		android:name="android.test.InstrumentationTestRunner"
		android:functionalTest="false"
		android:handleProfiling="false"
		android:name="android.support.test.runner.AndroidJUnitRunner"
		android:targetPackage="com.android.launcher3" >
		</instrumentation>
		</manifest>

tests/res/values/string.xml

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		<!-- Copyright (C) 2015 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

		<!-- Dummy string for tests. [DO NOT TRANSLATE] -->
		<string name="dummy" >Dummy string for tests.</string>

		</resources>