Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am d0d1be2d: Merge "Explain why the frameworks/base DateUtilsTest isn\'t merged with CTS\' DateUtilsTest."

Browse Source 
* commit 'd0d1be2d27af35fe7553835ee8c411fd13d1c8d7':
  Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
This commit is contained in:
Elliott Hughes
2013-03-07 15:39:46 -08:00
committed by Android Git Automerger
parent 4147f86699 d0d1be2d27
commit 4a1bd4640c
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
core/tests/coretests/src/android/text/format/DateUtilsTest.java
View File

@@ -21,8 +21,9 @@ import android.test.suitebuilder.annotation.SmallTest;
import junit.framework.TestCase;
public class DateUtilsTest extends TestCase {
// This test is not in CTS because formatDuration is @hidden.
@SmallTest
public void testFormatDurationSeconds() throws Exception {
public void test_formatDuration_seconds() throws Exception {
assertEquals("0 seconds", DateUtils.formatDuration(0));
assertEquals("0 seconds", DateUtils.formatDuration(1));
assertEquals("0 seconds", DateUtils.formatDuration(499));
@@ -31,16 +32,18 @@ public class DateUtilsTest extends TestCase {
assertEquals("2 seconds", DateUtils.formatDuration(1500));
}
// This test is not in CTS because formatDuration is @hidden.
@SmallTest
public void testFormatDurationMinutes() throws Exception {
public void test_formatDuration_Minutes() throws Exception {
assertEquals("59 seconds", DateUtils.formatDuration(59000));
assertEquals("60 seconds", DateUtils.formatDuration(59500));
assertEquals("1 minute", DateUtils.formatDuration(60000));
assertEquals("2 minutes", DateUtils.formatDuration(120000));
}
// This test is not in CTS because formatDuration is @hidden.
@SmallTest
public void testFormatDurationHours() throws Exception {
public void test_formatDuration_Hours() throws Exception {
assertEquals("59 minutes", DateUtils.formatDuration(3540000));
assertEquals("1 hour", DateUtils.formatDuration(3600000));
assertEquals("48 hours", DateUtils.formatDuration(172800000));