Merge "Move backup package tests to sdk 26"
This commit is contained in:
committed by
Android (Google) Code Review
commit
72818e78b3
@@ -45,7 +45,7 @@ import org.robolectric.annotation.Implementation;
|
|||||||
import org.robolectric.annotation.Implements;
|
import org.robolectric.annotation.Implements;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
|
||||||
shadows = {BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class})
|
shadows = {BackupSettingsActivityPreferenceControllerTest.ShadowBackupManager.class})
|
||||||
public class BackupSettingsActivityPreferenceControllerTest {
|
public class BackupSettingsActivityPreferenceControllerTest {
|
||||||
private static final String KEY_BACKUP_SETTINGS = "backup_settings";
|
private static final String KEY_BACKUP_SETTINGS = "backup_settings";
|
||||||
|
@@ -58,7 +58,7 @@ import java.util.List;
|
|||||||
|
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
|
||||||
shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
|
shadows = {BackupSettingsActivityTest.ShadowBackupSettingsHelper.class,
|
||||||
BackupSettingsActivityTest.ShadowUserHandle.class})
|
BackupSettingsActivityTest.ShadowUserHandle.class})
|
||||||
public class BackupSettingsActivityTest {
|
public class BackupSettingsActivityTest {
|
||||||
|
@@ -50,7 +50,7 @@ import com.android.settings.TestConfig;
|
|||||||
import com.android.settingslib.drawer.SettingsDrawerActivity;
|
import com.android.settingslib.drawer.SettingsDrawerActivity;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
|
||||||
shadows = {BackupSettingsHelperTest.ShadowBackupManagerStub.class})
|
shadows = {BackupSettingsHelperTest.ShadowBackupManagerStub.class})
|
||||||
public class BackupSettingsHelperTest {
|
public class BackupSettingsHelperTest {
|
||||||
|
|
||||||
|
@@ -41,7 +41,7 @@ import android.support.v7.preference.Preference;
|
|||||||
import android.support.v7.preference.PreferenceScreen;
|
import android.support.v7.preference.PreferenceScreen;
|
||||||
|
|
||||||
@RunWith(SettingsRobolectricTestRunner.class)
|
@RunWith(SettingsRobolectricTestRunner.class)
|
||||||
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION,
|
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O,
|
||||||
shadows = {BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class})
|
shadows = {BackupSettingsPreferenceControllerTest.ShadowBackupSettingsHelper.class})
|
||||||
public class BackupSettingsPreferenceControllerTest {
|
public class BackupSettingsPreferenceControllerTest {
|
||||||
private static final String BACKUP_SETTINGS = "backup_settings";
|
private static final String BACKUP_SETTINGS = "backup_settings";
|
||||||
|
Reference in New Issue
Block a user