From 153d14b0f35cbabdca86671b0f1850bb7fba6086 Mon Sep 17 00:00:00 2001 From: jeffreyhuang Date: Thu, 30 Nov 2017 12:28:14 -0800 Subject: [PATCH] move inputmethod test package to sdk 26 Test: make RunSettingsRoboTests -j40 Change-Id: I4d0435d8833bf1ff767688109e239c6729fdead9 --- .../settings/inputmethod/GameControllerPreferenceControllerTest.java | 2 +- .../settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java | 2 +- .../settings/inputmethod/SpellCheckerPreferenceControllerTest.java | 2 +- .../android/settings/inputmethod/UserDictionaryCursorLoaderTest.java | 2 +- .../src/com/android/settings/inputmethod/UserDictionaryListTest.java | 2 +- .../settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java index 2716fc3855..b8a63e4c6d 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java @@ -41,7 +41,7 @@ import java.util.Arrays; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class GameControllerPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java index 8f9b2c5bdb..5684f17593 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java @@ -40,7 +40,7 @@ import org.mockito.MockitoAnnotations; import org.robolectric.annotation.Config; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class PhysicalKeyboardPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java index 4457cc0339..19914603e6 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java @@ -39,7 +39,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class SpellCheckerPreferenceControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java index 7b149f3c67..c21cc76bfc 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java @@ -38,7 +38,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowContentResolver; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class UserDictionaryCursorLoaderTest { private ContentProvider mContentProvider; diff --git a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java index 91fcaae2e8..b220dd5a72 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java @@ -37,7 +37,7 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowContentResolver; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class UserDictionaryListTest { private FakeProvider mContentProvider; diff --git a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java index fe2b0df386..5913f7e094 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/VirtualKeyboardPreferenceControllerTest.java @@ -49,7 +49,7 @@ import java.util.ArrayList; import java.util.List; @RunWith(SettingsRobolectricTestRunner.class) -@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION_O) public class VirtualKeyboardPreferenceControllerTest { @Mock -- 2.11.0