refactor the code

Author: maggiehe00

integration-tests/src/test/java/oracle/kubernetes/operator/ITPodsRestart.java

@@ -4,6 +4,8 @@
 
 package oracle.kubernetes.operator;
 
+import java.nio.file.Files;
+import java.nio.file.Paths;
 import java.util.Map;
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.Operator;
@@ -85,10 +87,10 @@ public void testServerPodsRestartByChangingEnvProperty() throws Exception {
     logTestBegin(testMethodName);
 
     logger.info(
-        "About to testDomainServerPodRestart for Domain: "
+        "About to verifyDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + "  env property: StdoutDebugEnabled=false to StdoutDebugEnabled=true");
-    domain.testDomainServerPodRestart(
+    domain.verifyDomainServerPodRestart(
         "\"-Dweblogic.StdoutDebugEnabled=false\"", "\"-Dweblogic.StdoutDebugEnabled=true\"");
 
     logger.info("SUCCESS - " + testMethodName);
@@ -108,10 +110,10 @@ public void testServerPodsRestartByChangingLogHomeEnabled() throws Exception {
     logTestBegin(testMethodName);
 
     logger.info(
-        "About to testDomainServerPodRestart for Domain: "
+        "About to verifyDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + "  logHomeEnabled: true -->  logHomeEnabled: false");
-    domain.testDomainServerPodRestart("logHomeEnabled: true", "logHomeEnabled: false");
+    domain.verifyDomainServerPodRestart("logHomeEnabled: true", "logHomeEnabled: false");
 
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -130,10 +132,10 @@ public void testServerPodsRestartByChangingImagePullPolicy() throws Exception {
     logTestBegin(testMethodName);
 
     logger.info(
-        "About to testDomainServerPodRestart for Domain: "
+        "About to verifyDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + " imagePullPolicy: IfNotPresent -->  imagePullPolicy: Never ");
-    domain.testDomainServerPodRestart(
+    domain.verifyDomainServerPodRestart(
         "imagePullPolicy: \"IfNotPresent\"", "imagePullPolicy: \"Never\" ");
 
     logger.info("SUCCESS - " + testMethodName);
@@ -153,10 +155,10 @@ public void testServerPodsRestartByChangingIncludeServerOutInPodLog() throws Exc
     logTestBegin(testMethodName);
 
     logger.info(
-        "About to testDomainServerPodRestart for Domain: "
+        "About to verifyDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + "  includeServerOutInPodLog: true -->  includeServerOutInPodLog: false");
-    domain.testDomainServerPodRestart(
+    domain.verifyDomainServerPodRestart(
         "includeServerOutInPodLog: true", "includeServerOutInPodLog: false");
 
     logger.info("SUCCESS - " + testMethodName);
@@ -177,12 +179,12 @@ public void testServerPodsRestartByChangingZImage() throws Exception {
 
     try {
       logger.info(
-          "About to testDomainServerPodRestart for Domain: "
+          "About to verifyDomainServerPodRestart for Domain: "
               + domain.getDomainUid()
               + "  Image property: store/oracle/weblogic:12.2.1.3 to store/oracle/weblogic:duplicate");
 
       TestUtils.exec("docker tag store/oracle/weblogic:12.2.1.3 store/oracle/weblogic:duplicate");
-      domain.testDomainServerPodRestart(
+      domain.verifyDomainServerPodRestart(
           "\"store/oracle/weblogic:12.2.1.3\"", "\"store/oracle/weblogic:duplicate\"");
     } finally {
       TestUtils.exec("docker rmi -f store/oracle/weblogic:duplicate");
@@ -209,18 +211,19 @@ public void testServerPodsRestartByChangingContSecurityContext() throws Exceptio
     // firstly ensure that original domain.yaml doesn't include the property-to-be-added
     String domainFileName =
         BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
-    boolean result = TestUtils.checkFileIncludeProperty("fsGroup: 1000", domainFileName);
+    boolean result =
+        (new String(Files.readAllBytes(Paths.get(domainFileName)))).contains("fsGroup: 1000");
     Assert.assertFalse(result);
 
     // domainYaml: the yaml file name with changed property under resources dir
     String domainYaml = "cont.security.context.domain.yaml";
     logger.info(
-        "About to testDomainServerPodRestart for Domain: "
+        "About to verifyDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + " change container securityContext:\n"
             + " runAsUser: 1000\n"
             + " fsGroup: 1000 ");
-    domain.testDomainServerPodRestart(domainYaml);
+    domain.verifyDomainServerPodRestart(domainYaml);
     domain.findServerPropertyChange("securityContext", "admin-server");
     domain.findServerPropertyChange("securityContext", "managed-server1");
 
@@ -245,19 +248,20 @@ public void testServerPodsRestartByChangingPodSecurityContext() throws Exception
     // firstly ensure that original domain.yaml doesn't include the property-to-be-added
     String domainFileName =
         BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
-    boolean result = TestUtils.checkFileIncludeProperty("fsGroup: 2000", domainFileName);
+    boolean result =
+        (new String(Files.readAllBytes(Paths.get(domainFileName)))).contains("fsGroup: 2000");
     Assert.assertFalse(result);
 
     // domainYaml: the yaml file name with changed property under resources dir
     String domainYaml = "pod.security.context.domain.yaml";
 
     logger.info(
-        "About to testDomainServerPodRestart for Domain: "
+        "About to verifyDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + " change securityContext:\n"
             + "   runAsUser: 1000\n"
             + "   fsGroup: 2000 ");
-    domain.testDomainServerPodRestart(domainYaml);
+    domain.verifyDomainServerPodRestart(domainYaml);
     domain.findServerPropertyChange("fsGroup: 2000", "admin-server");
     domain.findServerPropertyChange("fsGroup: 2000", "managed-server1");
 
@@ -282,18 +286,19 @@ public void testServerPodsRestartByChangingResource() throws Exception {
     // firstly ensure that original domain.yaml doesn't include the property-to-be-addeded
     String domainFileName =
         BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
-    boolean result = TestUtils.checkFileIncludeProperty("cpu: 500m", domainFileName);
+    boolean result =
+        (new String(Files.readAllBytes(Paths.get(domainFileName)))).contains("cpu: 500m");
     Assert.assertFalse(result);
 
     // domainYaml: the yaml file name with changed property under resources dir
     String domainYaml = "resource.domain.yaml";
 
     logger.info(
-        "About to testDomainServerPodRestart for Domain: "
+        "About to verifyDomainServerPodRestart for Domain: "
             + domain.getDomainUid()
             + " change resource:\n"
             + "   cpu: 500m");
-    domain.testDomainServerPodRestart(domainYaml);
+    domain.verifyDomainServerPodRestart(domainYaml);
     domain.findServerPropertyChange("cpu: 500m", "admin-server");
     domain.findServerPropertyChange("cpu: 500m", "managed-server1");
 

integration-tests/src/test/java/oracle/kubernetes/operator/utils/Domain.java

@@ -878,7 +878,7 @@ private void createPV() throws Exception {
    * @param newPropertyString
    * @throws Exception
    */
-  public void testDomainServerPodRestart(String oldPropertyString, String newPropertyString)
+  public void verifyDomainServerPodRestart(String oldPropertyString, String newPropertyString)
       throws Exception {
     logger.info("Inside testDomainServerPodRestart");
     String content =
@@ -949,35 +949,22 @@ public void findServerPropertyChange(String changedProperty, String serverName)
                 + serverName
                 + " -o yaml -n "
                 + domainNS
-                + " > "
-                + outDir
-                + serverName
-                + ".yaml");
+                + "|"
+                + "grep "
+                + "\""
+                + changedProperty
+                + "\"");
     logger.info("kubectl execut with command: " + command.toString());
     TestUtils.exec(command.toString());
 
-    try {
-      String content = new String(Files.readAllBytes(Paths.get(outDir + serverName + ".yaml")));
-      boolean result = content.indexOf(changedProperty) >= 0;
-      logger.info(
-          "Server name: "
-              + serverName
-              + " Search result for "
-              + changedProperty
-              + " is: "
-              + result);
-      if (!result) {
-        throw new Exception(
-            "FAILURE: didn't find the property: "
-                + changedProperty
-                + "in the "
-                + serverName
-                + ".yaml file");
-      }
-    } finally {
-      String cmdString = "rm -rf " + outDir + serverName + ".yaml";
-      TestUtils.exec(cmdString);
+    String result = ((TestUtils.exec(command.toString())).stdout());
+    logger.info(
+        "in the method findServerPropertyChange, " + command.toString() + " return " + result);
+    if (!result.contains(changedProperty)) {
+      throw new Exception(
+          "FAILURE: didn't find the property: " + changedProperty + " for the server" + serverName);
     }
+
     logger.info("Done - findServerPropertyChange");
   }
 
@@ -990,33 +977,39 @@ public void findServerPropertyChange(String changedProperty, String serverName)
    * @throws Exception - IOException when file is copied or errors occurred if the tested server is
    *     not restarted
    */
-  public void testDomainServerPodRestart(String fileNameWithChangedProperty) throws Exception {
+  public void verifyDomainServerPodRestart(String fileNameWithChangedProperty) throws Exception {
     logger.info("Inside testDomainServerPodRestart domainYamlWithChangedProperty");
 
+    String newDomainYamlFile =
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml";
+    String domainYamlFile =
+        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml";
+    String fileWithChangedProperty =
+        BaseTest.getProjectRoot()
+            + "/integration-tests/src/test/resources/"
+            + fileNameWithChangedProperty;
+
     // copy the original domain.yaml to domain_new.yaml
-    TestUtils.copyFile(
-        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml",
-        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml");
+    TestUtils.copyFile(domainYamlFile, newDomainYamlFile);
 
     // append the file with changed property to the end of domain_new.yaml
-    TestUtils.concatFile(
-        BaseTest.getProjectRoot()
-            + "/integration-tests/src/test/resources/"
-            + fileNameWithChangedProperty,
-        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml");
+    Files.write(
+        Paths.get(newDomainYamlFile),
+        Files.readAllBytes(Paths.get(fileWithChangedProperty)),
+        StandardOpenOption.APPEND);
 
     // kubectl apply the new constructed domain_new.yaml
-    TestUtils.kubectlapply(
-        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml");
+    StringBuffer command = new StringBuffer();
+    command.append("kubectl apply  -f ").append(newDomainYamlFile);
+    logger.info("kubectl execut with command: " + command.toString());
+    TestUtils.exec(command.toString());
 
     // verify the servers in the domain are being restarted in a sequence
     verifyAdminServerRestarted();
     verifyManagedServersRestarted();
 
     // make domain.yaml include the new changed property
-    TestUtils.copyFile(
-        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain_new.yaml",
-        BaseTest.getUserProjectsDir() + "/weblogic-domains/" + domainUid + "/domain.yaml");
+    TestUtils.copyFile(newDomainYamlFile, domainYamlFile);
 
     logger.info("Done - testDomainServerPodRestart with domainYamlWithChangedProperty");
   }

integration-tests/src/test/java/oracle/kubernetes/operator/utils/TestUtils.java

@@ -9,7 +9,6 @@
 import java.io.FileInputStream;
 import java.io.FileReader;
 import java.io.FileWriter;
-import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.Paths;
@@ -499,20 +498,6 @@ public static void kubectlexec(String podName, String namespace, String scriptPa
     }
   }
 
-  /**
-   * The method to execute kubectl apply -f yamlFile.
-   *
-   * @param yamlFile - yaml file name
-   * @throws Exception - errors occurred while execute kubectl apply
-   */
-  public static void kubectlapply(String yamlFile) throws Exception {
-
-    StringBuffer command = new StringBuffer();
-    command.append("kubectl apply  -f ").append(yamlFile);
-    logger.info("kubectl execut with command: " + command.toString());
-    exec(command.toString());
-  }
-
   public static int makeOperatorPostRestCall(Operator operator, String url, String jsonObjStr)
       throws Exception {
     return makeOperatorRestCall(operator, url, jsonObjStr);
@@ -1203,53 +1188,4 @@ public static void copyFile(String fromFile, String toFile) throws Exception {
     logger.info("Copying file from  " + fromFile + " to " + toFile);
     Files.copy(new File(fromFile).toPath(), Paths.get(toFile), StandardCopyOption.REPLACE_EXISTING);
   }
-
-  /**
-   * Method to append source file to the end of target file.
-   *
-   * @param sourceFile - source file name
-   * @param targetFile - target file name
-   * @throws Exception - IOException during FileReader or FileWrite close call
-   */
-  public static void concatFile(String sourceFile, String targetFile) throws IOException {
-    FileReader fr = null;
-    FileWriter fw = null;
-    try {
-      fr = new FileReader(sourceFile);
-      fw = new FileWriter(targetFile, true);
-      int c = fr.read();
-      while (c != -1) {
-        fw.write(c);
-        c = fr.read();
-      }
-    } catch (IOException e) {
-      e.printStackTrace();
-    } finally {
-      if (fr != null) {
-        fr.close();
-      }
-      if (fw != null) {
-        fw.close();
-      }
-    }
-  }
-
-  /**
-   * check whether a certain property(String)is included in the file
-   *
-   * @param property
-   * @param fileName
-   * @return result of above checking
-   */
-  public static boolean checkFileIncludeProperty(String property, String fileName) {
-    boolean result = false;
-    try {
-      String content = new String(Files.readAllBytes(Paths.get(fileName)));
-      result = content.indexOf(property) >= 0;
-      logger.info("the result for checkFileIncludeProperty " + fileName + " result: " + result);
-    } catch (IOException e) {
-      e.printStackTrace();
-    }
-    return result;
-  }
 }