diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-08-26 16:27:52 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-26 16:27:52 +0000 |
| commit | c8d85c5761e8ec9beb4903feb71ed22adc24ba3f (patch) | |
| tree | 7ec13b5388790e60a5c4c16f0b51ab4a5ee04db0 | |
| parent | 342b84cc53b4fc9ded8eb4498cfed39a01f7bbe2 (diff) | |
| parent | 77bbae5871343d78469cbf6b0db7e51e053d890e (diff) | |
| download | apache-harmony-c8d85c5761e8ec9beb4903feb71ed22adc24ba3f.tar.gz | |
Merge "Deflake SimpleFormatterTest." am: 77bbae5871
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499
Change-Id: Ieb6d93e025c26742924b15a4164ea626c7298631
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java index ee35d2d..02421a8 100644 --- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java +++ b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/SimpleFormatterTest.java @@ -74,6 +74,7 @@ public class SimpleFormatterTest extends TestCase { } public void testFormat() { + long logEventTimeMillis = 0; String str = sf.format(lr); Throwable t; @@ -92,10 +93,10 @@ public class SimpleFormatterTest extends TestCase { } }); lr.setSequenceNumber(12321312); - lr.setMillis(0); + lr.setMillis(logEventTimeMillis); str = sf.format(lr); Calendar cal = Calendar.getInstance(); - cal.setTimeInMillis(12321312); + cal.setTimeInMillis(logEventTimeMillis); assertTrue(str.indexOf(String.valueOf(cal.get(Calendar.YEAR))) >= 0); assertTrue(str.indexOf("class") > 0); assertTrue(str.indexOf("method") > 0); |