diff options
| author | Nick Chalko <nchalko@google.com> | 2017-05-09 14:07:44 -0700 |
|---|---|---|
| committer | Nick Chalko <nchalko@google.com> | 2017-05-10 09:49:18 -0700 |
| commit | 0550a7221be0581b0bd421a9d70400ff8699a6e7 (patch) | |
| tree | 14d9836ff9283690321c166560ee3450792236ad /tests/unit/src/com/android/tv/data/ChannelNumberTest.java | |
| parent | 430c2be3b91676005fdd243553e38acff8dfc3de (diff) | |
| download | TV-0550a7221be0581b0bd421a9d70400ff8699a6e7.tar.gz | |
Sync to ub-tv-dev at lost+android-o-preview-3android-n-iot-preview-4n-iot-preview-4
hash 550cbec17259717c5453f6be1eb05736ba10ef1d
Bug: 37849928
Test: tested on vendor branch
Change-Id: I82190481d2bcef2b89e78414b6b92ed97720749d
Merged-In: I4199ec04cacb4a78be58b85302a39d917658dc28
Diffstat (limited to 'tests/unit/src/com/android/tv/data/ChannelNumberTest.java')
| -rw-r--r-- | tests/unit/src/com/android/tv/data/ChannelNumberTest.java | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java index 4e6e9f3c..d074baae 100644 --- a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java +++ b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java @@ -42,14 +42,14 @@ public class ChannelNumberTest extends TestCase { */ public void testParseChannelNumber() { assertNull(parseChannelNumber("")); - assertNull(parseChannelNumber(" ")); + assertNull(parseChannelNumber("-")); assertNull(parseChannelNumber("abcd12")); assertNull(parseChannelNumber("12abcd")); assertNull(parseChannelNumber("-12")); assertChannelEquals(parseChannelNumber("1"), "1", false, ""); - assertChannelEquals(parseChannelNumber("1234 4321"), "1234", true, "4321"); + assertChannelEquals(parseChannelNumber("1234-4321"), "1234", true, "4321"); assertChannelEquals(parseChannelNumber("3-4"), "3", true, "4"); - assertChannelEquals(parseChannelNumber("5.6"), "5", true, "6"); + assertChannelEquals(parseChannelNumber("5-6"), "5", true, "6"); } /** @@ -59,13 +59,11 @@ public class ChannelNumberTest extends TestCase { new ComparableTester<ChannelNumber>() .addEquivalentGroup(parseChannelNumber("1"), parseChannelNumber("1")) .addEquivalentGroup(parseChannelNumber("2")) - .addEquivalentGroup(parseChannelNumber("2 1"), parseChannelNumber("2.1"), - parseChannelNumber("2-1")) + .addEquivalentGroup(parseChannelNumber("2-1")) .addEquivalentGroup(parseChannelNumber("2-2")) .addEquivalentGroup(parseChannelNumber("2-10")) .addEquivalentGroup(parseChannelNumber("3")) - .addEquivalentGroup(parseChannelNumber("4"), parseChannelNumber("4 0"), - parseChannelNumber("4.0"), parseChannelNumber("4-0")) + .addEquivalentGroup(parseChannelNumber("4"), parseChannelNumber("4-0")) .addEquivalentGroup(parseChannelNumber("10")) .addEquivalentGroup(parseChannelNumber("100")) .test(); |