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

Commit 87770195 authored by Andrew Sapperstein's avatar Andrew Sapperstein Committed by android-build-merger
Browse files

Refactor test runner to use static list of resource paths am: 9f1e9117 

am: d745ed59

Change-Id: I445876e61890633ed05761ee21e1efa66c956307
parents cd9e91e0 d745ed59

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

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.content.Context; 


import com.android.internal.logging.nano.MetricsProto;

import com.android.settings.testutils.FakeFeatureFactory;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



import org.junit.Before;

import org.junit.Test;

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

+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@ import android.os.UserManager; 
import android.support.v7.preference.PreferenceScreen;



import com.android.settings.dashboard.SummaryLoader;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.XmlTestUtils;

import com.android.settings.testutils.shadow.ShadowUtils;

import com.android.settingslib.DeviceInfoUtils;

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

+3 −3
Original line number Diff line number Diff line 
package com.android.settings;



import android.content.Context;

import android.os.PowerManager;



import com.android.settings.core.PreferenceController;

import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.XmlTestUtils;

import com.android.settings.testutils.shadow.ShadowPowerManagerWrapper;

import org.junit.Test;
@@ -14,9 +15,8 @@ import java.util.ArrayList; 
import java.util.List;



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

import static org.mockito.Mockito.doReturn;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;



@RunWith(SettingsRobolectricTestRunner.class)

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

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

+1 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;

import com.android.settings.testutils.SettingsRobolectricTestRunner;



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

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

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ package com.android.settings; 


import android.content.Context;



import com.android.settings.testutils.SettingsRobolectricTestRunner;

import com.android.settings.testutils.XmlTestUtils;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -26,7 +27,6 @@ import org.robolectric.annotation.Config; 
import java.util.List;



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

import static org.mockito.Mockito.spy;



@RunWith(SettingsRobolectricTestRunner.class)

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