1 files changed, 13 insertions, 10 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..827dcdbd 100644
--- a/tests/unit/src/com/android/tv/data/ChannelNumberTest.java
+++ b/tests/unit/src/com/android/tv/data/ChannelNumberTest.java
@@ -16,22 +16,24 @@
 package com.android.tv.data;
 
 import static com.android.tv.data.ChannelNumber.parseChannelNumber;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 import android.support.test.filters.SmallTest;
 
 import com.android.tv.testing.ComparableTester;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Tests for {@link ChannelNumber}.
  */
 @SmallTest
-public class ChannelNumberTest extends TestCase {
-
+public class ChannelNumberTest {
     /**
      * Test method for {@link ChannelNumber#ChannelNumber()}.
      */
+    @Test
     public void testChannelNumber() {
         assertChannelEquals(new ChannelNumber(), "", false, "");
     }
@@ -40,32 +42,32 @@ public class ChannelNumberTest extends TestCase {
      * Test method for
      * {@link com.android.tv.data.ChannelNumber#parseChannelNumber(java.lang.String)}.
      */
+    @Test
     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");
     }
 
     /**
      * Test method for {@link ChannelNumber#compareTo(com.android.tv.data.ChannelNumber)}.
      */
+    @Test
     public void testCompareTo() {
         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();
@@ -74,6 +76,7 @@ public class ChannelNumberTest extends TestCase {
     /**
      * Test method for {@link ChannelNumber#compare(java.lang.String, java.lang.String)}.
      */
+    @Test
     public void testCompare() {
         // Only need to test nulls, the reset is tested by testCompareTo
         assertEquals("compareTo(null,null)", 0, ChannelNumber.compare(null, null));