diff options
| author | Bjorn Bringert <bringert@android.com> | 2010-11-23 14:43:12 +0000 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-12-20 15:23:02 -0800 |
| commit | f5f75104868ce699db458ce6360f3843371e594f (patch) | |
| tree | 024a4ee8436c5f667070e2af6bc2447a46414f00 /core/tests | |
| parent | 2bd83c00a0c72d3f6bd929c4df5fe83ee31b4704 (diff) | |
| download | frameworks_base-f5f75104868ce699db458ce6360f3843371e594f.zip frameworks_base-f5f75104868ce699db458ce6360f3843371e594f.tar.gz frameworks_base-f5f75104868ce699db458ce6360f3843371e594f.tar.bz2 | |
Fix issue #3224616: TimeUtils.formatDuration() can drop 0s.
Integrated from master.
Change-Id: Ie12dd25cce03c06fafb7df1335266322df43b038
Diffstat (limited to 'core/tests')
| -rw-r--r-- | core/tests/coretests/src/android/util/TimeUtilsTest.java | 18 |
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()); + } } |