Snap for 4378450 from 6ebde20b03db4c0d57f67acaac11832b610b966b to oc-mr1-releaseandroid-wear-8.1.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r14android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-security-8.1.0_r93android-security-8.1.0_r92android-security-8.1.0_r91android-security-8.1.0_r90android-security-8.1.0_r89android-security-8.1.0_r88android-security-8.1.0_r87android-security-8.1.0_r86android-security-8.1.0_r85android-security-8.1.0_r84android-security-8.1.0_r83android-security-8.1.0_r82android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r25android-cts-8.1_r24android-cts-8.1_r23android-cts-8.1_r22android-cts-8.1_r21android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-8.1.0_r81android-8.1.0_r80android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r69android-8.1.0_r68android-8.1.0_r66android-8.1.0_r6android-8.1.0_r5android-8.1.0_r4android-8.1.0_r3android-8.1.0_r23android-8.1.0_r19android-8.1.0_r16android-8.1.0_r15android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1security-oc-mr1-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-m4-s1-release

Change-Id: I07f19344c030a9c2b0fd7ba425f7bf7462575f92

1 files changed, 24 insertions, 12 deletions

diff --git a/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java b/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java
index 9dfb992e..e61802f5 100644
--- a/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java
+++ b/tests/unit/src/com/android/tv/util/UtilsTest_GetDurationString.java
@@ -15,10 +15,16 @@
  */
 package com.android.tv.util;
 
+import static android.support.test.InstrumentationRegistry.getContext;
+import static org.junit.Assert.assertEquals;
+
 import android.support.test.filters.SmallTest;
-import android.test.AndroidTestCase;
 import android.text.format.DateUtils;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import java.util.Calendar;
 import java.util.GregorianCalendar;
 import java.util.Locale;
@@ -32,7 +38,7 @@ import java.util.Locale;
  * and it should be defined in TV app, not this test.
  */
 @SmallTest
-public class UtilsTest_GetDurationString extends AndroidTestCase {
+public class UtilsTest_GetDurationString {
     // TODO: Mock Context so we can specify current time and locale for test.
     private Locale mLocale;
     private static final long DATE_THIS_YEAR_2_1_MS = getFebOfThisYearInMillis(1, 0, 0);
@@ -40,14 +46,19 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
     // All possible list for a parameter to test parameter independent result.
     private static final boolean[] PARAM_USE_SHORT_FORMAT = {false, true};
 
-    @Override
-    protected void setUp() throws Exception {
-        super.setUp();
+    @Before
+    public void setUp() {
         // Set locale to US
         mLocale = Locale.getDefault();
         Locale.setDefault(Locale.US);
     }
 
+    @After
+    public void tearDown() {
+        // Revive system locale.
+        Locale.setDefault(mLocale);
+    }
+
     /**
      * Return time in millis assuming that whose year is this year and month is Jan.
      */
@@ -76,6 +87,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
         return new GregorianCalendar().get(GregorianCalendar.YEAR);
     }
 
+    @Test
     public void testSameDateAndTime() {
         assertEquals("3:00 AM", Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
                         getFebOfThisYearInMillis(1, 3), getFebOfThisYearInMillis(1, 3), false,
@@ -85,6 +97,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationWithinToday() {
         assertEquals("12:00 – 3:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS, DATE_THIS_YEAR_2_1_MS,
@@ -96,6 +109,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationFromYesterdayToToday() {
         assertEquals("Jan 31, 3:00 AM – Feb 1, 4:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -115,6 +129,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         true, DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationFromTodayToTomorrow() {
         assertEquals("Feb 1, 3:00 AM – Feb 2, 4:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -154,6 +169,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testDurationWithinTomorrow() {
         assertEquals("Feb 2, 2:00 – 4:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -173,6 +189,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testStartOfDay() {
         assertEquals("12:00 – 1:00 AM",
                 Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS, DATE_THIS_YEAR_2_1_MS,
@@ -201,6 +218,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testEndOfDay() {
         for (boolean useShortFormat : PARAM_USE_SHORT_FORMAT) {
             assertEquals("11:00 PM – 12:00 AM",
@@ -241,6 +259,7 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                         DateUtils.FORMAT_24HOUR));
     }
 
+    @Test
     public void testMidnight() {
         for (boolean useShortFormat : PARAM_USE_SHORT_FORMAT) {
             assertEquals("12:00 AM", Utils.getDurationString(getContext(), DATE_THIS_YEAR_2_1_MS,
@@ -251,11 +270,4 @@ public class UtilsTest_GetDurationString extends AndroidTestCase {
                             DateUtils.FORMAT_24HOUR));
         }
     }
-
-    @Override
-    protected void tearDown() throws Exception {
-        super.tearDown();
-        // Revive system locale.
-        Locale.setDefault(mLocale);
-    }
 }