Merge "Moving come tests to Roboelectric" into ub-launcher3-master (9c9625a1) · Commits · e / os / BlissLauncher3

robolectric_tests/Android.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -29,6 +29,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := \
		LOCAL_JAVA_LIBRARIES := \
		platform-robolectric-3.6.1-prebuilt

		LOCAL_JAVA_RESOURCE_DIRS := resources config

		LOCAL_INSTRUMENTATION_FOR := Launcher3
		LOCAL_MODULE_TAGS := optional

robolectric_tests/config/robolectric.properties

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		manifest=packages/apps/Launcher3/AndroidManifest.xml
		sdk=28
		No newline at end of file

tests/res/raw/cache_data_updated_task_data.txt→robolectric_tests/resources/cache_data_updated_task_data.txt

+0 −0

File moved.

View file

tests/res/raw/package_install_state_change_task_data.txt→robolectric_tests/resources/package_install_state_change_task_data.txt

+0 −0

File moved.

View file

tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java→robolectric_tests/src/com/android/launcher3/model/AddWorkspaceItemsTaskTest.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -15,9 +15,6 @@ import android.graphics.Rect;
		import android.net.Uri;
		import android.util.Pair;

		import androidx.test.filters.SmallTest;
		import androidx.test.runner.AndroidJUnit4;

		import com.android.launcher3.ItemInfo;
		import com.android.launcher3.LauncherProvider;
		import com.android.launcher3.LauncherSettings;
		@@ -30,6 +27,7 @@ import org.junit.Before;
		import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		import org.robolectric.RobolectricTestRunner;

		import java.util.ArrayList;
		import java.util.List;
		@@ -37,8 +35,7 @@ import java.util.List;
		/**
		* Tests for {@link AddWorkspaceItemsTask}
		*/
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		@RunWith(RobolectricTestRunner.class)
		public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase {

		private final ComponentName mComponent1 = new ComponentName("a", "b");
		@@ -174,7 +171,7 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase {
		}

		private void commitScreensToDb() throws Exception {
		LauncherSettings.Settings.call(mProviderRule.getResolver(),
		LauncherSettings.Settings.call(targetContext.getContentResolver(),
		LauncherSettings.Settings.METHOD_CREATE_EMPTY_DB);

		Uri uri = LauncherSettings.WorkspaceScreens.CONTENT_URI;
		@@ -189,6 +186,6 @@ public class AddWorkspaceItemsTaskTest extends BaseModelUpdateTaskTestCase {
		v.put(LauncherSettings.WorkspaceScreens.SCREEN_RANK, i);
		ops.add(ContentProviderOperation.newInsert(uri).withValues(v).build());
		}
		mProviderRule.getResolver().applyBatch(LauncherProvider.AUTHORITY, ops);
		targetContext.getContentResolver().applyBatch(LauncherProvider.AUTHORITY, ops);
		}
		}