summaryrefslogtreecommitdiffstats
path: root/core/tests
diff options
context:
space:
mode:
authorBjorn Bringert <bringert@android.com>2010-11-23 14:43:12 +0000
committerBjorn Bringert <bringert@android.com>2010-11-23 14:43:12 +0000
commit901b3796fd0954cc4b01bf95dbcbd88d87414e84 (patch)
treea14327f75a435c39ef1c47b51176c4370346f2cd /core/tests
parent1c24e957ad8624753f9d89b578d9d34d7ac5f80b (diff)
downloadframeworks_base-901b3796fd0954cc4b01bf95dbcbd88d87414e84.zip
frameworks_base-901b3796fd0954cc4b01bf95dbcbd88d87414e84.tar.gz
frameworks_base-901b3796fd0954cc4b01bf95dbcbd88d87414e84.tar.bz2
Don't drop zeros in the second position in formatDuration()
Bug: 3223250 Change-Id: I462c96af51cc052f9df1dc3d2c668551b10155ea
Diffstat (limited to 'core/tests')
-rw-r--r--core/tests/coretests/src/android/util/TimeUtilsTest.java18
1 files changed, 18 insertions, 0 deletions
diff --git a/core/tests/coretests/src/android/util/TimeUtilsTest.java b/core/tests/coretests/src/android/util/TimeUtilsTest.java
index 65a6078..8d9f8e5 100644
--- a/core/tests/coretests/src/android/util/TimeUtilsTest.java
+++ b/core/tests/coretests/src/android/util/TimeUtilsTest.java
@@ -429,4 +429,22 @@ public class TimeUtilsTest extends TestCase {
c.getTimeInMillis(),
country);
}
+
+ public void testFormatDuration() {
+ assertFormatDuration("0", 0);
+ assertFormatDuration("-1ms", -1);
+ assertFormatDuration("+1ms", 1);
+ assertFormatDuration("+10ms", 10);
+ assertFormatDuration("+100ms", 100);
+ assertFormatDuration("+101ms", 101);
+ assertFormatDuration("+330ms", 330);
+ assertFormatDuration("+1s330ms", 1330);
+ assertFormatDuration("+10s24ms", 10024);
+ }
+
+ private void assertFormatDuration(String expected, long duration) {
+ StringBuilder sb = new StringBuilder();
+ TimeUtils.formatDuration(duration, sb);
+ assertEquals("formatDuration(" + duration + ")", expected, sb.toString());
+ }
}