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

Commit 9f1e9117 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Refactor test runner to use static list of resource paths 

Previously everything lived in an inner class method of
SettingsRobolectricTestRunner. That method has now been turned into
a static method so that it can be called by other runners.

Bug: 62460102
Test: robotests
Change-Id: I6612b1f26404587301c534c8ba60e39d59d6c840
parent 6a5f36a4

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)