Merge pull request #1133 from oracle/checkstylefix

OWLS-75458, fixed failing tests

Author: rjeberhard

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

@@ -6,7 +6,6 @@
 
 import java.util.ArrayList;
 import java.util.Map;
-
 import oracle.kubernetes.operator.utils.Domain;
 import oracle.kubernetes.operator.utils.ExecCommand;
 import oracle.kubernetes.operator.utils.ExecResult;
@@ -17,7 +16,6 @@
 import org.junit.Assume;
 import org.junit.BeforeClass;
 import org.junit.FixMethodOrder;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 
@@ -133,17 +131,17 @@ public void testCreateSecondOperatorUsingSameOperatorNsNegativeInstall() throws
     Operator firstoperator = null;
     Operator secondoperator = null;
 
+    logger.info("Creating first operator");
+    firstoperator =
+        new Operator(TestUtils.createOperatorMap(number, true), RestCertType.SELF_SIGNED);
+    firstoperator.callHelmInstall();
+    number = number + 1;
+    oprelease = "op" + number;
+    logger.info(" new value for oprelease" + oprelease);
+    Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, true);
+    operatorMap.replace("namespace", firstoperator.getOperatorMap().get("namespace"));
+    secondoperator = new Operator(operatorMap, false, true, true, RestCertType.SELF_SIGNED);
     try {
-      logger.info("Creating firs toperator");
-      firstoperator =
-          new Operator(TestUtils.createOperatorMap(number, true), RestCertType.SELF_SIGNED);
-      firstoperator.callHelmInstall();
-      number = number + 1;
-      oprelease = "op" + number;
-      logger.info(" new value for oprelease" + oprelease);
-      Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, true);
-      operatorMap.replace("namespace", firstoperator.getOperatorMap().get("namespace"));
-      secondoperator = new Operator(operatorMap, false, true, true, RestCertType.SELF_SIGNED);
       secondoperator.callHelmInstall();
       throw new RuntimeException(
           "FAILURE: Helm installs second operator with same namespace as the first one");
@@ -184,32 +182,29 @@ public void testCreateSecondOperatorUsingSameOperatorNsNegativeInstall() throws
    * @throws Exception exception
    */
   @Test
-  @Ignore
   public void testNotPreCreatedOpNsCreateOperatorNegativeInstall() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     Operator operator = null;
+
+    operator =
+        new Operator(
+            (TestUtils.createOperatorMap(number, false)),
+            true,
+            false,
+            true,
+            RestCertType.SELF_SIGNED);
+    String command = " kubectl delete namespace weblogic-operator" + number;
+    TestUtils.exec(command);
     try {
-      operator =
-          new Operator(
-              (TestUtils.createOperatorMap(number, false)), false, false, true, RestCertType.NONE);
       operator.callHelmInstall();
       throw new RuntimeException("FAILURE: Helm install operator with not preexisted namespace ");
 
     } catch (Exception ex) {
-      String cmdLb = "helm list --failed " + "  | grep " + oprelease;
-      logger.info("Executing cmd " + cmdLb);
-      ExecResult result = ExecCommand.exec(cmdLb);
-      if (result.exitValue() != 0) {
-        throw new RuntimeException(
-            "FAILURE: Helm installs operator with not preexisted namespace ");
-      }
+      logger.info("Helm install operator with not preexisted ns failed as expected");
     } finally {
       number++;
-      if (operator != null) {
-        operator.destroy();
-      }
     }
     logger.info("SUCCESS - " + testMethodName);
   }
@@ -221,16 +216,20 @@ public void testNotPreCreatedOpNsCreateOperatorNegativeInstall() throws Exceptio
    * @throws Exception exception
    */
   @Test
-  @Ignore
   public void testNotPreexistedOpServiceAccountCreateOperatorNegativeInstall() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     Operator operator = null;
