Add unit tests for WatchBuilder that do not require Kubernetes

Author: russgold

pom.xml

@@ -445,17 +445,36 @@
             <version>2.3.0</version>
         </dependency>
         <!-- test dependencies -->
+        <dependency>
+            <groupId>org.hamcrest</groupId>
+            <artifactId>hamcrest-junit</artifactId>
+            <version>2.0.0.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-exec</artifactId>
             <version>1.3</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.httpunit</groupId>
+            <artifactId>httpunit</artifactId>
+            <version>1.7.2</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.meterware.simplestub</groupId>
+            <artifactId>simplestub</artifactId>
+            <version>1.2.9</version>
+            <scope>test</scope>
+        </dependency>
 
     </dependencies>
 

src/main/java/oracle/kubernetes/operator/DomainWatcher.java

@@ -75,7 +75,7 @@ protected Watching<Domain> createWatching(ClientHolder client) {
       public Watch<Domain> initiateWatch(Object context, String resourceVersion) throws ApiException {
         return new WatchBuilder(client)
                   .withResourceVersion(resourceVersion)
-                .createDomainsInNamespaceWatch(ns);
+                .createDomainWatch(ns);
       }
 
       @Override

src/main/java/oracle/kubernetes/operator/builders/WatchBuilder.java

@@ -3,11 +3,9 @@
 package oracle.kubernetes.operator.builders;
 
 import com.squareup.okhttp.Call;
-import io.kubernetes.client.ApiClient;
 import io.kubernetes.client.ApiException;
 import io.kubernetes.client.ProgressRequestBody;
 import io.kubernetes.client.ProgressResponseBody;
-import io.kubernetes.client.models.V1Namespace;
 import io.kubernetes.client.models.V1Pod;
 import io.kubernetes.client.models.V1Service;
 import io.kubernetes.client.models.V1beta1Ingress;
@@ -19,7 +17,7 @@
 import java.lang.reflect.Type;
 import java.util.function.BiFunction;
 
-@SuppressWarnings("unused")
+@SuppressWarnings("WeakerAccess")
 public class WatchBuilder {
 
     /** Always true for watches. */
@@ -41,32 +39,7 @@ public WatchBuilder(ClientHolder clientHolder) {
         this.clientHolder = clientHolder;
     }
 
-    /**
-     * Creates a web hook object to track changes to the namespaces.
-     * @return the active web hook
-     * @throws ApiException if there is an error on the call that sets up the web hook.
-     */
-    public Watch<V1Namespace> createNamespaceWatch() throws ApiException {
-        return FACTORY.createWatch(clientHolder, callParams, V1Namespace.class, WatchBuilder::listNamespaceCall);
-    }
-
-    private ApiClient getApiClient() {
-        return clientHolder.getApiClient();
-    }
-
-    private static Call listNamespaceCall(ClientHolder clientHolder, CallParams callParams) {
-        try {
-            return clientHolder.getCoreApiClient().listNamespaceCall(
-                        callParams.getPretty(), START_LIST, callParams.getFieldSelector(),
-                        callParams.getIncludeUninitialized(), callParams.getLabelSelector(), callParams.getLimit(),
-                        callParams.getResourceVersion(), callParams.getTimeoutSeconds(), WATCH,
-                        callParams.getProgressListener(), callParams.getProgressRequestListener());
-        } catch (ApiException e) {
-            throw new UncheckedApiException(e);
-        }
-    }
-
-    private static <T> Type getType(Class<?> responseBodyType) {
+    private static Type getType(Class<?> responseBodyType) {
         return new ParameterizedType() {
             @Override
             public Type[] getActualTypeArguments() {
@@ -172,40 +145,20 @@ public Call apply(ClientHolder clientHolder, CallParams callParams) {
         }
     }
 
-    /**
-     * Creates a web hook object to track changes to weblogic domains in all namespaces
-     * @return the active web hook
-     * @throws ApiException if there is an error on the call that sets up the web hook.
-     */
-    public Watch<Domain> createDomainsInAllNamespacesWatch() throws ApiException {
-        return FACTORY.createWatch(clientHolder, callParams, Domain.class, WatchBuilder::listDomainsForAllNamespacesCall);
-    }
-
-    private static Call listDomainsForAllNamespacesCall(ClientHolder clientHolder, CallParams callParams) {
-        try {
-            return clientHolder.getWeblogicApiClient().listWebLogicOracleV1DomainForAllNamespacesCall(START_LIST,
-                        callParams.getFieldSelector(), callParams.getIncludeUninitialized(), callParams.getLabelSelector(),
-                        callParams.getLimit(), callParams.getPretty(), callParams.getResourceVersion(),
-                        callParams.getTimeoutSeconds(), WATCH, callParams.getProgressListener(), callParams.getProgressRequestListener());
-        } catch (ApiException e) {
-            throw new UncheckedApiException(e);
-        }
-    }
-
     /**
      * Creates a web hook object to track changes to weblogic domains in one namespaces
      * @param namespace the namespace in which to track domains
      * @return the active web hook
      * @throws ApiException if there is an error on the call that sets up the web hook.
      */
-    public Watch<Domain> createDomainsInNamespaceWatch(String namespace) throws ApiException {
-        return FACTORY.createWatch(clientHolder, callParams, Domain.class, new ListDomainsInNamespaceCall(namespace));
+    public Watch<Domain> createDomainWatch(String namespace) throws ApiException {
+        return FACTORY.createWatch(clientHolder, callParams, Domain.class, new ListDomainsCall(namespace));
     }
 
-    private class ListDomainsInNamespaceCall implements BiFunction<ClientHolder, CallParams, Call> {
+    private class ListDomainsCall implements BiFunction<ClientHolder, CallParams, Call> {
         private String namespace;
 
-        ListDomainsInNamespaceCall(String namespace) {
+        ListDomainsCall(String namespace) {
             this.namespace = namespace;
         }
 
@@ -301,11 +254,13 @@ public WatchBuilder withTimeoutSeconds(Integer timeoutSeconds) {
         return this;
     }
 
+    @SuppressWarnings("unused")
     public WatchBuilder withProgressListener(ProgressResponseBody.ProgressListener progressListener) {
         callParams.setProgressListener(progressListener);
         return this;
     }
 
+    @SuppressWarnings("unused")
     public WatchBuilder withProgressRequestListener(ProgressRequestBody.ProgressRequestListener progressRequestListener) {
         callParams.setProgressRequestListener(progressRequestListener);
         return this;

src/main/java/oracle/kubernetes/operator/builders/package-info.java

@@ -0,0 +1,7 @@
+// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+/**
+ * Builders for complex objects that interact with Kubernetes.
+ */
+package oracle.kubernetes.operator.builders;

src/test/java/oracle/kubernetes/TestUtils.java

@@ -2,6 +2,8 @@
 // Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
 package oracle.kubernetes;
 
+import com.meterware.simplestub.Memento;
+import oracle.kubernetes.operator.logging.LoggingFactory;
 import org.apache.commons.exec.CommandLine;
 import org.apache.commons.exec.DefaultExecutor;
 
@@ -49,6 +51,26 @@ public static boolean isLinux() {
     return System.getProperty("os.name").toLowerCase().contains("linux");
   }
 
+  /**
+   * Removes the console handlers from the specified logger, in order to silence them during a test.
+   *
+   * @return a collection of the removed handlers
+   */
+  public static Memento silenceOperatorLogger() {
+    Logger logger = LoggingFactory.getLogger("Operator", "Operator").getUnderlyingLogger();
+    List<Handler> savedHandlers = new ArrayList<>();
+    for (Handler handler : logger.getHandlers()) {
+      if (handler instanceof ConsoleHandler) {
+        savedHandlers.add(handler);
+      }
+    }
+
+    for (Handler handler : savedHandlers)
+      logger.removeHandler(handler);
+
+    return new ConsoleHandlerMemento(logger, savedHandlers);
+  }
+
   /**
    * Removes the console handlers from the specified logger, in order to silence them during a test.
    *
@@ -78,4 +100,24 @@ public static void restoreConsoleHandlers(Logger logger, List<Handler> savedHand
       logger.addHandler(handler);
     }
   }
+
+  private static class ConsoleHandlerMemento implements Memento {
+    private Logger logger;
+    private List<Handler> savedHandlers;
+
+    ConsoleHandlerMemento(Logger logger, List<Handler> savedHandlers) {
+      this.logger = logger;
+      this.savedHandlers = savedHandlers;
+    }
+
+    @Override
+    public void revert() {
+      restoreConsoleHandlers(logger, savedHandlers);
+    }
+
+    @Override
+    public <T> T getOriginalValue() {
+      throw new UnsupportedOperationException();
+    }
+  }
 }