summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoachim Sauer <jsauer@google.com>2017-01-24 14:31:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-01-24 14:31:35 +0000
commitb4b1a307491d77d5bc778f6a8b3177b9629fea7b (patch)
tree364bc483be4885b2db387280a5c39bf6554bf085
parent00ce1a3014be27965bc5a97a0f7031f86bb4f852 (diff)
parent6207af718c9bdfe0270a2a8340f15a80be67def4 (diff)
downloadapache-harmony-b4b1a307491d77d5bc778f6a8b3177b9629fea7b.tar.gz
Merge "Fix LoggerTest." am: a45b635357 am: 0db58bf509
am: 6207af718c Change-Id: I9477830d834731201270cb71d78dd9065c57f897
-rw-r--r--logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
index bb22d29..03083ae 100644
--- a/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
+++ b/logging/src/test/java/org/apache/harmony/logging/tests/java/util/logging/LoggerTest.java
@@ -3179,9 +3179,9 @@ public class LoggerTest extends TestCase {
assertSame(r.getLoggerName(), this.sharedLogger.getName());
assertEquals(r.getMessage(),
"logrb(Level, String, String, ResourceBundle, String, Object...) msg");
- assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2);
- assertSame(r.getSourceClassName(), "sourceClass");
- assertSame(r.getSourceMethodName(), "sourceMethod");
+ assertEquals(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2);
+ assertEquals(r.getSourceClassName(), "sourceClass");
+ assertEquals(r.getSourceMethodName(), "sourceMethod");
assertSame(r.getLevel(), Level.INFO);
assertEquals(2, r.getParameters().length);
assertSame(params[0], r.getParameters()[0]);
@@ -3359,9 +3359,9 @@ public class LoggerTest extends TestCase {
assertSame(r.getLoggerName(), this.sharedLogger.getName());
assertEquals(r.getMessage(),
"logrb(Level, String, String, ResourceBundle, String, Throwable) msg");
- assertSame(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2);
- assertSame(r.getSourceClassName(), "sourceClass");
- assertSame(r.getSourceMethodName(), "sourceMethod");
+ assertEquals(r.getResourceBundleName(), VALID_RESOURCE_BUNDLE2);
+ assertEquals(r.getSourceClassName(), "sourceClass");
+ assertEquals(r.getSourceMethodName(), "sourceMethod");
assertSame(r.getLevel(), Level.parse("1611"));
assertNull(r.getParameters());
assertSame(r.getThrown(), t);