diff options
| author | Tarundeep Singh <tarundeep.singh@ittiam.com> | 2019-10-29 16:22:40 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-10-29 16:22:40 -0700 |
| commit | 308dd2bc935c813f25dbbc789daed4ff8d2f821b (patch) | |
| tree | 2c4a627bcf98b51d928fd79a5d27982e4679e461 | |
| parent | 7043ef99724b25c6499e1edebb19bce59706afaa (diff) | |
| parent | 6a823e705a00ac69c87ac2c91f7e9d684848ec57 (diff) | |
| download | TV-308dd2bc935c813f25dbbc789daed4ff8d2f821b.tar.gz | |
Merge "Fixed tests failing for sdk < 24 in TrackInfoUtilsTest" am: c686ccb6e8
am: 6a823e705a
Change-Id: I641b9569a01fab94f3d68dae0b23acc9d8579371
| -rw-r--r-- | tests/robotests/src/com/android/tv/util/TvTrackInfoUtilsTest.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/tests/robotests/src/com/android/tv/util/TvTrackInfoUtilsTest.java b/tests/robotests/src/com/android/tv/util/TvTrackInfoUtilsTest.java index c409ca21..c59cb16e 100644 --- a/tests/robotests/src/com/android/tv/util/TvTrackInfoUtilsTest.java +++ b/tests/robotests/src/com/android/tv/util/TvTrackInfoUtilsTest.java @@ -29,7 +29,6 @@ import com.android.tv.testing.ComparatorTester; import com.android.tv.testing.TvRobolectricTestRunner; import com.android.tv.testing.constants.ConfigConstants; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; @@ -39,6 +38,7 @@ import java.util.Arrays; import java.util.Collections; import java.util.Comparator; import java.util.List; +import java.util.Locale; /** Tests for {@link com.android.tv.util.TvTrackInfoUtils}. */ @RunWith(TvRobolectricTestRunner.class) @@ -95,8 +95,9 @@ public class TvTrackInfoUtilsTest { @Test @Config(minSdk = ConfigConstants.MIN_SDK, maxSdk = VERSION_CODES.M) - @Ignore("b/129982262") public void testGetBestTrackInfo_channelCountOnlyMatchWithNullLanguage_23() { + Locale localPreference = Locale.forLanguageTag("es"); + Locale.setDefault(localPreference); TvTrackInfo result = getBestTrackInfo(allTracks, UN_MATCHED_ID, null, 8); assertWithMessage("best track ").that(result).isEqualTo(info3Fr8); } @@ -119,8 +120,9 @@ public class TvTrackInfoUtilsTest { @Test @Config(minSdk = ConfigConstants.MIN_SDK, maxSdk = VERSION_CODES.M) - @Ignore("b/129982262") public void testGetBestTrackInfo_noMatchesWithNullLanguage_23() { + Locale localPreference = Locale.forLanguageTag("es"); + Locale.setDefault(localPreference); TvTrackInfo result = getBestTrackInfo(allTracks, UN_MATCHED_ID, null, 0); assertWithMessage("best track ").that(result).isEqualTo(info3Fr8); } |