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

Commit f400a0cf authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Update Robolectric to 3.4.2"

parents 3ea5b097 e18902ec

tests/robotests/Android.mk

+5 −3
Original line number Diff line number Diff line
@@ -9,12 +9,12 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) 
# Include the testing libraries (JUnit4 + Robolectric libs).

LOCAL_STATIC_JAVA_LIBRARIES := \

    mockito-robolectric-prebuilt \

    platform-robolectric-android-all-stubs \

    truth-prebuilt



LOCAL_JAVA_LIBRARIES := \

    junit \

    platform-robolectric-prebuilt \

    sdk_vcurrent \

    platform-robolectric-3.4.2-prebuilt \

    telephony-common



LOCAL_INSTRUMENTATION_FOR := Settings
@@ -40,4 +40,6 @@ LOCAL_TEST_PACKAGE := Settings 


LOCAL_INSTRUMENT_SOURCE_DIRS := $(dir $(LOCAL_PATH))../src



include prebuilts/misc/common/robolectric/run_robotests.mk
 
 No newline at end of file
 
LOCAL_ROBOTEST_TIMEOUT := 36000



include prebuilts/misc/common/robolectric/3.4.2/run_robotests.mk

tests/robotests/src/com/android/settings/SettingsActivityTest.java

+0 −4
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.spy; 
import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.Activity;

import android.app.ActivityManager;

import android.app.FragmentManager;

import android.app.FragmentTransaction;
@@ -35,10 +34,8 @@ import android.content.Context; 
import android.content.Intent;

import android.graphics.Bitmap;

import android.os.Bundle;

import android.view.Menu;



import com.android.settings.search.SearchActivity;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



import org.junit.Before;
@@ -50,7 +47,6 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;

import org.robolectric.shadows.ShadowApplication;

import org.robolectric.util.ReflectionHelpers;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

tests/robotests/src/com/android/settings/SettingsLicenseActivityTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,8 +39,8 @@ import org.junit.runner.RunWith; 
import org.mockito.MockitoAnnotations;

import org.robolectric.Robolectric;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.android.controller.ActivityController;

import org.robolectric.annotation.Config;

import org.robolectric.util.ActivityController;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

tests/robotests/src/com/android/settings/SetupChooseLockPatternTest.java

+4 −4
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;

import org.robolectric.Robolectric;

import org.robolectric.RuntimeEnvironment;

import org.robolectric.Shadows;

import org.robolectric.annotation.Config;

import org.robolectric.res.builder.RobolectricPackageManager.ComponentState;

import org.robolectric.shadows.ShadowPackageManager.ComponentState;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(
@@ -57,7 +57,7 @@ public class SetupChooseLockPatternTest { 


    @Before

    public void setUp() {

        RuntimeEnvironment.getRobolectricPackageManager().setComponentEnabledSetting(

        Shadows.shadowOf(application.getPackageManager()).setComponentEnabledSetting(

                new ComponentName(application, SetupRedactionInterstitial.class),

                PackageManager.COMPONENT_ENABLED_STATE_DISABLED,

                PackageManager.DONT_KILL_APP);
@@ -77,7 +77,7 @@ public class SetupChooseLockPatternTest { 
        findFragment(mActivity).onChosenLockSaveFinished(false, null);



        ComponentState redactionComponentState =

                RuntimeEnvironment.getRobolectricPackageManager().getComponentState(

                Shadows.shadowOf(application.getPackageManager()).getComponentState(

                        new ComponentName(application, SetupRedactionInterstitial.class));

        assertThat(redactionComponentState.newState).named("Redaction component state")

                .isEqualTo(PackageManager.COMPONENT_ENABLED_STATE_ENABLED);

tests/robotests/src/com/android/settings/accessibility/ShortcutServicePickerFragmentTest.java

+7 −8
Original line number Diff line number Diff line
@@ -16,14 +16,19 @@ 


package com.android.settings.accessibility;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.app.Activity;

import android.content.Context;

import android.os.UserManager;



import android.test.mock.MockContentResolver;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.TestConfig;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settingslib.wrapper.PackageManagerWrapper;



import org.junit.Before;
@@ -35,11 +40,6 @@ import org.mockito.MockitoAnnotations; 
import org.robolectric.RuntimeEnvironment;

import org.robolectric.annotation.Config;



import static com.google.common.truth.Truth.assertThat;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



@RunWith(SettingsRobolectricTestRunner.class)

@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)

public class ShortcutServicePickerFragmentTest {
@@ -58,7 +58,6 @@ public class ShortcutServicePickerFragmentTest { 
    private PackageManagerWrapper mPackageManager;



    private ShortcutServicePickerFragment mFragment;

    private MockContentResolver mContentResolver;



    @Before

    public void setUp() {