diff options
| author | Nick Chalko <nchalko@google.com> | 2017-05-10 19:00:37 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-05-10 19:00:37 +0000 |
| commit | c11f019e2f3b2e9a4edb0bd2687c149a30c209a0 (patch) | |
| tree | 14d9836ff9283690321c166560ee3450792236ad /tests/unit/src/com/android/tv/data/ChannelNumberTest.java | |
| parent | 430c2be3b91676005fdd243553e38acff8dfc3de (diff) | |
| parent | 0550a7221be0581b0bd421a9d70400ff8699a6e7 (diff) | |
| download | TV-c11f019e2f3b2e9a4edb0bd2687c149a30c209a0.tar.gz | |
Sync to ub-tv-dev at lost+ hash 550cbec17259717c5453f6be1eb05736ba10ef1d
am: 0550a7221b
Change-Id: Id38d8bc09ffbf856c8976893096c47d3bcc8b8b7
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(); |