From 131a05fcdba2806a540324c214d8dab73e0b0dea Mon Sep 17 00:00:00 2001 From: olcbean Date: Thu, 15 Feb 2018 12:14:54 +0100 Subject: [PATCH] modify tests correct docs remove tags disabling auto formatting --- .../documentation/ClusterClientDocumentationIT.java | 10 ---------- .../high-level/cluster/put_settings.asciidoc | 2 +- .../settings/ClusterUpdateSettingsRequestTests.java | 13 ++++++++----- .../java/org/elasticsearch/test/ESTestCase.java | 2 +- .../org/elasticsearch/test/XContentTestUtils.java | 2 +- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java index ef2e0a4825161..e9fc4ec01ba99 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/ClusterClientDocumentationIT.java +++ b/client/rest-high-level/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,7 +81,6 @@ 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> @@ -90,33 +88,27 @@ public void testClusterPutSettings() throws IOException { // 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 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 listener = new ActionListener() { @@ -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 index 27531db72d242..2d9f55c1e9419 100644 --- 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/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java b/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java index 1dceb44e97371..fdca03ebcda4e 100644 --- a/server/src/test/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequestTests.java +++ b/server/src/test/java/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 index 49fd80b50533b..ba8e674674810 100644 --- 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 index 063f05544431c..cd556a9115ad3 100644 --- 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 getInsertPaths(XContentParser parser, Stack currentP * {@link ObjectPath}. * The key/value arguments can suppliers that either return fixed or random values. */ - static XContentBuilder insertIntoXContent(XContent xContent, BytesReference original, List paths, Supplier key, + public static XContentBuilder insertIntoXContent(XContent xContent, BytesReference original, List paths, Supplier key, Supplier value) throws IOException { ObjectPath object = ObjectPath.createFromXContent(xContent, original); for (String path : paths) {