Kate's comments and fix tests

Signed-off-by: Lukas Kral <[email protected]>

Author: im-konge

cluster-operator/src/test/java/io/strimzi/operator/cluster/operator/assembly/KafkaAssemblyOperatorManualRollingUpdatesTest.java

@@ -349,12 +349,7 @@ public void testManualPodRollingUpdateWithPodSets(VertxTestContext context) {
     }
 
     @Test
-    public void testManualPodRollingUpdateWithPodSetsWithError1(VertxTestContext context) {
-        testManualPodRollingUpdateWithPodSetsWithErrorConditions(context, "", true);
-    }
-
-    @Test
-    public void testManualPodRollingUpdateWithPodSetsWithError3(VertxTestContext context) {
+    public void testManualPodRollingUpdateWithPodSetsWithError(VertxTestContext context) {
         testManualPodRollingUpdateWithPodSetsWithErrorConditions(context, "", false);
     }
 

operator-common/src/main/java/io/strimzi/operator/common/featuregates/FeatureGates.java

@@ -39,7 +39,16 @@ public FeatureGates(String featureGateConfig) {
                 boolean value = '+' == featureGate.charAt(0);
                 featureGate = featureGate.substring(1);
 
-                // TODO: Once we have new FeatureGate, we should add back the switch, as it was here before
+                // TODO: Once we have new FeatureGate, we should add back the switch, example is below
+                // The switch is not implemented here to pass the spotbugs/checkstyle check.
+                // switch (featureGate) {
+                //    case CONTINUE_ON_MANUAL_RU_FAILURE:
+                //        setValueOnlyOnce(continueOnManualRUFailure, value);
+                //        break;
+                //    default:
+                //        throw new InvalidConfigurationException("Unknown feature gate " + featureGate + " found in the configuration");
+                // }
+
                 throw new InvalidConfigurationException("Unknown feature gate " + featureGate + " found in the configuration");
             }
 
@@ -82,8 +91,11 @@ private void setValueOnlyOnce(FeatureGate gate, boolean value) {
 
     @Override
     public String toString() {
-        // TODO: Once we have new FeatureGate, we should add it here
         return "FeatureGates()";
+        // TODO: Once we have new FeatureGate, we should add it here (example below)
+        // return "FeatureGates(" +
+        //                "ContinueReconciliationOnManualRollingUpdateFailure=" + continueOnManualRUFailure.isEnabled() +
+        //                ")";
     }
 
     /**
@@ -106,25 +118,26 @@ public String toEnvironmentVariable()   {
         return String.join(",", gateSettings);
     }
 
-    // TODO: Once we have new FeatureGate, we should implement the equals method (below is example)
-    // @Override
-    // public boolean equals(Object o) {
-    //    if (this == o)  {
-    //        return true;
-    //    } else if (o == null || getClass() != o.getClass()) {
-    //        return false;
-    //    } else {
-    //        FeatureGates other = (FeatureGates) o;
-    //        return Objects.equals(continueOnManualRUFailure, other.continueOnManualRUFailure);
-    //    }
-    //    return true;
-    // }
-
-    // TODO: Once we have new FeatureGate, we should implement the hashCode method (below is example)
-    // @Override
-    // public int hashCode() {
-    //   return Objects.hashCode(continueOnManualRUFailure);
-    // }
+    @Override
+    public boolean equals(Object o) {
+        if (this == o)  {
+            return true;
+        } else if (o == null || getClass() != o.getClass()) {
+            return false;
+        } else {
+            FeatureGates other = (FeatureGates) o;
+            return other instanceof FeatureGates;
+            // TODO: Once we have new FeatureGate, we should implement the equals method (below is example)
+            // return Objects.equals(continueOnManualRUFailure, other.continueOnManualRUFailure);
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return 1;
+       // TODO: Once we have new FeatureGate, we should implement the hashCode method (below is example)
+       // return Objects.hashCode(continueOnManualRUFailure);
+    }
 
     /**
      * Feature gate class represents individual feature fate

operator-common/src/test/java/io/strimzi/operator/common/featuregates/FeatureGatesTest.java

@@ -7,7 +7,6 @@
 import io.strimzi.operator.common.InvalidConfigurationException;
 import io.strimzi.test.annotations.ParallelSuite;
 import io.strimzi.test.annotations.ParallelTest;
-import org.junit.jupiter.api.Disabled;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -52,7 +51,6 @@ public void testAllFeatureGates() {
     }
 
     @ParallelTest
-    @Disabled("Once we add new FeatureGate we should enable this test test.")
     public void testFeatureGatesParsing() {
         // TODO: Once we have new FeatureGate, we should implement the checks as shown below
         // assertThat(new FeatureGates("+ContinueReconciliationOnManualRollingUpdateFailure").continueOnManualRUFailureEnabled(), is(true));
@@ -69,7 +67,6 @@ public void testFeatureGatesParsing() {
     }
 
     @ParallelTest
-    @Disabled("Once we add new FeatureGate we should enable this test suite.")
     public void testFeatureGatesEquals() {
         // TODO: Once we have new FeatureGate, we should implement the checks as shown below
         // FeatureGates fg = new FeatureGates("+ContinueReconciliationOnManualRollingUpdateFailure");
@@ -95,23 +92,20 @@ public void testEmptyFeatureGates() {
     }
 
     @ParallelTest
-    @Disabled("Once we add new FeatureGate we should enable this test suite.")
     public void testDuplicateFeatureGateWithSameValue() {
         // TODO: Once we have new FeatureGate, we should implement the checks as shown below
         // InvalidConfigurationException e = assertThrows(InvalidConfigurationException.class, () -> new FeatureGates("+ContinueReconciliationOnManualRollingUpdateFailure,+ContinueReconciliationOnManualRollingUpdateFailure"));
         // assertThat(e.getMessage(), containsString("Feature gate ContinueReconciliationOnManualRollingUpdateFailure is configured multiple times"));
     }
 
     @ParallelTest
-    @Disabled("Once we add new FeatureGate we should enable this test suite.")
     public void testDuplicateFeatureGateWithDifferentValue() {
         // TODO: Once we have new FeatureGate, we should implement the checks as shown below
         // InvalidConfigurationException e = assertThrows(InvalidConfigurationException.class, () -> new FeatureGates("+ContinueReconciliationOnManualRollingUpdateFailure,"));
         // assertThat(e.getMessage(), containsString("Feature gate ContinueReconciliationOnManualRollingUpdateFailure is configured multiple times"));
     }
 
     @ParallelTest
-    @Disabled("Once we add new FeatureGate we should enable this test suite.")
     public void testMissingSign() {
         // TODO: Once we have new FeatureGate, we should implement the checks as shown below
         // InvalidConfigurationException e = assertThrows(InvalidConfigurationException.class, () -> new FeatureGates("ContinueReconciliationOnManualRollingUpdateFailure"));
@@ -127,5 +121,8 @@ public void testNonExistingGate() {
     @ParallelTest
     public void testEnvironmentVariable()   {
         assertThat(new FeatureGates("").toEnvironmentVariable(), is(""));
+        // TODO: Once we have new FeatureGate, we should implement the checks as shown below
+        // assertThat(new FeatureGates("-ContinueReconciliationOnManualRollingUpdateFailure").toEnvironmentVariable(), is("-ContinueReconciliationOnManualRollingUpdateFailure"));
+        // assertThat(new FeatureGates("+ContinueReconciliationOnManualRollingUpdateFailure").toEnvironmentVariable(), is(""));
     }
 }