fix logging unit tests (googleapis#3630)

(googleapis#3615) is happening when running on GCE. GCE would override the DEFAULT_RESOURCE and that's causing the tests to fail. This commit fixes the bug.
qian-long · Aug 31, 2018 · b9b4aff · b9b4aff
1 parent ff2ed5e
commit b9b4aff
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/...ients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java b/...ients/google-cloud-logging/src/test/java/com/google/cloud/logging/LoggingHandlerTest.java
@@ -250,7 +250,7 @@ public void testPublishLevels() {
     logging.write(ImmutableList.of(EMERGENCY_ENTRY), DEFAULT_OPTIONS);
     expectLastCall().once();
     replay(options, logging);
-    Handler handler = new LoggingHandler(LOG_NAME, options);
+    Handler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE);
     handler.setLevel(Level.ALL);
     handler.setFormatter(new TestFormatter());
     // default levels
@@ -362,7 +362,7 @@ public void testReportWriteError() {
     errorManager.error(null, ex, ErrorManager.WRITE_FAILURE);
     expectLastCall().once();
     replay(errorManager);
-    Handler handler = new LoggingHandler(LOG_NAME, options);
+    Handler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE);
     handler.setLevel(Level.ALL);
     handler.setErrorManager(errorManager);
     handler.setFormatter(new TestFormatter());
@@ -388,7 +388,7 @@ public void testReportFlushError() {
     expectLastCall().once();
     replay(options, logging, errorManager);
     LogRecord record = newLogRecord(Level.FINEST, MESSAGE);
-    Handler handler = new LoggingHandler(LOG_NAME, options);
+    Handler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE);
     handler.setLevel(Level.ALL);
     handler.setErrorManager(errorManager);
     handler.setFormatter(new TestFormatter());
@@ -414,7 +414,7 @@ public void testReportFormatError() {
     LogRecord record = newLogRecord(Level.FINEST, MESSAGE);
     expect(formatter.format(record)).andThrow(ex);
     replay(errorManager, formatter);
-    Handler handler = new LoggingHandler(LOG_NAME, options);
+    Handler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE);
     handler.setLevel(Level.ALL);
     handler.setErrorManager(errorManager);
     handler.setFormatter(formatter);
@@ -439,7 +439,7 @@ public void testFlushLevel() {
         DEFAULT_OPTIONS);
     expectLastCall().once();
     replay(options, logging);
-    LoggingHandler handler = new LoggingHandler(LOG_NAME, options);
+    LoggingHandler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE);
     handler.setLevel(Level.ALL);
     handler.setFlushLevel(Level.WARNING);
     handler.setFormatter(new TestFormatter());
@@ -473,7 +473,7 @@ public void testSyncWrite() {
     expectLastCall().once();
     replay(options, logging);
 
-    LoggingHandler handler = new LoggingHandler(LOG_NAME, options);
+    LoggingHandler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE);
     handler.setLevel(Level.ALL);
     handler.setSynchronicity(Synchronicity.SYNC);
     handler.setFormatter(new TestFormatter());
@@ -493,7 +493,7 @@ public void testAddHandler() {
     logging.write(ImmutableList.of(FINEST_ENTRY), DEFAULT_OPTIONS);
     expectLastCall().once();
     replay(options, logging);
-    LoggingHandler handler = new LoggingHandler(LOG_NAME, options) {
+    LoggingHandler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE) {
       @Override
       public void close() {
         // Make close NOOP to avoid mock close exception
@@ -520,7 +520,7 @@ public void testClose() throws Exception {
     logging.close();
     expectLastCall().once();
     replay(options, logging);
-    Handler handler = new LoggingHandler(LOG_NAME, options);
+    Handler handler = new LoggingHandler(LOG_NAME, options, DEFAULT_RESOURCE);
     handler.setLevel(Level.ALL);
     handler.setFormatter(new TestFormatter());
     handler.publish(newLogRecord(Level.FINEST, MESSAGE));