summaryrefslogtreecommitdiffstats
path: root/core/tests/coretests
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2013-03-07 15:39:46 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-07 15:39:46 -0800
commit4a1bd4640c5e915ed1ebd320a515725e31992545 (patch)
tree8a0f2ab2666904248f250fad1e2a59a88d7bedac /core/tests/coretests
parent4147f86699fc0db2fec2e26f339b46e70d2027b4 (diff)
parentd0d1be2d27af35fe7553835ee8c411fd13d1c8d7 (diff)
downloadframeworks_base-4a1bd4640c5e915ed1ebd320a515725e31992545.zip
frameworks_base-4a1bd4640c5e915ed1ebd320a515725e31992545.tar.gz
frameworks_base-4a1bd4640c5e915ed1ebd320a515725e31992545.tar.bz2
am d0d1be2d: Merge "Explain why the frameworks/base DateUtilsTest isn\'t merged with CTS\' DateUtilsTest."
* commit 'd0d1be2d27af35fe7553835ee8c411fd13d1c8d7': Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
Diffstat (limited to 'core/tests/coretests')
-rw-r--r--core/tests/coretests/src/android/text/format/DateUtilsTest.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/core/tests/coretests/src/android/text/format/DateUtilsTest.java b/core/tests/coretests/src/android/text/format/DateUtilsTest.java
index cf42bb1..c5f6236 100644
--- a/core/tests/coretests/src/android/text/format/DateUtilsTest.java
+++ b/core/tests/coretests/src/android/text/format/DateUtilsTest.java
@@ -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));