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

Commit e1558719 authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Move enterprise test package to sdk 26 

Test: make RunSettingsRoboTests -j40
Change-Id: I6b4c5d1d2ba9e7f48168c545432a5a62d024f43d
parent 9c8fe7e7

tests/robotests/src/com/android/settings/enterprise/AdminActionPreferenceControllerBaseTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -31,7 +31,7 @@ import static com.google.common.truth.Truth.assertThat; 
 * Tests for {@link AdminActionPreferenceControllerBase}.

 * Tests for {@link AdminActionPreferenceControllerBase}.

 */

 */

@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)

public final class AdminActionPreferenceControllerBaseTest extends

public final class AdminActionPreferenceControllerBaseTest extends

        AdminActionPreferenceControllerTestBase {

        AdminActionPreferenceControllerTestBase {

tests/robotests/src/com/android/settings/enterprise/AdminGrantedCameraPermissionPreferenceControllerTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; 
 * Tests for {@link AdminGrantedCameraPermissionPreferenceController}.

 * Tests for {@link AdminGrantedCameraPermissionPreferenceController}.

 */

 */

@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)

public final class AdminGrantedCameraPermissionPreferenceControllerTest extends

public final class AdminGrantedCameraPermissionPreferenceControllerTest extends

        AdminGrantedPermissionsPreferenceControllerTestBase {

        AdminGrantedPermissionsPreferenceControllerTestBase {

tests/robotests/src/com/android/settings/enterprise/AdminGrantedLocationPermissionsPreferenceControllerTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; 
 * Tests for {@link AdminGrantedLocationPermissionsPreferenceController}.

 * Tests for {@link AdminGrantedLocationPermissionsPreferenceController}.

 */

 */

@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)

public final class AdminGrantedLocationPermissionsPreferenceControllerTest extends

public final class AdminGrantedLocationPermissionsPreferenceControllerTest extends

        AdminGrantedPermissionsPreferenceControllerTestBase {

        AdminGrantedPermissionsPreferenceControllerTestBase {

tests/robotests/src/com/android/settings/enterprise/AdminGrantedMicrophonePermissionPreferenceControllerTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -28,7 +28,7 @@ import org.robolectric.annotation.Config; 
 * Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}.

 * Tests for {@link AdminGrantedMicrophonePermissionPreferenceController}.

 */

 */

@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)

public final class AdminGrantedMicrophonePermissionPreferenceControllerTest extends

public final class AdminGrantedMicrophonePermissionPreferenceControllerTest extends

        AdminGrantedPermissionsPreferenceControllerTestBase {

        AdminGrantedPermissionsPreferenceControllerTestBase {

tests/robotests/src/com/android/settings/enterprise/AdminGrantedPermissionsPreferenceControllerBaseTest.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -26,7 +26,7 @@ import org.robolectric.annotation.Config; 
 * Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}.

 * Tests for {@link AdminGrantedPermissionsPreferenceControllerBase}.

 */

 */

@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)

public final class AdminGrantedPermissionsPreferenceControllerBaseTest extends

public final class AdminGrantedPermissionsPreferenceControllerBaseTest extends

        AdminGrantedPermissionsPreferenceControllerTestBase {

        AdminGrantedPermissionsPreferenceControllerTestBase {