modify tests

correct docs remove tags disabling auto formatting
elastic · Feb 15, 2018 · 131a05f · 131a05f
1 parent dda7951
commit 131a05f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/...el/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java b/...el/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java
@@ -63,7 +63,6 @@ public void testClusterPutSettings() throws IOException {
         ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
         // end::put-settings-request
 
-        // @formatter:off
         // tag::put-settings-create-settings
         String transientSettingKey = 
                 RecoverySettings.INDICES_RECOVERY_MAX_BYTES_PER_SEC_SETTING.getKey();
@@ -82,41 +81,34 @@ public void testClusterPutSettings() throws IOException {
                 .put(persistentSettingKey, persistentSettingValue)
                 .build(); // <2>
         // end::put-settings-create-settings
-        // @formatter:on
 
         // tag::put-settings-request-cluster-settings
         request.transientSettings(transientSettings); // <1>
         request.persistentSettings(persistentSettings); // <2>
         // end::put-settings-request-cluster-settings
 
         {
-            // @formatter:off
             // tag::put-settings-settings-builder
             Settings.Builder transientSettingsBuilder = 
                     Settings.builder()
                     .put(transientSettingKey, transientSettingValue, ByteSizeUnit.BYTES); 
             request.transientSettings(transientSettingsBuilder); // <1>
             // end::put-settings-settings-builder
-            // @formatter:on
         }
         {
-            // @formatter:off
             // tag::put-settings-settings-map
             Map<String, Object> map = new HashMap<>();
             map.put(transientSettingKey
                     , transientSettingValue + ByteSizeUnit.BYTES.getSuffix());
             request.transientSettings(map); // <1>
             // end::put-settings-settings-map
-            // @formatter:on
         }
         {
-            // @formatter:off
             // tag::put-settings-settings-source
             request.transientSettings(
                     "{\"indices.recovery.max_bytes_per_sec\": \"10b\"}"
                     , XContentType.JSON); // <1>
             // end::put-settings-settings-source
-            // @formatter:on
         }
 
         // tag::put-settings-request-timeout
@@ -159,7 +151,6 @@ public void testClusterUpdateSettingsAsync() throws Exception {
         {
             ClusterUpdateSettingsRequest request = new ClusterUpdateSettingsRequest();
 
-            //@formatter:off
             // tag::put-settings-execute-listener
             ActionListener<ClusterUpdateSettingsResponse> listener = 
                     new ActionListener<ClusterUpdateSettingsResponse>() {
@@ -174,7 +165,6 @@ public void onFailure(Exception e) {
                 }
             };
             // end::put-settings-execute-listener
-            //@formatter:on
 
             // Replace the empty listener by a blocking listener in test
             final CountDownLatch latch = new CountDownLatch(1);

diff --git a/docs/java-rest/high-level/cluster/put_settings.asciidoc b/docs/java-rest/high-level/cluster/put_settings.asciidoc
@@ -1,7 +1,7 @@
 [[java-rest-high-cluster-put-settings]]
 === Cluster Update Settings API
 
-The Cluster Put Settings API allows to update cluster wide settings.
+The Cluster Update Settings API allows to update cluster wide settings.
 
 [[java-rest-high-cluster-put-settings-request]]
 ==== Cluster Update Settings Request

diff --git a/...va/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java b/...va/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java
@@ -24,10 +24,11 @@
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentType;
 import org.elasticsearch.test.ESTestCase;
+import org.elasticsearch.test.XContentTestUtils;
 
 import java.io.IOException;
+import java.util.Collections;
 
-import static org.elasticsearch.test.XContentTestUtils.insertRandomFields;
 import static org.hamcrest.CoreMatchers.equalTo;
 
 public class ClusterUpdateSettingsRequestTests extends ESTestCase {
@@ -47,11 +48,13 @@ private void doFromXContentTestWithRandomFields(boolean addRandomFields) throws
         BytesReference originalBytes = toShuffledXContent(request, xContentType, ToXContent.EMPTY_PARAMS, humanReadable);
 
         if (addRandomFields) {
-            BytesReference mutated = insertRandomFields(xContentType, originalBytes,
-                    p -> p.startsWith("transient") || p.startsWith("persistent"), random());
-            IllegalArgumentException e = expectThrows(IllegalArgumentException.class,
+            String unsupportedField = "unsupported_field";
+            BytesReference mutated = XContentTestUtils.insertIntoXContent(xContentType.xContent(), originalBytes,
+                    Collections.singletonList(""), () -> unsupportedField, () -> randomAlphaOfLengthBetween(3, 10)).bytes();
+            IllegalArgumentException iae = expectThrows(IllegalArgumentException.class,
                     () -> ClusterUpdateSettingsRequest.fromXContent(createParser(xContentType.xContent(), mutated)));
-            assertTrue(e.getMessage().matches("\\[cluster_update_settings_request\\] unknown field \\[\\w*\\], parser not found"));
+            assertThat(iae.getMessage(),
+                    equalTo("[cluster_update_settings_request] unknown field [" + unsupportedField + "], parser not found"));
         } else {
             XContentParser parser = createParser(xContentType.xContent(), originalBytes);
             ClusterUpdateSettingsRequest parsedRequest = ClusterUpdateSettingsRequest.fromXContent(parser);

diff --git a/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java b/test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java
@@ -29,6 +29,7 @@
 import com.carrotsearch.randomizedtesting.generators.RandomPicks;
 import com.carrotsearch.randomizedtesting.generators.RandomStrings;
 import com.carrotsearch.randomizedtesting.rules.TestRuleAdapter;
+
 import org.apache.logging.log4j.Level;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -146,7 +147,6 @@
 import static java.util.Collections.emptyMap;
 import static java.util.Collections.singletonList;
 import static org.elasticsearch.common.util.CollectionUtils.arrayAsArrayList;
-import static org.elasticsearch.test.XContentTestUtils.insertRandomFields;
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.hasItem;

diff --git a/test/framework/src/main/java/org/elasticsearch/test/XContentTestUtils.java b/test/framework/src/main/java/org/elasticsearch/test/XContentTestUtils.java
@@ -286,7 +286,7 @@ static List<String> getInsertPaths(XContentParser parser, Stack<String> currentP
      * {@link ObjectPath}.
      * The key/value arguments can suppliers that either return fixed or random values.
      */
-    static XContentBuilder insertIntoXContent(XContent xContent, BytesReference original, List<String> paths, Supplier<String> key,
+    public static XContentBuilder insertIntoXContent(XContent xContent, BytesReference original, List<String> paths, Supplier<String> key,
             Supplier<Object> value) throws IOException {
         ObjectPath object = ObjectPath.createFromXContent(xContent, original);
         for (String path : paths) {