Merge "Move the Robolectric shadow config up." into oc-mr1-dev am: efcc8be05c

am: 5f97c05f1c

Change-Id: I46c4a921a25ef17197e90038ff71a982a192aae7
This commit is contained in:
Daniel Nishi
2017-08-24 22:15:39 +00:00
committed by android-build-merger
15 changed files with 74 additions and 67 deletions

View File

@@ -34,7 +34,11 @@ import org.robolectric.shadows.ShadowApplication;
import static com.google.common.truth.Truth.assertThat;
@RunWith(SettingsRobolectricTestRunner.class)
@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION)
@Config(
manifest = TestConfig.MANIFEST_PATH,
sdk = TestConfig.SDK_VERSION,
shadows = {ShadowTextUtils.class}
)
public class RtlCompatibleViewPagerTest {
private Locale mLocaleEn;
@@ -51,7 +55,6 @@ public class RtlCompatibleViewPagerTest {
}
@Test
@Config(shadows = {ShadowTextUtils.class})
public void testGetCurrentItem_shouldMaintainIndexDuringLocaleChange() {
testRtlCompatibleInner(0);
testRtlCompatibleInner(1);