+
+    operator =
+        new Operator(
+            (TestUtils.createOperatorMap(number, false)),
+            true,
+            false,
+            true,
+            RestCertType.SELF_SIGNED);
     try {
-      operator =
-          new Operator(
-              (TestUtils.createOperatorMap(number, false)), true, false, true, RestCertType.NONE);
       operator.callHelmInstall();
       throw new RuntimeException(
           "FAILURE: Helm installs operator with not preexisted service account ");
@@ -240,8 +239,7 @@ public void testNotPreexistedOpServiceAccountCreateOperatorNegativeInstall() thr
       logger.info("Executing cmd " + cmdLb);
       ExecResult result = ExecCommand.exec(cmdLb);
       if (result.exitValue() != 0) {
-        throw new RuntimeException(
-            "FAILURE: Helm installs operator with not preexisted service account ");
+        throw new RuntimeException("FAILURE: failed helm is not showed in the failed list ");
       }
       // create operator service account
       String serviceAccount = (String) operator.getOperatorMap().get("serviceAccount");
@@ -279,25 +277,25 @@ public void testNotPreexistedOpServiceAccountCreateOperatorNegativeInstall() thr
    * @throws Exception exception
    */
   @Test
-  @Ignore
   public void testSecondOpSharingSameTargetDomainsNsNegativeInstall() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     Operator secondoperator = null;
     Operator firstoperator = null;
+
+    logger.info("Creating first operator");
+    firstoperator =
+        new Operator(TestUtils.createOperatorMap(number, true), RestCertType.SELF_SIGNED);
+    firstoperator.callHelmInstall();
+    number = number + 1;
+    oprelease = "op" + number;
+    Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, false);
+    ArrayList<String> targetDomainsNS =
+        (ArrayList<String>) firstoperator.getOperatorMap().get("domainNamespaces");
+    operatorMap.put("domainNamespaces", targetDomainsNS);
+    secondoperator = new Operator(operatorMap, true, true, false, RestCertType.SELF_SIGNED);
     try {
-      logger.info("Creating first operator");
-      firstoperator =
-          new Operator(TestUtils.createOperatorMap(number, true), RestCertType.SELF_SIGNED);
-      firstoperator.callHelmInstall();
-      number = number + 1;
-      oprelease = "op" + number;
-      Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, false);
-      ArrayList<String> targetDomainsNS =
-          (ArrayList<String>) firstoperator.getOperatorMap().get("domainNamespaces");
-      operatorMap.put("domainNamespaces", targetDomainsNS);
-      secondoperator = new Operator(operatorMap, true, true, false, RestCertType.NONE);
       secondoperator.callHelmInstall();
       throw new RuntimeException(
           "FAILURE: Helm installs second operator with same as first operator's target domains namespaces ");
@@ -342,20 +340,23 @@ public void testSecondOpSharingSameTargetDomainsNsNegativeInstall() throws Excep
    * @throws Exception exception
    */
   @Test
-  @Ignore
   public void testTargetNsIsNotPreexistedNegativeInstall() throws Exception {
     Assume.assumeFalse(QUICKTEST);
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     Operator operator = null;
+
+    operator =
+        new Operator(
+            TestUtils.createOperatorMap(number, false),
+            true,
+            true,
+            false,
+            RestCertType.SELF_SIGNED);
     try {
-      operator =
-          new Operator(
-              TestUtils.createOperatorMap(number, false), true, true, false, RestCertType.NONE);
       operator.callHelmInstall();
       throw new RuntimeException(
           "FAILURE: Helm install operator with not preexisted target domains namespaces ");
-
     } catch (Exception ex) {
       if (!ex.getMessage()
           .contains(
@@ -401,18 +402,19 @@ public void testSecondOpSharingSameExternalRestPortNegativeInstall() throws Exce
     Operator operator1 = null;
     Operator operator2 = null;
     int httpsRestPort = 0;
-    try {
-      operator1 = new Operator(TestUtils.createOperatorMap(number, true), RestCertType.SELF_SIGNED);
-      operator1.callHelmInstall();
 
-      httpsRestPort = (int) operator1.getOperatorMap().get("externalRestHttpsPort");
-      logger.info("Creating second operator with externalRestHttpPort " + httpsRestPort);
-      number = number + 1;
-      oprelease = "op" + number;
-      Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, true);
-      operatorMap.replace("externalRestHttpsPort", httpsRestPort);
+    operator1 = new Operator(TestUtils.createOperatorMap(number, true), RestCertType.SELF_SIGNED);
+    operator1.callHelmInstall();
+
+    httpsRestPort = (int) operator1.getOperatorMap().get("externalRestHttpsPort");
+    logger.info("Creating second operator with externalRestHttpPort " + httpsRestPort);
+    number = number + 1;
+    oprelease = "op" + number;
+    Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, true);
+    operatorMap.replace("externalRestHttpsPort", httpsRestPort);
 
-      operator2 = new Operator(operatorMap, RestCertType.SELF_SIGNED);
+    operator2 = new Operator(operatorMap, RestCertType.SELF_SIGNED);
+    try {
       operator2.callHelmInstall();
 
       throw new RuntimeException(
@@ -459,12 +461,13 @@ public void testCreateWithUpperCaseTargetDomainNegativeInstall() throws Exceptio
     String testMethodName = new Object() {}.getClass().getEnclosingMethod().getName();
     logTestBegin(testMethodName);
     Operator operator = null;
+
+    Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, true);
+    ArrayList<String> targetDomainsNS = new ArrayList<String>();
+    targetDomainsNS.add("Test9");
+    operatorMap.replace("domainNamespaces", targetDomainsNS);
+    operator = new Operator(operatorMap, RestCertType.SELF_SIGNED);
     try {
-      Map<String, Object> operatorMap = TestUtils.createOperatorMap(number, true);
-      ArrayList<String> targetDomainsNS = new ArrayList<String>();
-      targetDomainsNS.add("Test9");
-      operatorMap.replace("domainNamespaces", targetDomainsNS);
-      operator = new Operator(operatorMap, RestCertType.SELF_SIGNED);
       operator.callHelmInstall();
       throw new RuntimeException(
           "FAILURE: Helm install operator with UpperCase for target domains ");