Merge "Deflake SimpleFormatterTest." am: 77bbae5871 am: c8d85c5761 am: c4aff7e2b4 am: 7054b87973 am: c93175a6bb

Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499

Change-Id: Ia87340ca64f90912d2f1344f7aa8ff5bfab89c21
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

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);