Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21de9388 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Using config for robo test configuration so that it can easily be... 

Merge "Using config for robo test configuration so that it can easily be customized" into ub-launcher3-rvc-dev am: fefbe9e2

Change-Id: If2846f2e03523f67606b4cd9c3147b04397ccb2f
parents c0787912 fefbe9e2

robolectric_tests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ include $(CLEAR_VARS) 
LOCAL_MODULE := LauncherRoboTests

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



LOCAL_SDK_VERSION := current

LOCAL_SDK_VERSION := system_current

LOCAL_SRC_FILES := $(call all-java-files-under, src)

LOCAL_STATIC_JAVA_LIBRARIES := \

    androidx.test.runner \
@@ -47,7 +47,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 
include $(CLEAR_VARS)



LOCAL_MODULE := RunLauncherRoboTests

LOCAL_SDK_VERSION := current

LOCAL_SDK_VERSION := system_current

LOCAL_JAVA_LIBRARIES := LauncherRoboTests



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

robolectric_tests/config/robolectric.properties

+16 −0
Original line number Diff line number Diff line 
sdk=29

shadows= \

    com.android.launcher3.shadows.LShadowAppPredictionManager \

    com.android.launcher3.shadows.LShadowAppWidgetManager \

    com.android.launcher3.shadows.LShadowBackupManager \

    com.android.launcher3.shadows.LShadowBitmap \

    com.android.launcher3.shadows.LShadowLauncherApps \

    com.android.launcher3.shadows.LShadowTypeface \

    com.android.launcher3.shadows.LShadowUserManager \

    com.android.launcher3.shadows.LShadowWallpaperManager \

    com.android.launcher3.shadows.ShadowDeviceFlag \

    com.android.launcher3.shadows.ShadowLooperExecutor \

    com.android.launcher3.shadows.ShadowMainThreadInitializedObject \

    com.android.launcher3.shadows.ShadowOverrides \

    com.android.launcher3.shadows.ShadowSyncRtSurfaceTransactionApplierCompat \



application=com.android.launcher3.util.LauncherTestApplication
 
 No newline at end of file

robolectric_tests/src/com/android/launcher3/folder/FolderNameProviderTest.java

+5 −5
Original line number Diff line number Diff line
@@ -20,20 +20,20 @@ import static org.junit.Assert.assertEquals; 
import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;



import com.android.launcher3.AppInfo;

import com.android.launcher3.WorkspaceItemInfo;

import com.android.launcher3.shadows.LShadowUserManager;

import com.android.launcher3.util.LauncherRoboTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;



import java.util.ArrayList;



@RunWith(LauncherRoboTestRunner.class)

@RunWith(RobolectricTestRunner.class)

public final class FolderNameProviderTest {

    private Context mContext;

    private WorkspaceItemInfo mItem1;
@@ -45,13 +45,13 @@ public final class FolderNameProviderTest { 
        mItem1 = new WorkspaceItemInfo(new AppInfo(

                new ComponentName("a.b.c", "a.b.c/a.b.c.d"),

                "title1",

                LShadowUserManager.newUserHandle(10),

                UserHandle.of(10),

                new Intent().setComponent(new ComponentName("a.b.c", "a.b.c/a.b.c.d"))

        ));

        mItem2 = new WorkspaceItemInfo(new AppInfo(

                new ComponentName("a.b.c", "a.b.c/a.b.c.d"),

                "title2",

                LShadowUserManager.newUserHandle(10),

                UserHandle.of(10),

                new Intent().setComponent(new ComponentName("a.b.c", "a.b.c/a.b.c.d"))

        ));

    }

robolectric_tests/src/com/android/launcher3/logging/FileLogTest.java

+2 −3
Original line number Diff line number Diff line
@@ -3,12 +3,11 @@ package com.android.launcher3.logging; 
import static org.junit.Assert.assertFalse;

import static org.junit.Assert.assertTrue;



import com.android.launcher3.util.LauncherRoboTestRunner;



import org.junit.After;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.Shadows;

import org.robolectric.util.Scheduler;
@@ -21,7 +20,7 @@ import java.util.Calendar; 
/**

 * Tests for {@link FileLog}

 */

@RunWith(LauncherRoboTestRunner.class)

@RunWith(RobolectricTestRunner.class)

public class FileLogTest {



    private File mTempDir;

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

+2 −2
Original line number Diff line number Diff line
@@ -25,12 +25,12 @@ import com.android.launcher3.util.GridOccupancy; 
import com.android.launcher3.util.IntArray;

import com.android.launcher3.util.IntSparseArrayMap;

import com.android.launcher3.util.LauncherModelHelper;

import com.android.launcher3.util.LauncherRoboTestRunner;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.LooperMode;

import org.robolectric.annotation.LooperMode.Mode;
@@ -41,7 +41,7 @@ import java.util.List; 
/**

 * Tests for {@link AddWorkspaceItemsTask}

 */

@RunWith(LauncherRoboTestRunner.class)

@RunWith(RobolectricTestRunner.class)

@LooperMode(Mode.PAUSED)

public class AddWorkspaceItemsTaskTest {