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

Commit e97379f6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "move inputmethod test package to sdk 26"

parents b9f3125c 153d14b0

tests/robotests/src/com/android/settings/inputmethod/GameControllerPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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)

tests/robotests/src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/robotests/src/com/android/settings/inputmethod/SpellCheckerPreferenceControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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)

tests/robotests/src/com/android/settings/inputmethod/UserDictionaryCursorLoaderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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;

tests/robotests/src/com/android/settings/inputmethod/UserDictionaryListTest.java

+1 −1
Original line number Diff line number Diff line
@@ -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;