added some unit tests, including test that read from a domain yaml file

Author: Vince Kraemer

model/src/test/java/oracle/kubernetes/weblogic/domain/v2/AdminServerTest.java

@@ -33,7 +33,7 @@ public void whenExportedAccessPointsAreTheSame_objectsAreEqual() {
         .addAnnotation("annotation1", "value2")
         .addLabel("label1", "value1");
 
-    assertThat(server1, equalTo(server1));
+    assertThat(server1, equalTo(server2));
   }
 
   @Test
@@ -59,4 +59,16 @@ public void whenExportedAccessPointsDifferByAnnotation_objectsAreNotEqual() {
 
     assertThat(server1, not(equalTo(server2)));
   }
+
+  @Test
+  public void nodePortTests() {
+    server1.addNodePortAnnotations("key", "value");
+    assertThat(server1, not(equalTo(server2)));
+    server2.addNodePortAnnotations("key", "value");
+    assertThat(server1, equalTo(server2));
+    server1.addNodePortLabels("key", "value");
+    assertThat(server1.hashCode(), not(equalTo(server2.hashCode())));
+    server2.addNodePortLabels("key", "value");
+    assertThat(server1.hashCode(), equalTo(server2.hashCode()));
+  }
 }

model/src/test/java/oracle/kubernetes/weblogic/domain/v2/BaseConfigurationTestBase.java

@@ -84,4 +84,16 @@ public void whenServerStartPoliciesDiffer_objectsAreNotEqual() {
   private V1EnvVar env(String name, String value) {
     return new V1EnvVar().name(name).value(value);
   }
+
+  @Test
+  public void serviceLabelAndAnnotation() {
+    instance1.addServiceLabels("key", "value");
+    assertThat(instance1, not(equalTo(instance2)));
+    instance2.addServiceLabels("key", "value");
+    assertThat(instance1, equalTo(instance2));
+    instance1.addServiceAnnotations("key", "value");
+    assertThat(instance1.hashCode(), not(equalTo(instance2.hashCode())));
+    instance2.addServiceAnnotations("key", "value");
+    assertThat(instance1.hashCode(), equalTo(instance2.hashCode()));
+  }
 }

model/src/test/java/oracle/kubernetes/weblogic/domain/v2/DomainV2Test.java

@@ -1104,6 +1104,13 @@ public void whenDomain2ReadFromYaml_AdminServerInheritPodSecurityContextFromDoma
     assertThat(asPodSecCtx.getRunAsUser(), nullValue());
   }
 
+  @Test
+  public void whenDomain2ReadFromYaml_serviceLabelsAndAnnotations() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_2);
+    ServerSpec serverSpec = domain.getServer("server2", "cluster1");
+    assertThat(serverSpec.getServiceAnnotations(), hasEntry("e", "f"));
+  }
+
   @Test
   public void whenDomain3ReadFromYaml_PredefinedStorageDefinesClaimName() throws IOException {
     Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_3);
@@ -1139,6 +1146,14 @@ public void whenDomain3ReadFromYaml_adminServerHasNodeSelector() throws IOExcept
     assertThat(domain.getAdminServerSpec().getNodeSelectors(), hasEntry("os", "linux"));
   }
 
+  @Test
+  public void whenDomain3ReadFromYaml_adminServerHasAnnotationsAndLabels() throws IOException {
+    Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_3);
+    assertThat(domain.getAdminServerSpec().getServiceAnnotations(), hasEntry("e", "f"));
+    assertThat(domain.getAdminServerSpec().getServiceLabels(), hasEntry("a", "b"));
+    assertThat(domain.getAdminServerSpec().getServiceLabels(), hasEntry("c", "d"));
+  }
+
   @Test
   public void whenVolumesConfiguredOnMultipleLevels_useCombination() {
     configureDomain(domain)

model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-2.yaml

@@ -77,6 +77,9 @@ spec:
           periodSeconds: 20
         nodeSelector:
           os: linux
+        serviceLabels:
+          a: b
+          c: d
         podSecurityContext:
           runAsGroup: 421
           runAsNonRoot: true
@@ -107,6 +110,9 @@ spec:
           periodSeconds: 18
         nodeSelector:
           os_type: oel7
+        serviceAnnotations:
+          a: b
+          e: f
         podSecurityContext:
           runAsGroup: 422
           seLinuxOptions:

model/src/test/resources/oracle/kubernetes/weblogic/domain/v2/domain-sample-3.yaml

@@ -32,6 +32,12 @@ spec:
     serverPod:
       nodeSelector:
         os: linux
+      serviceLabels:
+        a: b
+        c: d
+      serviceAnnotations:
+        e: f
+        longer: shorter
 
   domainName: base_domain
   # The domainUID must be unique across the entire Kubernetes Cluster.   Each WebLogic Domain must