diff --git a/plugins/analysis-phonetic/pom.xml b/plugins/analysis-phonetic/pom.xml index 316d2ac2e53..c783a91a174 100644 --- a/plugins/analysis-phonetic/pom.xml +++ b/plugins/analysis-phonetic/pom.xml @@ -15,8 +15,9 @@ The Phonetic Analysis plugin integrates phonetic token filter analysis with elasticsearch. - - + analysis_phonetic + false + diff --git a/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml b/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml new file mode 100644 index 00000000000..02d4b315b6e --- /dev/null +++ b/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml @@ -0,0 +1,33 @@ +# Integration tests for Phonetic analysis components +# + + +"Metaphone": + - do: + indices.create: + index: phonetic_sample + body: + settings: + index: + analysis: + analyzer: + my_analyzer: + tokenizer: standard + filter: ["standard", "lowercase", "my_metaphone"] + filter: + my_metaphone: + type: phonetic + encoder: metaphone + replace: false + - do: + indices.analyze: + index: phonetic_sample + analyzer: my_analyzer + text: Joe Bloggs + + - length: { tokens: 4 } + - match: { tokens.0.token: J } + - match: { tokens.1.token: joe } + - match: { tokens.2.token: BLKS } + - match: { tokens.3.token: bloggs } + diff --git a/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml b/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml new file mode 100644 index 00000000000..675847e557e --- /dev/null +++ b/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml @@ -0,0 +1,30 @@ +# Integration tests for Phonetic analysis components +# + + +"Double Metaphone": + - do: + indices.create: + index: phonetic_sample + body: + settings: + index: + analysis: + analyzer: + my_analyzer: + tokenizer: standard + filter: ["standard", "lowercase", "my_metaphone"] + filter: + my_metaphone: + type: phonetic + encoder: double_metaphone + max_code_len: 6 + - do: + indices.analyze: + index: phonetic_sample + analyzer: my_analyzer + text: supercalifragilisticexpialidocious + + - length: { tokens: 1 } + - match: { tokens.0.token: SPRKLF } + diff --git a/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml b/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml new file mode 100644 index 00000000000..015610af172 --- /dev/null +++ b/plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml @@ -0,0 +1,32 @@ +# Integration tests for Phonetic analysis components +# + + +"Double Metaphone": + - do: + indices.create: + index: phonetic_sample + body: + settings: + index: + analysis: + analyzer: + my_analyzer: + tokenizer: standard + filter: ["standard", "lowercase", "beider_morse"] + filter: + beider_morse: + type: phonetic + encoder: beider_morse + rule_type: exact + name_type: ashkenazi + languageset: polish + - do: + indices.analyze: + index: phonetic_sample + analyzer: my_analyzer + text: Szwarc + + - length: { tokens: 1 } + - match: { tokens.0.token: Svarts } + diff --git a/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticRestIT.java b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticRestIT.java new file mode 100644 index 00000000000..f211e23c597 --- /dev/null +++ b/plugins/analysis-phonetic/src/test/java/org/elasticsearch/index/analysis/AnalysisPhoneticRestIT.java @@ -0,0 +1,41 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.index.analysis; + +import com.carrotsearch.randomizedtesting.annotations.Name; +import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.RestTestCandidate; +import org.elasticsearch.test.rest.parser.RestTestParseException; + +import java.io.IOException; + +public class AnalysisPhoneticRestIT extends ElasticsearchRestTestCase { + + public AnalysisPhoneticRestIT(@Name("yaml") RestTestCandidate testCandidate) { + super(testCandidate); + } + + @ParametersFactory + public static Iterable parameters() throws IOException, RestTestParseException { + return ElasticsearchRestTestCase.createParameters(0, 1); + } +} + diff --git a/plugins/cloud-aws/pom.xml b/plugins/cloud-aws/pom.xml index 0483da47f08..e7c8169f370 100644 --- a/plugins/cloud-aws/pom.xml +++ b/plugins/cloud-aws/pom.xml @@ -17,6 +17,8 @@ 1.10.0 1 + cloud_aws + false diff --git a/plugins/cloud-aws/rest-api-spec/test/cloud_aws/10_basic.yaml b/plugins/cloud-aws/rest-api-spec/test/cloud_aws/10_basic.yaml new file mode 100644 index 00000000000..a2c8f882adc --- /dev/null +++ b/plugins/cloud-aws/rest-api-spec/test/cloud_aws/10_basic.yaml @@ -0,0 +1,14 @@ +# Integration tests for Cloud AWS components +# +"Cloud AWS loaded": + - do: + cluster.state: {} + + # Get master node id + - set: { master_node: master } + + - do: + nodes.info: {} + + - match: { nodes.$master.plugins.0.name: cloud-aws } + - match: { nodes.$master.plugins.0.jvm: true } diff --git a/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/CloudAWSRestIT.java b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/CloudAWSRestIT.java new file mode 100644 index 00000000000..d4d99218b01 --- /dev/null +++ b/plugins/cloud-aws/src/test/java/org/elasticsearch/cloud/aws/CloudAWSRestIT.java @@ -0,0 +1,41 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.cloud.aws; + +import com.carrotsearch.randomizedtesting.annotations.Name; +import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.RestTestCandidate; +import org.elasticsearch.test.rest.parser.RestTestParseException; + +import java.io.IOException; + +public class CloudAWSRestIT extends ElasticsearchRestTestCase { + + public CloudAWSRestIT(@Name("yaml") RestTestCandidate testCandidate) { + super(testCandidate); + } + + @ParametersFactory + public static Iterable parameters() throws IOException, RestTestParseException { + return ElasticsearchRestTestCase.createParameters(0, 1); + } +} + diff --git a/plugins/cloud-azure/pom.xml b/plugins/cloud-azure/pom.xml index 7b642278aad..307a726e8d4 100644 --- a/plugins/cloud-azure/pom.xml +++ b/plugins/cloud-azure/pom.xml @@ -28,6 +28,8 @@ governing permissions and limitations under the License. --> 1 + cloud_azure + false diff --git a/plugins/cloud-azure/rest-api-spec/test/cloud_azure/10_basic.yaml b/plugins/cloud-azure/rest-api-spec/test/cloud_azure/10_basic.yaml new file mode 100644 index 00000000000..1abbf2a9162 --- /dev/null +++ b/plugins/cloud-azure/rest-api-spec/test/cloud_azure/10_basic.yaml @@ -0,0 +1,14 @@ +# Integration tests for Cloud Azure components +# +"Cloud Azure loaded": + - do: + cluster.state: {} + + # Get master node id + - set: { master_node: master } + + - do: + nodes.info: {} + + - match: { nodes.$master.plugins.0.name: cloud-azure } + - match: { nodes.$master.plugins.0.jvm: true } diff --git a/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/CloudAzureRestIT.java b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/CloudAzureRestIT.java new file mode 100644 index 00000000000..3a5da94f06d --- /dev/null +++ b/plugins/cloud-azure/src/test/java/org/elasticsearch/cloud/azure/CloudAzureRestIT.java @@ -0,0 +1,41 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.cloud.azure; + +import com.carrotsearch.randomizedtesting.annotations.Name; +import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.RestTestCandidate; +import org.elasticsearch.test.rest.parser.RestTestParseException; + +import java.io.IOException; + +public class CloudAzureRestIT extends ElasticsearchRestTestCase { + + public CloudAzureRestIT(@Name("yaml") RestTestCandidate testCandidate) { + super(testCandidate); + } + + @ParametersFactory + public static Iterable parameters() throws IOException, RestTestParseException { + return ElasticsearchRestTestCase.createParameters(0, 1); + } +} + diff --git a/plugins/cloud-gce/pom.xml b/plugins/cloud-gce/pom.xml index 997281d4217..fc09a2b22cf 100644 --- a/plugins/cloud-gce/pom.xml +++ b/plugins/cloud-gce/pom.xml @@ -31,6 +31,8 @@ governing permissions and limitations under the License. --> warn 1 + cloud_gce + false diff --git a/plugins/cloud-gce/rest-api-spec/test/cloud_gce/10_basic.yaml b/plugins/cloud-gce/rest-api-spec/test/cloud_gce/10_basic.yaml new file mode 100644 index 00000000000..9cff52e6ca3 --- /dev/null +++ b/plugins/cloud-gce/rest-api-spec/test/cloud_gce/10_basic.yaml @@ -0,0 +1,14 @@ +# Integration tests for Cloud GCE components +# +"Cloud GCE loaded": + - do: + cluster.state: {} + + # Get master node id + - set: { master_node: master } + + - do: + nodes.info: {} + + - match: { nodes.$master.plugins.0.name: cloud-gce } + - match: { nodes.$master.plugins.0.jvm: true } diff --git a/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java b/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java new file mode 100644 index 00000000000..0439e129c18 --- /dev/null +++ b/plugins/cloud-gce/src/test/java/org/elasticsearch/cloud/gce/CloudGCERestIT.java @@ -0,0 +1,41 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.cloud.gce; + +import com.carrotsearch.randomizedtesting.annotations.Name; +import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.RestTestCandidate; +import org.elasticsearch.test.rest.parser.RestTestParseException; + +import java.io.IOException; + +public class CloudGCERestIT extends ElasticsearchRestTestCase { + + public CloudGCERestIT(@Name("yaml") RestTestCandidate testCandidate) { + super(testCandidate); + } + + @ParametersFactory + public static Iterable parameters() throws IOException, RestTestParseException { + return ElasticsearchRestTestCase.createParameters(0, 1); + } +} + diff --git a/plugins/lang-javascript/pom.xml b/plugins/lang-javascript/pom.xml index 97ebd3e3ac4..d72585b604c 100644 --- a/plugins/lang-javascript/pom.xml +++ b/plugins/lang-javascript/pom.xml @@ -16,6 +16,8 @@ + lang_javascript + false diff --git a/plugins/lang-javascript/rest-api-spec/test/lang_javascript/10_basic.yaml b/plugins/lang-javascript/rest-api-spec/test/lang_javascript/10_basic.yaml new file mode 100644 index 00000000000..ee77a848c44 --- /dev/null +++ b/plugins/lang-javascript/rest-api-spec/test/lang_javascript/10_basic.yaml @@ -0,0 +1,26 @@ +# Integration tests for Lang JavaScript components +# +setup: + - do: + index: + index: test + type: test + id: 1 + body: { "foo": "aaa" } + - do: + indices.refresh: {} + +--- + +"Lang JavaScript": + - do: + search: + body: + script_fields: + bar: + lang: javascript + script: "doc['foo'].value + x" + params: + x: "bbb" + + - match: { hits.hits.0.fields.bar.0: "aaabbb"} diff --git a/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavaScriptRestIT.java b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavaScriptRestIT.java new file mode 100644 index 00000000000..3bc18af4c77 --- /dev/null +++ b/plugins/lang-javascript/src/test/java/org/elasticsearch/script/javascript/LangJavaScriptRestIT.java @@ -0,0 +1,41 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.script.javascript; + +import com.carrotsearch.randomizedtesting.annotations.Name; +import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.RestTestCandidate; +import org.elasticsearch.test.rest.parser.RestTestParseException; + +import java.io.IOException; + +public class LangJavaScriptRestIT extends ElasticsearchRestTestCase { + + public LangJavaScriptRestIT(@Name("yaml") RestTestCandidate testCandidate) { + super(testCandidate); + } + + @ParametersFactory + public static Iterable parameters() throws IOException, RestTestParseException { + return ElasticsearchRestTestCase.createParameters(0, 1); + } +} + diff --git a/plugins/lang-python/pom.xml b/plugins/lang-python/pom.xml index a8c98d5eeaf..86458279318 100644 --- a/plugins/lang-python/pom.xml +++ b/plugins/lang-python/pom.xml @@ -16,6 +16,8 @@ + lang_python + false diff --git a/plugins/lang-python/rest-api-spec/test/lang_python/10_basic.yaml b/plugins/lang-python/rest-api-spec/test/lang_python/10_basic.yaml new file mode 100644 index 00000000000..ba7b733e806 --- /dev/null +++ b/plugins/lang-python/rest-api-spec/test/lang_python/10_basic.yaml @@ -0,0 +1,26 @@ +# Integration tests for Lang Python components +# +setup: + - do: + index: + index: test + type: test + id: 1 + body: { "foo": "aaa" } + - do: + indices.refresh: {} + +--- + +"Lang Python": + - do: + search: + body: + script_fields: + bar: + lang: python + script: "doc['foo'].value + x" + params: + x: "bbb" + + - match: { hits.hits.0.fields.bar.0: "aaabbb"} diff --git a/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonScriptRestIT.java b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonScriptRestIT.java new file mode 100644 index 00000000000..d9a0bdd8abb --- /dev/null +++ b/plugins/lang-python/src/test/java/org/elasticsearch/script/python/LangPythonScriptRestIT.java @@ -0,0 +1,41 @@ +/* + * Licensed to Elasticsearch under one or more contributor + * license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright + * ownership. Elasticsearch licenses this file to you under + * the Apache License, Version 2.0 (the "License"); you may + * not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + +package org.elasticsearch.script.python; + +import com.carrotsearch.randomizedtesting.annotations.Name; +import com.carrotsearch.randomizedtesting.annotations.ParametersFactory; +import org.elasticsearch.test.rest.ElasticsearchRestTestCase; +import org.elasticsearch.test.rest.RestTestCandidate; +import org.elasticsearch.test.rest.parser.RestTestParseException; + +import java.io.IOException; + +public class LangPythonScriptRestIT extends ElasticsearchRestTestCase { + + public LangPythonScriptRestIT(@Name("yaml") RestTestCandidate testCandidate) { + super(testCandidate); + } + + @ParametersFactory + public static Iterable parameters() throws IOException, RestTestParseException { + return ElasticsearchRestTestCase.createParameters(0, 1); + } +} + diff --git a/plugins/pom.xml b/plugins/pom.xml index 2e261b8187d..262c035e648 100644 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -275,13 +275,16 @@ api/info.json api/cluster.health.json + api/cluster.state.json api/index.json api/search.json api/indices.analyze.json api/indices.create.json api/indices.refresh.json + api/nodes.info.json api/count.json + api/search.json