Restructure the create domain/operator tests so they're easier to understand and modify

Author: moreaut

src/test/java/oracle/kubernetes/operator/create/CreateDomainGeneratedFilesBaseTest.java

@@ -7,72 +7,53 @@
 import static oracle.kubernetes.operator.create.KubernetesArtifactUtils.*;
 import static oracle.kubernetes.operator.create.YamlUtils.*;
 import oracle.kubernetes.weblogic.domain.v1.Domain;
-import static org.hamcrest.MatcherAssert.assertThat;
-import org.junit.AfterClass;
 import org.junit.BeforeClass;
-import org.junit.Test;
 
 /**
  * Tests that the all artifacts in the yaml files that create-domain-operator.sh
  * creates are correct when the admin node port is enabled, the t3 channel is enabled,
- * there is no image pull secret, and production mode is enabled
+ * there is an image pull secret, production mode is enabled, and the persistence type
+ * is nfs
  */
-public class CreateDomainGeneratedFilesOptionalFeaturesEnabledTest {
-
-  private static CreateDomainInputs inputs;
-  private static GeneratedDomainYamlFiles generatedFiles;
+public class CreateDomainGeneratedFilesOptionalFeaturesEnabledTest extends CreateDomainGeneratedFilesBaseTest {
 
   @BeforeClass
   public static void setup() throws Exception {
-    inputs =
+    setup(
       CreateDomainInputs.newInputs()
         .exposeAdminNodePort("true")
         .exposeAdminT3Channel("true")
         .imagePullSecretName("test-weblogic-image-pull-secret-name")
         .loadBalancer(LOAD_BALANCER_TRAEFIK)
         .persistenceType(PERSISTENCE_TYPE_NFS)
-        .productionModeEnabled("true");
-    generatedFiles = GeneratedDomainYamlFiles.generateDomainYamlFiles(inputs);
-  }
-
-  @AfterClass
-  public static void tearDown() throws Exception {
-    if (generatedFiles != null) {
-      generatedFiles.remove();
-    }
+        .productionModeEnabled("true")
+    );
   }
 
-  @Test
-  public void generatesCorrect_createWeblogicDomainYaml_createWeblogicDomainJob() throws Exception {
-    V1Job want = generatedFiles.getCreateWeblogicDomainJobYaml().getExpectedBaseCreateWeblogicDomainJob();
-    want.getSpec().getTemplate().getSpec().addImagePullSecretsItem(newLocalObjectReference()
-      .name(inputs.getImagePullSecretName()));
-    assertThat(
-      generatedFiles.getCreateWeblogicDomainJobYaml().getCreateWeblogicDomainJob(),
-      yamlEqualTo(want));
+  @Override
+  protected V1Job getExpectedCreateWeblogicDomainJob() {
+    V1Job expected = super.getExpectedCreateWeblogicDomainJob();
+    expected.getSpec().getTemplate().getSpec().addImagePullSecretsItem(newLocalObjectReference()
+      .name(getInputs().getImagePullSecretName()));
+    return expected;
   }
 
-  @Test
-  public void generatesCorrect_domainCustomResourceYaml_domain() throws Exception {
-    Domain want = generatedFiles.getDomainCustomResourceYaml().getBaseExpectedDomain();
-    want.getSpec().withExportT3Channels(newStringList().addElement("T3Channel"));
+  @Override
+  protected Domain getExpectedDomain() {
+    Domain expected = super.getExpectedDomain();
+    expected.getSpec().withExportT3Channels(newStringList().addElement("T3Channel"));
     // there is only one server startup item in the base domain config - set its node port:
-    want.getSpec().getServerStartup().get(0).withNodePort(Integer.parseInt(inputs.getAdminNodePort()));
-    assertThat(
-      generatedFiles.getDomainCustomResourceYaml().getDomain(),
-      yamlEqualTo(want));
+    expected.getSpec().getServerStartup().get(0).withNodePort(Integer.parseInt(getInputs().getAdminNodePort()));
+    return expected;
   }
 
-  @Test
-  public void generatesCorrect_weblogicDomainPersistentVolumeYaml_weblogicDomainPersistentVolume() throws Exception {
-    V1PersistentVolume want =
-      generatedFiles.getWeblogicDomainPersistentVolumeYaml().getExpectedBaseCreateWeblogicDomainPersistentVolume();
-    want.getSpec()
+  @Override
+  protected V1PersistentVolume getExpectedWeblogicDomainPersistentVolume() {
+    V1PersistentVolume expected = super.getExpectedWeblogicDomainPersistentVolume();
+    expected.getSpec()
       .nfs(newNFSVolumeSource()
-        .server(inputs.getNfsServer())
-        .path(inputs.getPersistencePath()));
-    assertThat(
-      generatedFiles.getWeblogicDomainPersistentVolumeYaml().getWeblogicDomainPersistentVolume(),
-      yamlEqualTo(want));
+        .server(getInputs().getNfsServer())
+        .path(getInputs().getPersistencePath()));
+    return expected;
   }
 }