adding mockito runner

jabubake · jabubake · commit 0184291664be · 2017-05-09T21:55:15.000-07:00
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/contrib/LoggingAppender.java b/google-cloud-contrib/google-cloud-logging-logback/src/main/java/com/google/cloud/logging/contrib/LoggingAppender.java
@@ -56,7 +56,6 @@ public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {
   private static final String LEVEL_NAME_KEY = "levelName";
   private static final String LEVEL_VALUE_KEY = "levelValue";
 
-  private LoggingOptions loggingOptions;
   private volatile Logging logging;
   private List<LoggingEnhancer> loggingEnhancers;
   private WriteOption[] defaultWriteOptions;
@@ -156,7 +155,6 @@ List<LoggingEnhancer> getEnhancers() {
   /** Initialze and configure the cloud logging service. */
   @Override
   public synchronized void start() {
-    loggingOptions = LoggingOptions.getDefaultInstance();
     MonitoredResource resource = getMonitoredResource(getProjectId());
     Level level = getLogLevel();
     defaultWriteOptions =
@@ -176,7 +174,7 @@ public synchronized void start() {
   }
 
   protected String getProjectId() {
-    return loggingOptions.getProjectId();
+    return LoggingOptions.getDefaultInstance().getProjectId();
   }
 
   @Override
@@ -209,7 +207,7 @@ protected Logging getLogging() {
     if (logging == null) {
       synchronized (this) {
         if (logging == null) {
-          logging = loggingOptions.getService();
+          logging = LoggingOptions.getDefaultInstance().getService();
         }
       }
     }
diff --git a/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/contrib/LoggingAppenderTest.java b/google-cloud-contrib/google-cloud-logging-logback/src/test/java/com/google/cloud/logging/contrib/LoggingAppenderTest.java
@@ -37,11 +37,11 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 import java.util.Collections;
+import org.mockito.junit.MockitoJUnitRunner;
 
-@RunWith(JUnit4.class)
+@RunWith(MockitoJUnitRunner.class)
 public class LoggingAppenderTest {
 
   private final String projectId = "test-project";

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,6 @@ public class LoggingAppender extends UnsynchronizedAppenderBase<ILoggingEvent> {`
`56`	`56`	`private static final String LEVEL_NAME_KEY = "levelName";`
`57`	`57`	`private static final String LEVEL_VALUE_KEY = "levelValue";`
`58`	`58`
`59`		`- private LoggingOptions loggingOptions;`
`60`	`59`	`private volatile Logging logging;`
`61`	`60`	`private List<LoggingEnhancer> loggingEnhancers;`
`62`	`61`	`private WriteOption[] defaultWriteOptions;`
`@@ -156,7 +155,6 @@ List<LoggingEnhancer> getEnhancers() {`
`156`	`155`	`/** Initialze and configure the cloud logging service. */`
`157`	`156`	`@Override`
`158`	`157`	`public synchronized void start() {`
`159`		`- loggingOptions = LoggingOptions.getDefaultInstance();`
`160`	`158`	`MonitoredResource resource = getMonitoredResource(getProjectId());`
`161`	`159`	`Level level = getLogLevel();`
`162`	`160`	`defaultWriteOptions =`
`@@ -176,7 +174,7 @@ public synchronized void start() {`
`176`	`174`	`}`
`177`	`175`
`178`	`176`	`protected String getProjectId() {`
`179`		`- return loggingOptions.getProjectId();`
	`177`	`+ return LoggingOptions.getDefaultInstance().getProjectId();`
`180`	`178`	`}`
`181`	`179`
`182`	`180`	`@Override`
`@@ -209,7 +207,7 @@ protected Logging getLogging() {`
`209`	`207`	`if (logging == null) {`
`210`	`208`	`synchronized (this) {`
`211`	`209`	`if (logging == null) {`
`212`		`- logging = loggingOptions.getService();`
	`210`	`+ logging = LoggingOptions.getDefaultInstance().getService();`
`213`	`211`	`}`
`214`	`212`	`}`
`215`	`213`	`}`