Add initial unit test for DomainStatusUpdater

Author: russgold

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/DomainStatus.java

@@ -8,6 +8,7 @@
 import com.google.gson.annotations.SerializedName;
 import java.util.ArrayList;
 import java.util.List;
+import javax.annotation.Nonnull;
 import javax.validation.Valid;
 import oracle.kubernetes.json.Description;
 import oracle.kubernetes.json.Range;
@@ -69,7 +70,7 @@ public class DomainStatus {
    *
    * @return conditions
    */
-  public List<DomainCondition> getConditions() {
+  public @Nonnull List<DomainCondition> getConditions() {
     return conditions;
   }
 
@@ -78,7 +79,7 @@ public List<DomainCondition> getConditions() {
    *
    * @param conditions conditions
    */
-  public void setConditions(List<DomainCondition> conditions) {
+  public void setConditions(@Nonnull List<DomainCondition> conditions) {
     this.conditions = conditions;
   }
 
@@ -93,6 +94,11 @@ public DomainStatus withConditions(List<DomainCondition> conditions) {
     return this;
   }
 
+  public DomainStatus addCondition(DomainCondition condition) {
+    conditions.add(condition);
+    return this;
+  }
+
   /**
    * A human readable message indicating details about why the domain is in this condition.
    *

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

@@ -1,4 +1,4 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018,2019 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.
 
@@ -13,7 +13,6 @@
 import java.util.ListIterator;
 import java.util.Map;
 import java.util.TreeMap;
-import java.util.concurrent.ConcurrentMap;
 import oracle.kubernetes.operator.calls.CallResponse;
 import oracle.kubernetes.operator.helpers.CallBuilder;
 import oracle.kubernetes.operator.helpers.DomainPresenceInfo;
@@ -93,7 +92,7 @@ info, timeoutSeconds, new StatusUpdateStep(getNext())),
     }
   }
 
-  private static class StatusUpdateStep extends Step {
+  static class StatusUpdateStep extends Step {
     public StatusUpdateStep(Step next) {
       super(next);
     }
@@ -125,12 +124,12 @@ public NextAction apply(Packet packet) {
 
         // Acquire current state
         @SuppressWarnings("unchecked")
-        ConcurrentMap<String, String> serverState =
-            (ConcurrentMap<String, String>) packet.get(ProcessingConstants.SERVER_STATE_MAP);
+        Map<String, String> serverState =
+            (Map<String, String>) packet.get(ProcessingConstants.SERVER_STATE_MAP);
 
         @SuppressWarnings("unchecked")
-        ConcurrentMap<String, ServerHealth> serverHealth =
-            (ConcurrentMap<String, ServerHealth>) packet.get(ProcessingConstants.SERVER_HEALTH_MAP);
+        Map<String, ServerHealth> serverHealth =
+            (Map<String, ServerHealth>) packet.get(ProcessingConstants.SERVER_HEALTH_MAP);
 
         Map<String, ServerStatus> serverStatuses = new TreeMap<>();
         WlsDomainConfig config = (WlsDomainConfig) packet.get(ProcessingConstants.DOMAIN_TOPOLOGY);
@@ -164,6 +163,7 @@ public NextAction apply(Packet packet) {
           }
         }
 
+        // num servers in named cluster, using labels
         Map<String, Integer> clusterCounts = new HashMap<>();
         for (Map.Entry<String, ServerKubernetesObjects> entry : info.getServers().entrySet()) {
           String serverName = entry.getKey();
@@ -173,11 +173,7 @@ public NextAction apply(Packet packet) {
               String clusterName =
                   pod.getMetadata().getLabels().get(LabelConstants.CLUSTERNAME_LABEL);
               if (clusterName != null) {
-                clusterCounts.compute(
-                    clusterName,
-                    (key, value) -> {
-                      return (value == null) ? 1 : value + 1;
-                    });
+                clusterCounts.compute(clusterName, (key, value) -> (value == null) ? 1 : value + 1);
               }
               ServerStatus ss =
                   new ServerStatus()

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

@@ -1,11 +1,9 @@
-// Copyright 2018, Oracle Corporation and/or its affiliates.  All rights reserved.
+// Copyright 2018,2019 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.
 
 package oracle.kubernetes;
 
-import static com.meterware.simplestub.Stub.createStub;
-
 import com.meterware.simplestub.Memento;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -19,6 +17,8 @@
 import java.util.logging.SimpleFormatter;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 
+import static com.meterware.simplestub.Stub.createStub;
+
 public class TestUtils {
   /**
    * Removes the console handlers from the specified logger, in order to silence them during a test.
@@ -42,6 +42,20 @@ public static ConsoleHandlerMemento silenceOperatorLogger() {
     return new ConsoleHandlerMemento(logger, testHandler, savedHandlers);
   }
 
+  /**
+   * Converts a list of strings to a comma-separated list, using "and" for the last item.
+   *
+   * @param list the list to convert
+   * @return the resultant string
+   */
+  public static String joinListGrammatically(final List<String> list) {
+    return list.size() > 1
+        ? String.join(", ", list.subList(0, list.size() - 1))
+            .concat(String.format("%s and ", list.size() > 2 ? "," : ""))
+            .concat(list.get(list.size() - 1))
+        : list.get(0);
+  }
+
   abstract static class TestLogHandler extends Handler {
     private Throwable throwable;
     private List<Throwable> ignoredExceptions = new ArrayList<>();

operator/src/test/java/oracle/kubernetes/operator/DomainConditionMatcher.java

@@ -0,0 +1,83 @@
+// Copyright 2019 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.
+
+package oracle.kubernetes.operator;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import oracle.kubernetes.TestUtils;
+import oracle.kubernetes.weblogic.domain.v2.Domain;
+import oracle.kubernetes.weblogic.domain.v2.DomainCondition;
+import oracle.kubernetes.weblogic.domain.v2.DomainStatus;
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeDiagnosingMatcher;
+
+@SuppressWarnings("unused")
+class DomainConditionMatcher extends TypeSafeDiagnosingMatcher<Domain> {
+  private String expectedType;
+  private String expectedStatus;
+  private String expectedReason;
+  private String expectedMessage;
+
+  static DomainConditionMatcher hasCondition(String type) {
+    return new DomainConditionMatcher(type);
+  }
+
+  private DomainConditionMatcher(String expectedType) {
+    this.expectedType = expectedType;
+  }
+
+  DomainConditionMatcher withStatus(String status) {
+    expectedStatus = status;
+    return this;
+  }
+
+  DomainConditionMatcher withReason(String reason) {
+    expectedReason = reason;
+    return this;
+  }
+
+  DomainConditionMatcher withMessage(String message) {
+    expectedMessage = message;
+    return this;
+  }
+
+  @Override
+  protected boolean matchesSafely(Domain item, Description mismatchDescription) {
+    for (DomainCondition condition : getStatus(item).getConditions())
+      if (matches(condition)) return true;
+
+    mismatchDescription.appendValueList(
+        "found domain with conditions ", ", ", ".", getStatus(item).getConditions());
+    return false;
+  }
+
+  private boolean matches(DomainCondition condition) {
+    if (expectedType != null && !expectedType.equals(condition.getType())) return false;
+    if (expectedStatus != null && !expectedStatus.equals(condition.getStatus())) return false;
+    if (expectedMessage != null && !expectedMessage.equals(condition.getMessage())) return false;
+    return expectedReason == null || expectedReason.equals(condition.getReason());
+  }
+
+  private DomainStatus getStatus(Domain domain) {
+    return Optional.ofNullable(domain.getStatus()).orElse(new DomainStatus());
+  }
+
+  @Override
+  public void describeTo(Description description) {
+    List<String> expectations = new ArrayList<>();
+    if (expectedType != null) expectations.add(expectation("type", expectedType));
+    if (expectedStatus != null) expectations.add(expectation("status", expectedStatus));
+    if (expectedReason != null) expectations.add(expectation("reason", expectedReason));
+    if (expectedMessage != null) expectations.add(expectation("reason", expectedMessage));
+    description
+        .appendText("domain containing condition: ")
+        .appendText(TestUtils.joinListGrammatically(expectations));
+  }
+
+  private String expectation(String description, String value) {
+    return description + " = '" + value + "'";
+  }
+}