[Transform] fix test logic in transform tests (#53002)

fix test logic in transform tests, regression introduced in #52712
elastic · Mar 2, 2020 · 2d7f480 · 2d7f480
1 parent 74b9878
commit 2d7f480
Showing 1 changed file with 17 additions and 17 deletions.
diff --git a/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/TransformTests.java b/x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/TransformTests.java
@@ -17,33 +17,33 @@ public class TransformTests extends ESTestCase {
 
     public void testNodeAttributes() {
         Settings.Builder builder = Settings.builder();
-        boolean transformEnabled = true;
-        boolean remoteEnabled = true;
+        boolean transformEnabled = randomBoolean();
+        boolean transformPluginEnabled = randomBoolean();
+        boolean remoteEnabled = randomBoolean();
 
-        if (randomBoolean()) {
-            transformEnabled = randomBoolean();
-            if (randomBoolean()) {
-                builder.put("node.transform", transformEnabled);
-                if (randomBoolean()) {
-                    // note: the case where node.transform: true and xpack.transform.enabled: false is benign
-                    builder.put("xpack.transform.enabled", randomBoolean());
-                }
-            } else {
-                builder.put("xpack.transform.enabled", transformEnabled);
-            }
+        // randomly use explicit or default setting
+        if ((transformEnabled && randomBoolean()) == false) {
+            builder.put("node.transform", transformEnabled);
         }
 
-        if (randomBoolean()) {
-            remoteEnabled = randomBoolean();
+        // randomly use explicit or default setting
+        if ((remoteEnabled && randomBoolean()) == false) {
             builder.put("cluster.remote.connect", remoteEnabled);
         }
 
+        if (transformPluginEnabled == false) {
+            builder.put("xpack.transform.enabled", transformPluginEnabled);
+        }
+
         builder.put("node.attr.some_other_attrib", "value");
         Transform transform = createTransform(builder.build());
         assertNotNull(transform.additionalSettings());
-        assertEquals(transformEnabled, Boolean.parseBoolean(transform.additionalSettings().get("node.attr.transform.node")));
         assertEquals(
-            transformEnabled && remoteEnabled,
+            transformPluginEnabled && transformEnabled,
+            Boolean.parseBoolean(transform.additionalSettings().get("node.attr.transform.node"))
+        );
+        assertEquals(
+            transformPluginEnabled && remoteEnabled,
             Boolean.parseBoolean(transform.additionalSettings().get("node.attr.transform.remote_connect"))
         );
     }