summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2022-08-26 17:32:54 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2022-08-26 17:32:54 +0000
commitc93175a6bb71a9c94718e67e8b4bec5ceab02b1e (patch)
tree7ec13b5388790e60a5c4c16f0b51ab4a5ee04db0
parentbf9e8dd800b0c6c7a8a509cb2ce4bde8ae21d7c2 (diff)
parent7054b8797391bef851b50cc3c1e92f44c7198a3b (diff)
downloadapache-harmony-c93175a6bb71a9c94718e67e8b4bec5ceab02b1e.tar.gz
Merge "Deflake SimpleFormatterTest." am: 77bbae5871 am: c8d85c5761 am: c4aff7e2b4 am: 7054b87973
Original change: https://android-review.googlesource.com/c/platform/external/apache-harmony/+/2197499 Change-Id: Id7987f0fb4be395b8f197425d636bd297be7b349 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.java5
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);