Break the code in to BeforeAll, Test and AfterAll blocks (#1590)

* Break the code in to BeforeAll, Test and AfterAll blocks

* remove comments

* add javadoc

Author: sankarpn

new-integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSimpleDomainValidation.java

@@ -23,6 +23,8 @@
 import oracle.weblogic.kubernetes.annotations.Namespaces;
 import oracle.weblogic.kubernetes.annotations.tags.Slow;
 import oracle.weblogic.kubernetes.extensions.LoggedTest;
+import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 
@@ -45,28 +47,35 @@
 @IntegrationTest
 class ItSimpleDomainValidation implements LoggedTest {
 
-  @Test
-  @DisplayName("Create a domain")
-  @Slow
-  public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
+  final String domainUid = "domain1";
+  String namespace;
+  String serviceAccountName;
+  V1ServiceAccount serviceAccount;
+  String pvcName;
+  String pvName;
 
-    final String domainUid = "domain1";
+  /**
+   * Setup for test suite. Creates service account, namespace, and persistent volumes.
+   * @param namespaces injected by Junit extension
+   */
+  @BeforeAll
+  public void setup(@Namespaces(1) List<String> namespaces) {
 
     // get a new unique namespace
     logger.info("Creating unique namespace for Operator");
     assertNotNull(namespaces.get(0), "Namespace list is null");
-    String namespace = namespaces.get(0);
+    namespace = namespaces.get(0);
 
     // Create a service account for the unique namespace
-    final String serviceAccountName = namespace + "-sa";
-    final V1ServiceAccount serviceAccount = assertDoesNotThrow(
+    serviceAccountName = namespace + "-sa";
+    serviceAccount = assertDoesNotThrow(
         () -> Kubernetes.createServiceAccount(new V1ServiceAccount()
             .metadata(new V1ObjectMeta().namespace(namespace).name(serviceAccountName))));
     logger.info("Created service account: {0}", serviceAccount.getMetadata().getName());
 
     // create persistent volume and persistent volume claim
-    final String pvcName = domainUid + "-pvc"; // name of the persistent volume claim
-    final String pvName = domainUid + "-pv"; // name of the persistent volume
+    pvcName = domainUid + "-pvc"; // name of the persistent volume claim
+    pvName = domainUid + "-pv"; // name of the persistent volume
 
     V1PersistentVolumeClaim v1pvc = new V1PersistentVolumeClaim()
         .spec(new V1PersistentVolumeClaimSpec()
@@ -85,7 +94,7 @@ public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
     boolean success = assertDoesNotThrow(
         () -> TestActions.createPersistentVolumeClaim(v1pvc),
         "Persistent volume claim creation failed, "
-            + "look at the above console log messages for failure reason in ApiException responsebody"
+        + "look at the above console log messages for failure reason in ApiException responsebody"
     );
     assertTrue(success, "PersistentVolumeClaim creation failed");
 
@@ -98,7 +107,7 @@ public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
             .persistentVolumeReclaimPolicy("Recycle")
             .hostPath(new V1HostPathVolumeSource()
                 .path(System.getProperty("java.io.tmpdir") + "/" + domainUid + "-persistentVolume")))
-                .metadata(new V1ObjectMetaBuilder()
+        .metadata(new V1ObjectMetaBuilder()
             .withName(pvName)
             .withNamespace(namespace)
             .build()
@@ -107,9 +116,18 @@ public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
     success = assertDoesNotThrow(
         () -> TestActions.createPersistentVolume(v1pv),
         "Persistent volume creation failed, "
-            + "look at the above console log messages for failure reason in ApiException responsebody"
+        + "look at the above console log messages for failure reason in ApiException responsebody"
     );
     assertTrue(success, "PersistentVolume creation failed");
+  }
+
+  /**
+   * Create a simple domain and checks if pods are coming up.
+   */
+  @Test
+  @DisplayName("Create a domain")
+  @Slow
+  public void testCreatingDomain() {
 
     // create the domain CR
     V1ObjectMeta metadata = new V1ObjectMetaBuilder()
@@ -126,10 +144,10 @@ public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
         .kind("Domain")
         .metadata(metadata)
         .spec(domainSpec);
-    success = assertDoesNotThrow(
+    boolean success = assertDoesNotThrow(
         () -> createDomainCustomResource(domain),
         "Domain failed to be created, "
-            + "look at the above console log messages for failure reason in ApiException responsebody"
+        + "look at the above console log messages for failure reason in ApiException responsebody"
     );
     assertTrue(success);
 
@@ -138,17 +156,20 @@ public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
         .and().with().pollInterval(10, SECONDS)
         .conditionEvaluationListener(
             condition -> logger.info(
-                "Waiting for domain to be running (elapsed time {0}ms, remaining time {1}ms)",
+                "Waiting for domain to be running (elapsed time {0} ms, remaining time {1} ms)",
                 condition.getElapsedTimeInMS(),
                 condition.getRemainingTimeInMS()))
         // and here we can set the maximum time we are prepared to wait
         .await().atMost(5, MINUTES)
         // operatorIsRunning() is one of our custom, reusable assertions
         .until(domainExists(domainUid, "v7", namespace));
+  }
 
-    // wait for the admin server pod to exist
-
-    // wait for the managed servers to exist
+  /**
+   * Delete artifacts.
+   */
+  @AfterAll
+  public void cleanup() {
 
     // Delete domain custom resource
     assertTrue(deleteDomainCustomResource(domainUid, namespace), "Domain failed to be deleted, "
@@ -165,7 +186,7 @@ public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
     // Delete the persistent volume claim and persistent volume
     assertTrue(deletePersistentVolumeClaim(pvcName, namespace),
         "Persistent volume claim deletion failed, "
-            + "look at the above console log messages for failure reason in ApiException responsebody");
+        + "look at the above console log messages for failure reason in ApiException responsebody");
 
     assertTrue(deletePersistentVolume(pvName), "Persistent volume deletion failed, "
         + "look at the above console log messages for failure reason in ApiException responsebody");
@@ -175,5 +196,4 @@ public void testCreatingDomain(@Namespaces(1) List<String> namespaces) {
         + "look at the above console log messages for failure reason in ApiException responsebody");
     logger.info("Deleted namespace: {0}", namespace);
   }
-
 }