address comments from Russ

Author: Vince Kraemer

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

@@ -61,13 +61,27 @@ public void whenExportedAccessPointsDifferByAnnotation_objectsAreNotEqual() {
   }
 
   @Test
-  public void nodePortTests() {
+  public void whenNodePortAnnotationsDiffer_objectsAreNotEqual() {
     server1.addNodePortAnnotations("key", "value");
     assertThat(server1, not(equalTo(server2)));
+  }
+
+  @Test
+  public void whenNodePortAnnotationsAreSame_objectsAreEqual() {
+    server1.addNodePortAnnotations("key", "value");
     server2.addNodePortAnnotations("key", "value");
     assertThat(server1, equalTo(server2));
+  }
+
+  @Test
+  public void whenNodePortLabelsDiffer_hashCodesAreNotEqual() {
     server1.addNodePortLabels("key", "value");
     assertThat(server1.hashCode(), not(equalTo(server2.hashCode())));
+  }
+
+  @Test
+  public void whenNodePortLabelsAreSame_hashCodesAreEqual() {
+    server1.addNodePortLabels("key", "value");
     server2.addNodePortLabels("key", "value");
     assertThat(server1.hashCode(), equalTo(server2.hashCode()));
   }

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

@@ -86,13 +86,27 @@ private V1EnvVar env(String name, String value) {
   }
 
   @Test
-  public void serviceLabelAndAnnotation() {
+  public void whenServiceLabelsDiffer_objectsAreNotEqual() {
     instance1.addServiceLabels("key", "value");
     assertThat(instance1, not(equalTo(instance2)));
+  }
+
+  @Test
+  public void whenServiceLabelsDoNotDiffer_objectsAreEqual() {
+    instance1.addServiceLabels("key", "value");
     instance2.addServiceLabels("key", "value");
     assertThat(instance1, equalTo(instance2));
+  }
+
+  @Test
+  public void whenserviceAnnotationsDiffer_hashCodesAreNotEqual() {
     instance1.addServiceAnnotations("key", "value");
     assertThat(instance1.hashCode(), not(equalTo(instance2.hashCode())));
+  }
+
+  @Test
+  public void whenserviceAnnotationsDoNotDiffer_hashCodesAreEqual() {
+    instance1.addServiceAnnotations("key", "value");
     instance2.addServiceAnnotations("key", "value");
     assertThat(instance1.hashCode(), equalTo(instance2.hashCode()));
   }

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

@@ -1105,10 +1105,10 @@ public void whenDomain2ReadFromYaml_AdminServerInheritPodSecurityContextFromDoma
   }
 
   @Test
-  public void whenDomain2ReadFromYaml_serviceLabelsAndAnnotations() throws IOException {
+  public void whenDomain2ReadFromYaml_serviceAnnotationsFound() throws IOException {
     Domain domain = readDomain(DOMAIN_V2_SAMPLE_YAML_2);
     ServerSpec serverSpec = domain.getServer("server2", "cluster1");
-    assertThat(serverSpec.getServiceAnnotations(), hasEntry("e", "f"));
+    assertThat(serverSpec.getServiceAnnotations(), hasEntry("testKey3", "testValue3"));
   }
 
   @Test
@@ -1149,9 +1149,10 @@ public void whenDomain3ReadFromYaml_adminServerHasNodeSelector() throws IOExcept
   @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"));
+    assertThat(
+        domain.getAdminServerSpec().getServiceAnnotations(), hasEntry("testKey3", "testValue3"));
+    assertThat(domain.getAdminServerSpec().getServiceLabels(), hasEntry("testKey1", "testValue1"));
+    assertThat(domain.getAdminServerSpec().getServiceLabels(), hasEntry("testKey2", "testValue2"));
   }
 
   @Test

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

@@ -78,8 +78,8 @@ spec:
         nodeSelector:
           os: linux
         serviceLabels:
-          a: b
-          c: d
+          testKey1: testValue1
+          testKey2: testValue2
         podSecurityContext:
           runAsGroup: 421
           runAsNonRoot: true
@@ -111,8 +111,8 @@ spec:
         nodeSelector:
           os_type: oel7
         serviceAnnotations:
-          a: b
-          e: f
+          testKey3: testValue3
+          testKey4: testValue4
         podSecurityContext:
           runAsGroup: 422
           seLinuxOptions:

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

@@ -33,10 +33,10 @@ spec:
       nodeSelector:
         os: linux
       serviceLabels:
-        a: b
-        c: d
+        testKey1: testValue1
+        testKey2: testValue2
       serviceAnnotations:
-        e: f
+        testKey3: testValue3
         longer: shorter
 
   domainName: base_domain