Update unit tests

Author: lennyphan

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

@@ -218,6 +218,17 @@ public class DomainSpec extends BaseConfiguration {
   @Description("Configuration for the clusters")
   protected Map<String, Cluster> clusters = new HashMap<>();
 
+  /**
+   * Adds a Cluster to the DomainSpec
+   *
+   * @param cluster
+   * @return
+   */
+  public DomainSpec withCluster(Cluster cluster) {
+    clusters.put(cluster.getClusterName(), cluster);
+    return this;
+  }
+
   public AdminServer getOrCreateAdminServer(String adminServerName) {
     if (adminServer != null) return adminServer;
 

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

@@ -5,6 +5,7 @@
 package oracle.kubernetes.operator;
 
 import static oracle.kubernetes.operator.KubernetesConstants.DOMAIN_CONFIG_MAP_NAME;
+import static oracle.kubernetes.operator.KubernetesConstants.INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX;
 import static oracle.kubernetes.operator.LabelConstants.CHANNELNAME_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.CREATEDBYOPERATOR_LABEL;
 import static oracle.kubernetes.operator.LabelConstants.DOMAINUID_LABEL;
@@ -358,6 +359,11 @@ private void createCannedListDomainResponses() {
         .withName(DOMAIN_CONFIG_MAP_NAME)
         .ignoringBody()
         .returning(domainConfigMap);
+    testSupport
+        .createCannedResponse("readConfigMap")
+        .withNamespace(NS)
+        .withName(UID + INTROSPECTOR_CONFIG_MAP_NAME_SUFFIX)
+        .returning(createEmptyConfigMap());
   }
 
   private DomainList createEmptyDomainList() {
@@ -397,7 +403,7 @@ private V1PersistentVolumeClaimList createEmptyPersistentVolumeClaimList() {
   }
 
   @SuppressWarnings("unchecked")
-  // @Test
+  @Test
   public void whenStrandedResourcesExist_removeThem() {
     addServiceResource(UID, NS, "admin");
     addServiceResource(UID, NS, "ms1", "channel1");

operator/src/test/java/oracle/kubernetes/operator/helpers/DomainIntrospectorJobTest.java

@@ -29,11 +29,13 @@
 import oracle.kubernetes.operator.VersionConstants;
 import oracle.kubernetes.operator.work.FiberTestSupport;
 import oracle.kubernetes.operator.work.TerminalStep;
+import oracle.kubernetes.weblogic.domain.v2.Cluster;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
 import org.hamcrest.Matcher;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Test;
 
 @SuppressWarnings({"ConstantConditions, unchecked", "SameParameterValue", "deprecation"})
 public class DomainIntrospectorJobTest {
@@ -155,6 +157,8 @@ private DomainPresenceInfo createDomainPresenceInfo(Domain domain) {
 
   @SuppressWarnings("deprecation")
   private DomainSpec createDomainSpec() {
+    Cluster cluster = new Cluster().withClusterName("cluster-1");
+    cluster.setReplicas(1);
     DomainSpec spec =
         new DomainSpec()
             .withDomainName(DOMAIN_NAME)
@@ -163,6 +167,7 @@ private DomainSpec createDomainSpec() {
             .withAsPort(ADMIN_PORT)
             .withAdminSecret(new V1SecretReference().name(ADMIN_SECRET_NAME))
             .withConfigOverrides(OVERRIDES_CM)
+            .withCluster(cluster)
             .withImage(LATEST_IMAGE);
 
     List<String> overrideSecrets = new ArrayList();
@@ -181,7 +186,7 @@ String getJobDeletedMessageKey() {
     return JOB_DELETED;
   }
 
-  // @Test
+  @Test
   public void whenNoJob_createIt() {
     expectCreateJob(jobWithName(getJobName())).returning(createJobModel());
     expectListPods(NS).returning(createListPods());
@@ -200,7 +205,7 @@ public void whenNoJob_createIt() {
     testSupport.verifyAllDefinedResponsesInvoked();
   }
 
-  // @Test
+  @Test
   public void whenNoJob_retryOnFailure() {
     testSupport.addRetryStrategy(retryStrategy);
     expectCreateJob(jobWithName(getJobName())).failingWithStatus(401);
@@ -213,12 +218,12 @@ public void whenNoJob_retryOnFailure() {
     testSupport.verifyAllDefinedResponsesInvoked();
   }
 
-  // @Test
+  @Test
   public void whenJobCreated_specHasOneContainer() {
     assertThat(getCreatedJob().getSpec().getTemplate().getSpec().getContainers(), hasSize(1));
   }
 
-  // @Test
+  @Test
   public void whenJobCreated_containerHasExpectedVolumeMounts() {
     assertThat(
         getCreatedJobSpecContainer().getVolumeMounts(),
@@ -232,7 +237,7 @@ public void whenJobCreated_containerHasExpectedVolumeMounts() {
   }
 
   @SuppressWarnings("unchecked")
-  // @Test
+  @Test
   public void whenJobCreated_hasPredefinedEnvVariables() {
     assertThat(
         getCreatedJobSpecContainer().getEnv(),