From 73aee38d07c9738cb60765750e3a3d9013df438c Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 6 Jul 2020 10:23:00 -0500 Subject: [PATCH 1/7] convert modules to yamlRestTest --- modules/aggs-matrix-stats/build.gradle | 1 + .../matrix/MatrixStatsClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/stats/10_basic.yml | 0 .../resources/rest-api-spec/test/stats/20_empty_bucket.yml | 0 .../rest-api-spec/test/stats/30_single_value_field.yml | 0 .../rest-api-spec/test/stats/40_multi_value_field.yml | 0 modules/analysis-common/build.gradle | 1 + .../common/CommonAnalysisClientYamlTestSuiteIT.java | 0 .../rest-api-spec/test/analysis-common/10_basic.yml | 0 .../rest-api-spec/test/analysis-common/20_analyzers.yml | 0 .../rest-api-spec/test/analysis-common/30_tokenizers.yml | 0 .../rest-api-spec/test/analysis-common/40_token_filters.yml | 0 .../rest-api-spec/test/analysis-common/50_char_filters.yml | 0 .../test/analysis-common/60_analysis_scripting.yml | 0 .../rest-api-spec/test/cluster.stats/10_analysis_stats.yml | 0 .../rest-api-spec/test/indices.analyze/10_analyze.yml | 0 .../rest-api-spec/test/indices.analyze/10_synonyms.yml | 0 .../test/indices/validate_query/10_synonyms.yml | 0 .../resources/rest-api-spec/test/search.query/10_match.yml | 0 .../rest-api-spec/test/search.query/20_ngram_search.yml | 0 .../test/search.query/30_ngram_highligthing.yml | 0 .../rest-api-spec/test/search.query/40_query_string.yml | 0 .../test/search.query/50_queries_with_synonyms.yml | 0 .../rest-api-spec/test/search.query/60_synonym_graph.yml | 0 .../rest-api-spec/test/search.query/70_intervals.yml | 0 .../rest-api-spec/test/search.suggest/20_phrase.yml | 0 .../rest-api-spec/test/search.suggest/30_synonyms.yml | 0 .../rest-api-spec/test/termvectors/10_payloads.yml | 0 modules/geo/build.gradle | 3 ++- .../org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/geo_shape/10_basic.yml | 0 modules/ingest-common/build.gradle | 3 ++- .../ingest/common/IngestCommonClientYamlTestSuiteIT.java | 0 .../test/ingest/100_date_index_name_processor.yml | 0 .../resources/rest-api-spec/test/ingest/10_basic.yml | 0 .../resources/rest-api-spec/test/ingest/110_sort.yml | 0 .../resources/rest-api-spec/test/ingest/120_grok.yml | 0 .../resources/rest-api-spec/test/ingest/130_escape_dot.yml | 0 .../resources/rest-api-spec/test/ingest/140_json.yml | 0 .../resources/rest-api-spec/test/ingest/150_kv.yml | 0 .../resources/rest-api-spec/test/ingest/160_urldecode.yml | 0 .../resources/rest-api-spec/test/ingest/170_version.yml | 0 .../rest-api-spec/test/ingest/180_bytes_processor.yml | 0 .../rest-api-spec/test/ingest/190_script_processor.yml | 0 .../rest-api-spec/test/ingest/200_default_pipeline.yml | 0 .../rest-api-spec/test/ingest/200_dissect_processor.yml | 0 .../resources/rest-api-spec/test/ingest/20_crud.yml | 0 .../rest-api-spec/test/ingest/210_conditional_processor.yml | 0 .../rest-api-spec/test/ingest/210_pipeline_processor.yml | 0 .../rest-api-spec/test/ingest/220_drop_processor.yml | 0 .../rest-api-spec/test/ingest/230_change_target_index.yml | 0 .../rest-api-spec/test/ingest/240_required_pipeline.yml | 0 .../resources/rest-api-spec/test/ingest/250_csv.yml | 0 .../resources/rest-api-spec/test/ingest/260_seq_no.yml | 0 .../rest-api-spec/test/ingest/270_set_processor.yml | 0 .../rest-api-spec/test/ingest/30_date_processor.yml | 0 .../resources/rest-api-spec/test/ingest/40_mutate.yml | 0 .../resources/rest-api-spec/test/ingest/50_on_failure.yml | 0 .../resources/rest-api-spec/test/ingest/60_fail.yml | 0 .../resources/rest-api-spec/test/ingest/70_bulk.yml | 0 .../resources/rest-api-spec/test/ingest/80_foreach.yml | 0 .../resources/rest-api-spec/test/ingest/90_simulate.yml | 0 modules/ingest-geoip/build.gradle | 1 + .../ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/ingest_geoip/10_basic.yml | 0 .../rest-api-spec/test/ingest_geoip/20_geoip_processor.yml | 0 modules/ingest-user-agent/build.gradle | 3 ++- .../useragent/IngestUserAgentClientYamlTestSuiteIT.java | 0 .../rest-api-spec/test/ingest-useragent/10_basic.yml | 0 .../test/ingest-useragent/20_useragent_processor.yml | 0 .../rest-api-spec/test/ingest-useragent/30_custom_regex.yml | 0 modules/lang-expression/build.gradle | 1 + .../expression/LangExpressionClientYamlTestSuiteIT.java | 0 .../rest-api-spec/test/lang_expression/10_basic.yml | 0 .../rest-api-spec/test/lang_expression/20_search.yml | 0 modules/lang-mustache/build.gradle | 1 + .../script/mustache/LangMustacheClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/lang_mustache/10_basic.yml | 0 .../test/lang_mustache/20_render_search_template.yml | 0 .../test/lang_mustache/25_custom_functions.yml | 0 .../rest-api-spec/test/lang_mustache/30_search_template.yml | 0 .../test/lang_mustache/50_multi_search_template.yml | 0 .../rest-api-spec/test/lang_mustache/60_typed_keys.yml | 0 modules/lang-painless/build.gradle | 3 ++- .../painless/LangPainlessClientYamlTestSuiteIT.java | 0 .../rest-api-spec/api/scripts_painless_context.json | 0 .../resources/rest-api-spec/test/painless/100_terms_agg.yml | 0 .../resources/rest-api-spec/test/painless/10_basic.yml | 0 .../rest-api-spec/test/painless/110_script_score_boost.yml | 0 .../resources/rest-api-spec/test/painless/15_update.yml | 0 .../resources/rest-api-spec/test/painless/16_update2.yml | 0 .../rest-api-spec/test/painless/17_update_error.yml | 0 .../rest-api-spec/test/painless/20_scriptfield.yml | 0 .../rest-api-spec/test/painless/25_script_upsert.yml | 0 .../resources/rest-api-spec/test/painless/30_search.yml | 0 .../resources/rest-api-spec/test/painless/40_disabled.yml | 0 .../rest-api-spec/test/painless/50_script_doc_values.yml | 0 .../test/painless/60_script_doc_values_binary.yml | 0 .../test/painless/70_execute_painless_scripts.yml | 0 .../resources/rest-api-spec/test/painless/70_mov_fn_agg.yml | 0 .../rest-api-spec/test/painless/71_context_api.yml | 0 .../rest-api-spec/test/painless/80_script_score.yml | 0 .../test/painless/85_script_score_random_score.yml | 0 .../test/painless/90_interval_query_filter.yml | 0 modules/mapper-extras/build.gradle | 1 + .../index/mapper/MapperExtrasClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/rank_feature/10_basic.yml | 0 .../resources/rest-api-spec/test/rank_features/10_basic.yml | 0 .../resources/rest-api-spec/test/scaled_float/10_basic.yml | 0 .../rest-api-spec/test/search-as-you-type/10_basic.yml | 0 .../test/search-as-you-type/20_highlighting.yml | 0 modules/parent-join/build.gradle | 1 + .../join/ParentChildClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/11_parent_child.yml | 0 .../resources/rest-api-spec/test/20_parent_join.yml | 0 .../resources/rest-api-spec/test/30_inner_hits.yml | 0 modules/percolator/build.gradle | 1 + .../percolator/PercolatorClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/10_basic.yml | 0 modules/rank-eval/build.gradle | 3 ++- .../org/elasticsearch/index/rankeval/RankEvalYamlIT.java | 0 .../resources/rest-api-spec/test/rank_eval/10_basic.yml | 0 .../resources/rest-api-spec/test/rank_eval/20_dcg.yml | 0 .../resources/rest-api-spec/test/rank_eval/30_failures.yml | 0 .../rest-api-spec/test/rank_eval/40_rank_eval_templated.yml | 0 .../rest-api-spec/test/rank_eval/50_data_streams.yml | 0 modules/reindex/build.gradle | 3 ++- .../index/reindex/ReindexClientYamlTestSuiteIT.java | 0 .../rest-api-spec/test/delete_by_query/10_basic.yml | 0 .../rest-api-spec/test/delete_by_query/20_validation.yml | 0 .../rest-api-spec/test/delete_by_query/40_versioning.yml | 0 .../test/delete_by_query/50_wait_for_active_shards.yml | 0 .../rest-api-spec/test/delete_by_query/70_throttle.yml | 0 .../rest-api-spec/test/delete_by_query/80_slices.yml | 0 .../rest-api-spec/test/delete_by_query/90_data_streams.yml | 0 .../resources/rest-api-spec/test/reindex/10_basic.yml | 0 .../resources/rest-api-spec/test/reindex/20_validation.yml | 0 .../rest-api-spec/test/reindex/25_no_auto_create.yml | 0 .../resources/rest-api-spec/test/reindex/30_search.yml | 0 .../rest-api-spec/test/reindex/35_search_failures.yml | 0 .../resources/rest-api-spec/test/reindex/40_versioning.yml | 0 .../resources/rest-api-spec/test/reindex/50_routing.yml | 0 .../test/reindex/60_wait_for_active_shards.yml | 0 .../resources/rest-api-spec/test/reindex/70_throttle.yml | 0 .../resources/rest-api-spec/test/reindex/80_slices.yml | 0 .../resources/rest-api-spec/test/reindex/85_scripting.yml | 0 .../resources/rest-api-spec/test/reindex/90_remote.yml | 0 .../resources/rest-api-spec/test/reindex/95_parent_join.yml | 0 .../rest-api-spec/test/reindex/96_data_streams.yml | 0 .../rest-api-spec/test/update_by_query/10_basic.yml | 0 .../rest-api-spec/test/update_by_query/20_validation.yml | 0 .../rest-api-spec/test/update_by_query/30_new_fields.yml | 0 .../test/update_by_query/35_search_failure.yml | 0 .../rest-api-spec/test/update_by_query/40_versioning.yml | 0 .../rest-api-spec/test/update_by_query/50_consistency.yml | 0 .../rest-api-spec/test/update_by_query/60_throttle.yml | 0 .../rest-api-spec/test/update_by_query/70_slices.yml | 0 .../rest-api-spec/test/update_by_query/80_scripting.yml | 0 .../rest-api-spec/test/update_by_query/90_data_streams.yml | 0 modules/repository-url/build.gradle | 6 +++++- .../url/RepositoryURLClientYamlTestSuiteIT.java | 4 ++-- .../rest-api-spec/test/repository_url/10_basic.yml | 0 .../rest-api-spec/test/repository_url/20_repository.yml | 0 modules/transport-netty4/build.gradle | 1 + .../http/netty4/Netty4ClientYamlTestSuiteIT.java | 0 .../resources/rest-api-spec/test/10_basic.yml | 0 166 files changed, 28 insertions(+), 9 deletions(-) rename modules/aggs-matrix-stats/src/{test => yamlRestTest}/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java (100%) rename modules/aggs-matrix-stats/src/{test => yamlRestTest}/resources/rest-api-spec/test/stats/10_basic.yml (100%) rename modules/aggs-matrix-stats/src/{test => yamlRestTest}/resources/rest-api-spec/test/stats/20_empty_bucket.yml (100%) rename modules/aggs-matrix-stats/src/{test => yamlRestTest}/resources/rest-api-spec/test/stats/30_single_value_field.yml (100%) rename modules/aggs-matrix-stats/src/{test => yamlRestTest}/resources/rest-api-spec/test/stats/40_multi_value_field.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/analysis-common/10_basic.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/analysis-common/20_analyzers.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/analysis-common/40_token_filters.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/analysis-common/50_char_filters.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/analysis-common/60_analysis_scripting.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/indices.analyze/10_analyze.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.query/10_match.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.query/20_ngram_search.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.query/40_query_string.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.query/60_synonym_graph.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.query/70_intervals.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.suggest/20_phrase.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/search.suggest/30_synonyms.yml (100%) rename modules/analysis-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/termvectors/10_payloads.yml (100%) rename modules/geo/src/{test => yamlRestTest}/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java (100%) rename modules/geo/src/{test => yamlRestTest}/resources/rest-api-spec/test/geo_shape/10_basic.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/java/org/elasticsearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/10_basic.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/110_sort.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/120_grok.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/130_escape_dot.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/140_json.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/150_kv.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/160_urldecode.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/170_version.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/180_bytes_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/190_script_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/200_default_pipeline.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/200_dissect_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/20_crud.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/210_conditional_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/220_drop_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/230_change_target_index.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/240_required_pipeline.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/250_csv.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/260_seq_no.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/270_set_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/30_date_processor.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/40_mutate.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/50_on_failure.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/60_fail.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/70_bulk.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/80_foreach.yml (100%) rename modules/ingest-common/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest/90_simulate.yml (100%) rename modules/ingest-geoip/src/{test => yamlRestTest}/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java (100%) rename modules/ingest-geoip/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest_geoip/10_basic.yml (100%) rename modules/ingest-geoip/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml (100%) rename modules/ingest-user-agent/src/{test => yamlRestTest}/java/org/elasticsearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java (100%) rename modules/ingest-user-agent/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest-useragent/10_basic.yml (100%) rename modules/ingest-user-agent/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml (100%) rename modules/ingest-user-agent/src/{test => yamlRestTest}/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml (100%) rename modules/lang-expression/src/{test => yamlRestTest}/java/org/elasticsearch/script/expression/LangExpressionClientYamlTestSuiteIT.java (100%) rename modules/lang-expression/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_expression/10_basic.yml (100%) rename modules/lang-expression/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_expression/20_search.yml (100%) rename modules/lang-mustache/src/{test => yamlRestTest}/java/org/elasticsearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java (100%) rename modules/lang-mustache/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_mustache/10_basic.yml (100%) rename modules/lang-mustache/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml (100%) rename modules/lang-mustache/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yml (100%) rename modules/lang-mustache/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_mustache/30_search_template.yml (100%) rename modules/lang-mustache/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml (100%) rename modules/lang-mustache/src/{test => yamlRestTest}/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/java/org/elasticsearch/painless/LangPainlessClientYamlTestSuiteIT.java (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/api/scripts_painless_context.json (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/100_terms_agg.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/10_basic.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/110_script_score_boost.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/15_update.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/16_update2.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/17_update_error.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/20_scriptfield.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/25_script_upsert.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/30_search.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/40_disabled.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/50_script_doc_values.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/71_context_api.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/80_script_score.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/85_script_score_random_score.yml (100%) rename modules/lang-painless/src/{test => yamlRestTest}/resources/rest-api-spec/test/painless/90_interval_query_filter.yml (100%) rename modules/mapper-extras/src/{test => yamlRestTest}/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java (100%) rename modules/mapper-extras/src/{test => yamlRestTest}/resources/rest-api-spec/test/rank_feature/10_basic.yml (100%) rename modules/mapper-extras/src/{test => yamlRestTest}/resources/rest-api-spec/test/rank_features/10_basic.yml (100%) rename modules/mapper-extras/src/{test => yamlRestTest}/resources/rest-api-spec/test/scaled_float/10_basic.yml (100%) rename modules/mapper-extras/src/{test => yamlRestTest}/resources/rest-api-spec/test/search-as-you-type/10_basic.yml (100%) rename modules/mapper-extras/src/{test => yamlRestTest}/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml (100%) rename modules/parent-join/src/{test => yamlRestTest}/java/org/elasticsearch/join/ParentChildClientYamlTestSuiteIT.java (100%) rename modules/parent-join/src/{test => yamlRestTest}/resources/rest-api-spec/test/11_parent_child.yml (100%) rename modules/parent-join/src/{test => yamlRestTest}/resources/rest-api-spec/test/20_parent_join.yml (100%) rename modules/parent-join/src/{test => yamlRestTest}/resources/rest-api-spec/test/30_inner_hits.yml (100%) rename modules/percolator/src/{test => yamlRestTest}/java/org/elasticsearch/percolator/PercolatorClientYamlTestSuiteIT.java (100%) rename modules/percolator/src/{test => yamlRestTest}/resources/rest-api-spec/test/10_basic.yml (100%) rename modules/rank-eval/src/{test => yamlRestTest}/java/org/elasticsearch/index/rankeval/RankEvalYamlIT.java (100%) rename modules/rank-eval/src/{test => yamlRestTest}/resources/rest-api-spec/test/rank_eval/10_basic.yml (100%) rename modules/rank-eval/src/{test => yamlRestTest}/resources/rest-api-spec/test/rank_eval/20_dcg.yml (100%) rename modules/rank-eval/src/{test => yamlRestTest}/resources/rest-api-spec/test/rank_eval/30_failures.yml (100%) rename modules/rank-eval/src/{test => yamlRestTest}/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml (100%) rename modules/rank-eval/src/{test => yamlRestTest}/resources/rest-api-spec/test/rank_eval/50_data_streams.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/delete_by_query/10_basic.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/delete_by_query/20_validation.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/delete_by_query/40_versioning.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/delete_by_query/70_throttle.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/delete_by_query/80_slices.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/10_basic.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/20_validation.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/25_no_auto_create.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/30_search.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/35_search_failures.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/40_versioning.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/50_routing.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/70_throttle.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/80_slices.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/85_scripting.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/90_remote.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/95_parent_join.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/reindex/96_data_streams.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/10_basic.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/20_validation.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/30_new_fields.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/35_search_failure.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/40_versioning.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/50_consistency.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/60_throttle.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/70_slices.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/80_scripting.yml (100%) rename modules/reindex/src/{test => yamlRestTest}/resources/rest-api-spec/test/update_by_query/90_data_streams.yml (100%) rename modules/repository-url/src/{test => yamlRestTest}/java/org/elasticsearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java (99%) rename modules/repository-url/src/{test => yamlRestTest}/resources/rest-api-spec/test/repository_url/10_basic.yml (100%) rename modules/repository-url/src/{test => yamlRestTest}/resources/rest-api-spec/test/repository_url/20_repository.yml (100%) rename modules/transport-netty4/src/{test => yamlRestTest}/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java (100%) rename modules/transport-netty4/src/{test => yamlRestTest}/resources/rest-api-spec/test/10_basic.yml (100%) diff --git a/modules/aggs-matrix-stats/build.gradle b/modules/aggs-matrix-stats/build.gradle index 2a3bf9b22f0dd..3f8550f633222 100644 --- a/modules/aggs-matrix-stats/build.gradle +++ b/modules/aggs-matrix-stats/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Adds aggregations whose input are a list of numeric fields and output includes a matrix.' diff --git a/modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java b/modules/aggs-matrix-stats/src/yamlRestTest/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java similarity index 100% rename from modules/aggs-matrix-stats/src/test/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java rename to modules/aggs-matrix-stats/src/yamlRestTest/java/org/elasticsearch/search/aggregations/matrix/MatrixStatsClientYamlTestSuiteIT.java diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yml b/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/10_basic.yml similarity index 100% rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/10_basic.yml rename to modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/10_basic.yml diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml b/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/20_empty_bucket.yml similarity index 100% rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/20_empty_bucket.yml rename to modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/20_empty_bucket.yml diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml b/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/30_single_value_field.yml similarity index 100% rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/30_single_value_field.yml rename to modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/30_single_value_field.yml diff --git a/modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml b/modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/40_multi_value_field.yml similarity index 100% rename from modules/aggs-matrix-stats/src/test/resources/rest-api-spec/test/stats/40_multi_value_field.yml rename to modules/aggs-matrix-stats/src/yamlRestTest/resources/rest-api-spec/test/stats/40_multi_value_field.yml diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle index 4af7cf09b4ca7..9cad089776bf8 100644 --- a/modules/analysis-common/build.gradle +++ b/modules/analysis-common/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Adds "built in" analyzers to Elasticsearch.' diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java b/modules/analysis-common/src/yamlRestTest/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java similarity index 100% rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java rename to modules/analysis-common/src/yamlRestTest/java/org/elasticsearch/analysis/common/CommonAnalysisClientYamlTestSuiteIT.java diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/10_basic.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/10_basic.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/10_basic.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/20_analyzers.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/20_analyzers.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/20_analyzers.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/30_tokenizers.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/40_token_filters.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/40_token_filters.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/40_token_filters.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/50_char_filters.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/50_char_filters.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/50_char_filters.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/50_char_filters.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/60_analysis_scripting.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/60_analysis_scripting.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/analysis-common/60_analysis_scripting.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/analysis-common/60_analysis_scripting.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/10_analysis_stats.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/10_analyze.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_analyze.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/10_analyze.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices.analyze/10_synonyms.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/indices/validate_query/10_synonyms.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/10_match.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/10_match.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/10_match.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/20_ngram_search.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/20_ngram_search.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/20_ngram_search.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/20_ngram_search.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/30_ngram_highligthing.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/40_query_string.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/40_query_string.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/40_query_string.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/40_query_string.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/50_queries_with_synonyms.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/60_synonym_graph.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/60_synonym_graph.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/60_synonym_graph.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/60_synonym_graph.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/70_intervals.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.query/70_intervals.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.query/70_intervals.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/20_phrase.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/20_phrase.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/20_phrase.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/20_phrase.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/30_synonyms.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/30_synonyms.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/search.suggest/30_synonyms.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/search.suggest/30_synonyms.yml diff --git a/modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml b/modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/termvectors/10_payloads.yml similarity index 100% rename from modules/analysis-common/src/test/resources/rest-api-spec/test/termvectors/10_payloads.yml rename to modules/analysis-common/src/yamlRestTest/resources/rest-api-spec/test/termvectors/10_payloads.yml diff --git a/modules/geo/build.gradle b/modules/geo/build.gradle index e0f5147df8b90..9de63dea87e47 100644 --- a/modules/geo/build.gradle +++ b/modules/geo/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Placeholder plugin for geospatial features in ES. only registers geo_shape field mapper for now' @@ -24,5 +25,5 @@ esplugin { } artifacts { - restTests(new File(projectDir, "src/test/resources/rest-api-spec/test")) + restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) } diff --git a/modules/geo/src/test/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java b/modules/geo/src/yamlRestTest/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java similarity index 100% rename from modules/geo/src/test/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java rename to modules/geo/src/yamlRestTest/java/org/elasticsearch/geo/GeoClientYamlTestSuiteIT.java diff --git a/modules/geo/src/test/resources/rest-api-spec/test/geo_shape/10_basic.yml b/modules/geo/src/yamlRestTest/resources/rest-api-spec/test/geo_shape/10_basic.yml similarity index 100% rename from modules/geo/src/test/resources/rest-api-spec/test/geo_shape/10_basic.yml rename to modules/geo/src/yamlRestTest/resources/rest-api-spec/test/geo_shape/10_basic.yml diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle index 3026670bb33d4..36caf8ba6c285 100644 --- a/modules/ingest-common/build.gradle +++ b/modules/ingest-common/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Module for ingest processors that do not require additional security permissions or have large dependencies and resources' @@ -36,7 +37,7 @@ restResources { } } -testClusters.integTest { +testClusters.all { // Needed in order to test ingest pipeline templating: // (this is because the integTest node is not using default distribution, but only the minimal number of required modules) module project(':modules:lang-mustache').tasks.bundlePlugin.archiveFile diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java b/modules/ingest-common/src/yamlRestTest/java/org/elasticsearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java similarity index 100% rename from modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java rename to modules/ingest-common/src/yamlRestTest/java/org/elasticsearch/ingest/common/IngestCommonClientYamlTestSuiteIT.java diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/100_date_index_name_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/10_basic.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/10_basic.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/110_sort.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/110_sort.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/110_sort.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/110_sort.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/120_grok.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/120_grok.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/120_grok.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/130_escape_dot.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/130_escape_dot.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/130_escape_dot.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/130_escape_dot.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/140_json.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/140_json.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/140_json.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/140_json.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/150_kv.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/150_kv.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/150_kv.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/150_kv.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/160_urldecode.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/160_urldecode.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/160_urldecode.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/160_urldecode.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/170_version.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/170_version.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/170_version.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/170_version.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/180_bytes_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/180_bytes_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/180_bytes_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/180_bytes_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/190_script_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/190_script_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/190_script_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/200_default_pipeline.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/200_default_pipeline.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/200_default_pipeline.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/200_default_pipeline.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/200_dissect_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/200_dissect_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/200_dissect_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/200_dissect_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/20_crud.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/20_crud.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/20_crud.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/20_crud.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/210_conditional_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_conditional_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/210_conditional_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_conditional_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/210_pipeline_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/220_drop_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/220_drop_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/220_drop_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/220_drop_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/230_change_target_index.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/230_change_target_index.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/230_change_target_index.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/230_change_target_index.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/240_required_pipeline.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/240_required_pipeline.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/240_required_pipeline.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/240_required_pipeline.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/250_csv.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/250_csv.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/250_csv.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/250_csv.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/260_seq_no.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/260_seq_no.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/260_seq_no.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/260_seq_no.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/270_set_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/270_set_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/270_set_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/270_set_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/30_date_processor.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/30_date_processor.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/30_date_processor.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/30_date_processor.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/40_mutate.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/40_mutate.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/40_mutate.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/40_mutate.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/50_on_failure.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/50_on_failure.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/50_on_failure.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/50_on_failure.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/60_fail.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/60_fail.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/60_fail.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/60_fail.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/70_bulk.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/70_bulk.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/70_bulk.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/80_foreach.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/80_foreach.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/80_foreach.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/80_foreach.yml diff --git a/modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/90_simulate.yml b/modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/90_simulate.yml similarity index 100% rename from modules/ingest-common/src/test/resources/rest-api-spec/test/ingest/90_simulate.yml rename to modules/ingest-common/src/yamlRestTest/resources/rest-api-spec/test/ingest/90_simulate.yml diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index 3c86246484219..475b724b85cd0 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -20,6 +20,7 @@ import org.apache.tools.ant.taskdefs.condition.Os apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Ingest processor that uses lookup geo data based on IP adresses using the MaxMind geo database' diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java b/modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java similarity index 100% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java rename to modules/ingest-geoip/src/yamlRestTest/java/org/elasticsearch/ingest/geoip/IngestGeoIpClientYamlTestSuiteIT.java diff --git a/modules/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yml b/modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/10_basic.yml similarity index 100% rename from modules/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/10_basic.yml rename to modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/10_basic.yml diff --git a/modules/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml b/modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml similarity index 100% rename from modules/ingest-geoip/src/test/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml rename to modules/ingest-geoip/src/yamlRestTest/resources/rest-api-spec/test/ingest_geoip/20_geoip_processor.yml diff --git a/modules/ingest-user-agent/build.gradle b/modules/ingest-user-agent/build.gradle index 9b12ab11df7c6..6fba5fb880746 100644 --- a/modules/ingest-user-agent/build.gradle +++ b/modules/ingest-user-agent/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Ingest processor that extracts information from a user agent' @@ -29,6 +30,6 @@ restResources { } } -testClusters.integTest { +testClusters.all { extraConfigFile 'ingest-user-agent/test-regexes.yml', file('src/test/test-regexes.yml') } diff --git a/modules/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java b/modules/ingest-user-agent/src/yamlRestTest/java/org/elasticsearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java similarity index 100% rename from modules/ingest-user-agent/src/test/java/org/elasticsearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java rename to modules/ingest-user-agent/src/yamlRestTest/java/org/elasticsearch/ingest/useragent/IngestUserAgentClientYamlTestSuiteIT.java diff --git a/modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yml b/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/10_basic.yml similarity index 100% rename from modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/10_basic.yml rename to modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/10_basic.yml diff --git a/modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml b/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml similarity index 100% rename from modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml rename to modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/20_useragent_processor.yml diff --git a/modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml b/modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml similarity index 100% rename from modules/ingest-user-agent/src/test/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml rename to modules/ingest-user-agent/src/yamlRestTest/resources/rest-api-spec/test/ingest-useragent/30_custom_regex.yml diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle index 41b31a65fd424..1615943a22558 100644 --- a/modules/lang-expression/build.gradle +++ b/modules/lang-expression/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Lucene expressions integration for Elasticsearch' diff --git a/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/LangExpressionClientYamlTestSuiteIT.java b/modules/lang-expression/src/yamlRestTest/java/org/elasticsearch/script/expression/LangExpressionClientYamlTestSuiteIT.java similarity index 100% rename from modules/lang-expression/src/test/java/org/elasticsearch/script/expression/LangExpressionClientYamlTestSuiteIT.java rename to modules/lang-expression/src/yamlRestTest/java/org/elasticsearch/script/expression/LangExpressionClientYamlTestSuiteIT.java diff --git a/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yml b/modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/10_basic.yml similarity index 100% rename from modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/10_basic.yml rename to modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/10_basic.yml diff --git a/modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yml b/modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/20_search.yml similarity index 100% rename from modules/lang-expression/src/test/resources/rest-api-spec/test/lang_expression/20_search.yml rename to modules/lang-expression/src/yamlRestTest/resources/rest-api-spec/test/lang_expression/20_search.yml diff --git a/modules/lang-mustache/build.gradle b/modules/lang-mustache/build.gradle index fb8e3e4e2db43..662eeedb51fca 100644 --- a/modules/lang-mustache/build.gradle +++ b/modules/lang-mustache/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Mustache scripting integration for Elasticsearch' diff --git a/modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java b/modules/lang-mustache/src/yamlRestTest/java/org/elasticsearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java similarity index 100% rename from modules/lang-mustache/src/test/java/org/elasticsearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java rename to modules/lang-mustache/src/yamlRestTest/java/org/elasticsearch/script/mustache/LangMustacheClientYamlTestSuiteIT.java diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/10_basic.yml similarity index 100% rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/10_basic.yml rename to modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/10_basic.yml diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml similarity index 100% rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml rename to modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/20_render_search_template.yml diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yml similarity index 100% rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yml rename to modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/25_custom_functions.yml diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml similarity index 100% rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/30_search_template.yml rename to modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/30_search_template.yml diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml similarity index 100% rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml rename to modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/50_multi_search_template.yml diff --git a/modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml b/modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml similarity index 100% rename from modules/lang-mustache/src/test/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml rename to modules/lang-mustache/src/yamlRestTest/resources/rest-api-spec/test/lang_mustache/60_typed_keys.yml diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index 03b161e12063a..e3596ecb194de 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -20,13 +20,14 @@ import org.elasticsearch.gradle.testclusters.DefaultTestClustersTask; apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.validate-rest-spec' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'An easy, safe and fast scripting language for Elasticsearch' classname 'org.elasticsearch.painless.PainlessPlugin' } -testClusters.integTest { +testClusters.all { module project(':modules:mapper-extras').tasks.bundlePlugin.archiveFile systemProperty 'es.scripting.update.ctx_in_params', 'false' // TODO: remove this once cname is prepended to transport.publish_address by default in 8.0 diff --git a/modules/lang-painless/src/test/java/org/elasticsearch/painless/LangPainlessClientYamlTestSuiteIT.java b/modules/lang-painless/src/yamlRestTest/java/org/elasticsearch/painless/LangPainlessClientYamlTestSuiteIT.java similarity index 100% rename from modules/lang-painless/src/test/java/org/elasticsearch/painless/LangPainlessClientYamlTestSuiteIT.java rename to modules/lang-painless/src/yamlRestTest/java/org/elasticsearch/painless/LangPainlessClientYamlTestSuiteIT.java diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/api/scripts_painless_context.json b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/api/scripts_painless_context.json similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/api/scripts_painless_context.json rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/api/scripts_painless_context.json diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/100_terms_agg.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/100_terms_agg.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/100_terms_agg.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/100_terms_agg.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/10_basic.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/10_basic.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/10_basic.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/110_script_score_boost.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/110_script_score_boost.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/110_script_score_boost.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/15_update.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/15_update.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/15_update.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/16_update2.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/16_update2.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/16_update2.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/16_update2.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/17_update_error.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/17_update_error.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/17_update_error.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/20_scriptfield.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/20_scriptfield.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/20_scriptfield.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/25_script_upsert.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/25_script_upsert.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/25_script_upsert.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/30_search.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/30_search.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/30_search.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/40_disabled.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/40_disabled.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/40_disabled.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/40_disabled.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/50_script_doc_values.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/50_script_doc_values.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/50_script_doc_values.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/60_script_doc_values_binary.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/70_execute_painless_scripts.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/70_mov_fn_agg.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/71_context_api.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/71_context_api.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/71_context_api.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/71_context_api.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/80_script_score.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/85_script_score_random_score.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/85_script_score_random_score.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/85_script_score_random_score.yml diff --git a/modules/lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml b/modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/90_interval_query_filter.yml similarity index 100% rename from modules/lang-painless/src/test/resources/rest-api-spec/test/painless/90_interval_query_filter.yml rename to modules/lang-painless/src/yamlRestTest/resources/rest-api-spec/test/painless/90_interval_query_filter.yml diff --git a/modules/mapper-extras/build.gradle b/modules/mapper-extras/build.gradle index 903e51100cae0..67e609923f220 100644 --- a/modules/mapper-extras/build.gradle +++ b/modules/mapper-extras/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Adds advanced field mappers' diff --git a/modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java b/modules/mapper-extras/src/yamlRestTest/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java similarity index 100% rename from modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java rename to modules/mapper-extras/src/yamlRestTest/java/org/elasticsearch/index/mapper/MapperExtrasClientYamlTestSuiteIT.java diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/10_basic.yml similarity index 100% rename from modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_feature/10_basic.yml rename to modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_feature/10_basic.yml diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_features/10_basic.yml similarity index 100% rename from modules/mapper-extras/src/test/resources/rest-api-spec/test/rank_features/10_basic.yml rename to modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/rank_features/10_basic.yml diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/scaled_float/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/scaled_float/10_basic.yml similarity index 100% rename from modules/mapper-extras/src/test/resources/rest-api-spec/test/scaled_float/10_basic.yml rename to modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/scaled_float/10_basic.yml diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/10_basic.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml similarity index 100% rename from modules/mapper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/10_basic.yml rename to modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/10_basic.yml diff --git a/modules/mapper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml b/modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml similarity index 100% rename from modules/mapper-extras/src/test/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml rename to modules/mapper-extras/src/yamlRestTest/resources/rest-api-spec/test/search-as-you-type/20_highlighting.yml diff --git a/modules/parent-join/build.gradle b/modules/parent-join/build.gradle index 7dcac989fc23d..6945478feae6d 100644 --- a/modules/parent-join/build.gradle +++ b/modules/parent-join/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'This module adds the support parent-child queries and aggregations' diff --git a/modules/parent-join/src/test/java/org/elasticsearch/join/ParentChildClientYamlTestSuiteIT.java b/modules/parent-join/src/yamlRestTest/java/org/elasticsearch/join/ParentChildClientYamlTestSuiteIT.java similarity index 100% rename from modules/parent-join/src/test/java/org/elasticsearch/join/ParentChildClientYamlTestSuiteIT.java rename to modules/parent-join/src/yamlRestTest/java/org/elasticsearch/join/ParentChildClientYamlTestSuiteIT.java diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml similarity index 100% rename from modules/parent-join/src/test/resources/rest-api-spec/test/11_parent_child.yml rename to modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/11_parent_child.yml diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml similarity index 100% rename from modules/parent-join/src/test/resources/rest-api-spec/test/20_parent_join.yml rename to modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/20_parent_join.yml diff --git a/modules/parent-join/src/test/resources/rest-api-spec/test/30_inner_hits.yml b/modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml similarity index 100% rename from modules/parent-join/src/test/resources/rest-api-spec/test/30_inner_hits.yml rename to modules/parent-join/src/yamlRestTest/resources/rest-api-spec/test/30_inner_hits.yml diff --git a/modules/percolator/build.gradle b/modules/percolator/build.gradle index 917e44fd21572..f3ac0b7233aff 100644 --- a/modules/percolator/build.gradle +++ b/modules/percolator/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Percolator module adds capability to index queries and query these queries by specifying documents' diff --git a/modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorClientYamlTestSuiteIT.java b/modules/percolator/src/yamlRestTest/java/org/elasticsearch/percolator/PercolatorClientYamlTestSuiteIT.java similarity index 100% rename from modules/percolator/src/test/java/org/elasticsearch/percolator/PercolatorClientYamlTestSuiteIT.java rename to modules/percolator/src/yamlRestTest/java/org/elasticsearch/percolator/PercolatorClientYamlTestSuiteIT.java diff --git a/modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml b/modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml similarity index 100% rename from modules/percolator/src/test/resources/rest-api-spec/test/10_basic.yml rename to modules/percolator/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml diff --git a/modules/rank-eval/build.gradle b/modules/rank-eval/build.gradle index e66633b4d3b88..425054964896d 100644 --- a/modules/rank-eval/build.gradle +++ b/modules/rank-eval/build.gradle @@ -17,6 +17,7 @@ * under the License. */ apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'The Rank Eval module adds APIs to evaluate ranking quality.' @@ -29,7 +30,7 @@ restResources { } } -testClusters.integTest { +testClusters.all { // Modules who's integration is explicitly tested in integration tests module project(':modules:lang-mustache').tasks.bundlePlugin.archiveFile } diff --git a/modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalYamlIT.java b/modules/rank-eval/src/yamlRestTest/java/org/elasticsearch/index/rankeval/RankEvalYamlIT.java similarity index 100% rename from modules/rank-eval/src/test/java/org/elasticsearch/index/rankeval/RankEvalYamlIT.java rename to modules/rank-eval/src/yamlRestTest/java/org/elasticsearch/index/rankeval/RankEvalYamlIT.java diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml b/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/10_basic.yml similarity index 100% rename from modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/10_basic.yml rename to modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/10_basic.yml diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml b/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/20_dcg.yml similarity index 100% rename from modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/20_dcg.yml rename to modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/20_dcg.yml diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml b/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/30_failures.yml similarity index 100% rename from modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/30_failures.yml rename to modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/30_failures.yml diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml b/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml similarity index 100% rename from modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml rename to modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/40_rank_eval_templated.yml diff --git a/modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/50_data_streams.yml b/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/50_data_streams.yml similarity index 100% rename from modules/rank-eval/src/test/resources/rest-api-spec/test/rank_eval/50_data_streams.yml rename to modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/50_data_streams.yml diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index 7bc1c66798cb8..682ce102dd94e 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -25,13 +25,14 @@ import org.elasticsearch.gradle.info.BuildParams apply plugin: 'elasticsearch.test-with-dependencies' apply plugin: 'elasticsearch.jdk-download' apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'The Reindex module adds APIs to reindex from one index to another or update documents in place.' classname 'org.elasticsearch.index.reindex.ReindexPlugin' } -testClusters.integTest { +testClusters.all { // Modules who's integration is explicitly tested in integration tests module project(':modules:parent-join').tasks.bundlePlugin.archiveFile module project(':modules:lang-painless').tasks.bundlePlugin.archiveFile diff --git a/modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java b/modules/reindex/src/yamlRestTest/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java similarity index 100% rename from modules/reindex/src/test/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java rename to modules/reindex/src/yamlRestTest/java/org/elasticsearch/index/reindex/ReindexClientYamlTestSuiteIT.java diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/10_basic.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/20_validation.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/20_validation.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/40_versioning.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/40_versioning.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/40_versioning.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/50_wait_for_active_shards.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/70_throttle.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/70_throttle.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/70_throttle.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/70_throttle.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/80_slices.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/80_slices.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/80_slices.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/80_slices.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/10_basic.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/10_basic.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/10_basic.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/20_validation.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/20_validation.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/25_no_auto_create.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/25_no_auto_create.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/25_no_auto_create.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/25_no_auto_create.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/30_search.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/30_search.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/35_search_failures.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/35_search_failures.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/35_search_failures.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/35_search_failures.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/40_versioning.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/40_versioning.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/40_versioning.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/40_versioning.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/50_routing.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/50_routing.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/50_routing.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/50_routing.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/60_wait_for_active_shards.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/70_throttle.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/70_throttle.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/70_throttle.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/70_throttle.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/80_slices.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/80_slices.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/80_slices.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/80_slices.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/85_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/85_scripting.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/85_scripting.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/90_remote.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/90_remote.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/95_parent_join.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/95_parent_join.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/95_parent_join.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/95_parent_join.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/reindex/96_data_streams.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/96_data_streams.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/reindex/96_data_streams.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/96_data_streams.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/10_basic.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/10_basic.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/20_validation.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/30_new_fields.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/30_new_fields.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/30_new_fields.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/35_search_failure.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/35_search_failure.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/35_search_failure.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/35_search_failure.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/40_versioning.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/40_versioning.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/40_versioning.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/50_consistency.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/50_consistency.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/50_consistency.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/50_consistency.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_throttle.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/60_throttle.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/60_throttle.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/60_throttle.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_slices.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/70_slices.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/70_slices.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/70_slices.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/80_scripting.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/80_scripting.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/80_scripting.yml diff --git a/modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/90_data_streams.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_data_streams.yml similarity index 100% rename from modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/90_data_streams.yml rename to modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_data_streams.yml diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle index 9eaf68b7641a2..a5ed084fa8ced 100644 --- a/modules/repository-url/build.gradle +++ b/modules/repository-url/build.gradle @@ -22,6 +22,7 @@ import org.elasticsearch.gradle.info.BuildParams import org.elasticsearch.gradle.test.AntFixture apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' esplugin { description 'Module for URL repository' @@ -48,10 +49,13 @@ task urlFixture(type: AntFixture) { args 'org.elasticsearch.repositories.url.URLFixture', baseDir, "${repositoryDir.absolutePath}" } +yamlRestTest { + dependsOn urlFixture +} integTest { dependsOn urlFixture } -testClusters.integTest { +testClusters.all { // repositoryDir is used by a FS repository to create snapshots setting 'path.repo', "${repositoryDir.absolutePath}", PropertyNormalization.IGNORE_VALUE // repositoryDir is used by two URL repositories to restore snapshots diff --git a/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java b/modules/repository-url/src/yamlRestTest/java/org/elasticsearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java similarity index 99% rename from modules/repository-url/src/test/java/org/elasticsearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java rename to modules/repository-url/src/yamlRestTest/java/org/elasticsearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java index 65d9b87b07d4c..8080238ee7bd3 100644 --- a/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java +++ b/modules/repository-url/src/yamlRestTest/java/org/elasticsearch/repositories/url/RepositoryURLClientYamlTestSuiteIT.java @@ -93,7 +93,7 @@ public void registerRepositories() throws IOException { // Create a URL repository using the file://{path.repo} URL Request createFileRepositoryRequest = new Request("PUT", "/_snapshot/repository-file"); - createFileRepositoryRequest.setEntity(buildRepositorySettings(URLRepository.TYPE, + createFileRepositoryRequest.setEntity(buildRepositorySettings("url", Settings.builder().put("url", pathRepoUri.toString()).build())); Response createFileRepositoryResponse = client().performRequest(createFileRepositoryRequest); assertThat(createFileRepositoryResponse.getStatusLine().getStatusCode(), equalTo(RestStatus.OK.getStatus())); @@ -106,7 +106,7 @@ public void registerRepositories() throws IOException { InetAddress inetAddress = InetAddress.getByName(new URL(allowedUrl).getHost()); if (inetAddress.isAnyLocalAddress() || inetAddress.isLoopbackAddress()) { Request createUrlRepositoryRequest = new Request("PUT", "/_snapshot/repository-url"); - createUrlRepositoryRequest.setEntity(buildRepositorySettings(URLRepository.TYPE, + createUrlRepositoryRequest.setEntity(buildRepositorySettings("url", Settings.builder().put("url", allowedUrl).build())); Response createUrlRepositoryResponse = client().performRequest(createUrlRepositoryRequest); assertThat(createUrlRepositoryResponse.getStatusLine().getStatusCode(), equalTo(RestStatus.OK.getStatus())); diff --git a/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yml b/modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/10_basic.yml similarity index 100% rename from modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/10_basic.yml rename to modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/10_basic.yml diff --git a/modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/20_repository.yml b/modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/20_repository.yml similarity index 100% rename from modules/repository-url/src/test/resources/rest-api-spec/test/repository_url/20_repository.yml rename to modules/repository-url/src/yamlRestTest/resources/rest-api-spec/test/repository_url/20_repository.yml diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index eebbf16064acd..50867a92e41c1 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -22,6 +22,7 @@ import org.elasticsearch.gradle.info.BuildParams import org.elasticsearch.gradle.test.RestIntegTestTask apply plugin: 'elasticsearch.rest-resources' +apply plugin: 'elasticsearch.yaml-rest-test' /* TODOs: diff --git a/modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java b/modules/transport-netty4/src/yamlRestTest/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java similarity index 100% rename from modules/transport-netty4/src/test/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java rename to modules/transport-netty4/src/yamlRestTest/java/org/elasticsearch/http/netty4/Netty4ClientYamlTestSuiteIT.java diff --git a/modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yml b/modules/transport-netty4/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml similarity index 100% rename from modules/transport-netty4/src/test/resources/rest-api-spec/test/10_basic.yml rename to modules/transport-netty4/src/yamlRestTest/resources/rest-api-spec/test/10_basic.yml From 35e7f1ed2277e334ca55cb0bd12c38aa5c3ac5b0 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 6 Jul 2020 14:05:28 -0500 Subject: [PATCH 2/7] fix test names or disable integTest to allow testingConventions to pass --- modules/aggs-matrix-stats/build.gradle | 2 ++ ...s.java => QueryStringWithAnalyzersIT.java} | 2 +- modules/geo/build.gradle | 3 ++ .../java/org/elasticsearch/geo/GeoTests.java | 28 ------------------- ...ava => GeoIpProcessorNonIngestNodeIT.java} | 2 +- modules/ingest-user-agent/build.gradle | 2 ++ ...essionTests.java => MoreExpressionIT.java} | 2 +- ...sionTests.java => StoredExpressionIT.java} | 2 +- modules/lang-painless/build.gradle | 2 ++ modules/percolator/build.gradle | 2 ++ modules/repository-url/build.gradle | 1 + ...reTests.java => URLSnapshotRestoreIT.java} | 2 +- 12 files changed, 17 insertions(+), 33 deletions(-) rename modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/{QueryStringWithAnalyzersTests.java => QueryStringWithAnalyzersIT.java} (98%) delete mode 100644 modules/geo/src/test/java/org/elasticsearch/geo/GeoTests.java rename modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/{GeoIpProcessorNonIngestNodeTests.java => GeoIpProcessorNonIngestNodeIT.java} (99%) rename modules/lang-expression/src/test/java/org/elasticsearch/script/expression/{MoreExpressionTests.java => MoreExpressionIT.java} (99%) rename modules/lang-expression/src/test/java/org/elasticsearch/script/expression/{StoredExpressionTests.java => StoredExpressionIT.java} (98%) rename modules/repository-url/src/test/java/org/elasticsearch/repositories/url/{URLSnapshotRestoreTests.java => URLSnapshotRestoreIT.java} (98%) diff --git a/modules/aggs-matrix-stats/build.gradle b/modules/aggs-matrix-stats/build.gradle index 3f8550f633222..75bee17764483 100644 --- a/modules/aggs-matrix-stats/build.gradle +++ b/modules/aggs-matrix-stats/build.gradle @@ -29,3 +29,5 @@ restResources { includeCore '_common', 'indices', 'cluster', 'index', 'search', 'nodes' } } + +integTest.enabled = false diff --git a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersTests.java b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java similarity index 98% rename from modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersTests.java rename to modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java index 215bf3e9f0f2c..48554fe3d26bb 100644 --- a/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersTests.java +++ b/modules/analysis-common/src/test/java/org/elasticsearch/analysis/common/QueryStringWithAnalyzersIT.java @@ -32,7 +32,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertHitCount; -public class QueryStringWithAnalyzersTests extends ESIntegTestCase { +public class QueryStringWithAnalyzersIT extends ESIntegTestCase { @Override protected Collection> nodePlugins() { return Arrays.asList(CommonAnalysisPlugin.class); diff --git a/modules/geo/build.gradle b/modules/geo/build.gradle index 9de63dea87e47..c927711facde5 100644 --- a/modules/geo/build.gradle +++ b/modules/geo/build.gradle @@ -27,3 +27,6 @@ esplugin { artifacts { restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) } + +integTest.enabled = false +test.enabled = false diff --git a/modules/geo/src/test/java/org/elasticsearch/geo/GeoTests.java b/modules/geo/src/test/java/org/elasticsearch/geo/GeoTests.java deleted file mode 100644 index 056b485393082..0000000000000 --- a/modules/geo/src/test/java/org/elasticsearch/geo/GeoTests.java +++ /dev/null @@ -1,28 +0,0 @@ -/* - * 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.geo; - -import org.elasticsearch.test.ESTestCase; - -public class GeoTests extends ESTestCase { - - public void testStub() { - // the build expects unit tests to exist in a module, so here one is. - } -} diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeTests.java b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java similarity index 99% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeTests.java rename to modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java index c79fdce16f346..d9e11c2090a16 100644 --- a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeTests.java +++ b/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java @@ -50,7 +50,7 @@ import static org.elasticsearch.test.hamcrest.ElasticsearchAssertions.assertAcked; import static org.hamcrest.Matchers.equalTo; -public class GeoIpProcessorNonIngestNodeTests extends ESIntegTestCase { +public class GeoIpProcessorNonIngestNodeIT extends ESIntegTestCase { public static class IngestGeoIpSettingsPlugin extends Plugin { diff --git a/modules/ingest-user-agent/build.gradle b/modules/ingest-user-agent/build.gradle index 6fba5fb880746..a75a3f7fd91a0 100644 --- a/modules/ingest-user-agent/build.gradle +++ b/modules/ingest-user-agent/build.gradle @@ -33,3 +33,5 @@ restResources { testClusters.all { extraConfigFile 'ingest-user-agent/test-regexes.yml', file('src/test/test-regexes.yml') } + +integTest.enabled = false diff --git a/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionTests.java b/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionIT.java similarity index 99% rename from modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionTests.java rename to modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionIT.java index 09802d5ec3f2c..294576c1c8230 100644 --- a/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionTests.java +++ b/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionIT.java @@ -61,7 +61,7 @@ import static org.hamcrest.Matchers.notNullValue; // TODO: please convert to unit tests! -public class MoreExpressionTests extends ESIntegTestCase { +public class MoreExpressionIT extends ESIntegTestCase { @Override protected Collection> nodePlugins() { diff --git a/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionTests.java b/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionIT.java similarity index 98% rename from modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionTests.java rename to modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionIT.java index a9c80466a7a50..8857418a759b8 100644 --- a/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionTests.java +++ b/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionIT.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.containsString; //TODO: please convert to unit tests! -public class StoredExpressionTests extends ESIntegTestCase { +public class StoredExpressionIT extends ESIntegTestCase { @Override protected Settings nodeSettings(int nodeOrdinal) { Settings.Builder builder = Settings.builder().put(super.nodeSettings(nodeOrdinal)); diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index e3596ecb194de..827fac6b4b25c 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -55,6 +55,8 @@ restResources { } } +integTest.enabled = false + test { // in WhenThingsGoWrongTests we intentionally generate an out of memory error, this prevents the heap from being dumped to disk jvmArgs '-XX:-OmitStackTraceInFastThrow', '-XX:-HeapDumpOnOutOfMemoryError' diff --git a/modules/percolator/build.gradle b/modules/percolator/build.gradle index f3ac0b7233aff..d7ee1ff12810c 100644 --- a/modules/percolator/build.gradle +++ b/modules/percolator/build.gradle @@ -46,3 +46,5 @@ restResources { includeCore '_common', 'indices', 'index', 'search', 'msearch' } } + +integTest.enabled = false diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle index a5ed084fa8ced..f5f23e56c29d0 100644 --- a/modules/repository-url/build.gradle +++ b/modules/repository-url/build.gradle @@ -63,3 +63,4 @@ testClusters.all { "http://snapshot.test*,http://${urlFixture.addressAndPort}" }, PropertyNormalization.IGNORE_VALUE } + diff --git a/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreTests.java b/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java similarity index 98% rename from modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreTests.java rename to modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java index 2cc1d0992fafc..2dde97a1884e4 100644 --- a/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreTests.java +++ b/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java @@ -42,7 +42,7 @@ import static org.hamcrest.Matchers.notNullValue; @ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST) -public class URLSnapshotRestoreTests extends ESIntegTestCase { +public class URLSnapshotRestoreIT extends ESIntegTestCase { @Override protected Collection> nodePlugins() { From 6c1eccf01529f45ce7321fa90b66a2ebd9f6ad51 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 6 Jul 2020 14:23:07 -0500 Subject: [PATCH 3/7] configure restresources for geo --- modules/geo/build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/modules/geo/build.gradle b/modules/geo/build.gradle index c927711facde5..3c2e379483982 100644 --- a/modules/geo/build.gradle +++ b/modules/geo/build.gradle @@ -24,6 +24,11 @@ esplugin { classname 'org.elasticsearch.geo.GeoPlugin' } +restResources { + restApi { + includeCore '_common', 'indices', 'index', 'search' + } +} artifacts { restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) } From 35d04173941c5796e509f2872c1aca8174d456c3 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Wed, 8 Jul 2020 14:29:35 -0500 Subject: [PATCH 4/7] move test over to internalClusterTest --- modules/ingest-geoip/build.gradle | 3 +++ .../ingest/geoip/GeoIpProcessorNonIngestNodeIT.java | 0 2 files changed, 3 insertions(+) rename modules/ingest-geoip/src/{test => internalClusterTest}/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java (100%) diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index 475b724b85cd0..3ac4357d1c8d8 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -21,6 +21,7 @@ import org.apache.tools.ant.taskdefs.condition.Os apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' +apply plugin: 'elasticsearch.internal-cluster-test' esplugin { description 'Ingest processor that uses lookup geo data based on IP adresses using the MaxMind geo database' @@ -43,6 +44,8 @@ restResources { } } +integTest.enabled = false + task copyDefaultGeoIp2DatabaseFiles(type: Copy) { from { zipTree(configurations.testCompileClasspath.files.find { it.name.contains('geolite2-databases') }) } into "${project.buildDir}/ingest-geoip" diff --git a/modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java b/modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java similarity index 100% rename from modules/ingest-geoip/src/test/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java rename to modules/ingest-geoip/src/internalClusterTest/java/org/elasticsearch/ingest/geoip/GeoIpProcessorNonIngestNodeIT.java From 3125782c0af1939cc0a6ff05755630b42dbac6d0 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Wed, 8 Jul 2020 16:19:50 -0500 Subject: [PATCH 5/7] move more over to internalClusterTest --- modules/lang-expression/build.gradle | 3 +++ .../elasticsearch/script/expression/MoreExpressionIT.java | 0 .../script/expression/StoredExpressionIT.java | 0 modules/repository-url/build.gradle | 8 ++++++-- .../repositories/url/URLSnapshotRestoreIT.java | 0 5 files changed, 9 insertions(+), 2 deletions(-) rename modules/lang-expression/src/{test => internalClusterTest}/java/org/elasticsearch/script/expression/MoreExpressionIT.java (100%) rename modules/lang-expression/src/{test => internalClusterTest}/java/org/elasticsearch/script/expression/StoredExpressionIT.java (100%) rename modules/repository-url/src/{test => internalClusterTest}/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java (100%) diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle index 1615943a22558..0a16d444170f9 100644 --- a/modules/lang-expression/build.gradle +++ b/modules/lang-expression/build.gradle @@ -18,6 +18,7 @@ */ apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' +apply plugin: 'elasticsearch.internal-cluster-test' esplugin { description 'Lucene expressions integration for Elasticsearch' @@ -37,6 +38,8 @@ restResources { } } +integTest.enabled = false + tasks.named("dependencyLicenses").configure { mapping from: /lucene-.*/, to: 'lucene' mapping from: /asm-.*/, to: 'asm' diff --git a/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/MoreExpressionIT.java similarity index 100% rename from modules/lang-expression/src/test/java/org/elasticsearch/script/expression/MoreExpressionIT.java rename to modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/MoreExpressionIT.java diff --git a/modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionIT.java b/modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/StoredExpressionIT.java similarity index 100% rename from modules/lang-expression/src/test/java/org/elasticsearch/script/expression/StoredExpressionIT.java rename to modules/lang-expression/src/internalClusterTest/java/org/elasticsearch/script/expression/StoredExpressionIT.java diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle index f5f23e56c29d0..b03043e85c55b 100644 --- a/modules/repository-url/build.gradle +++ b/modules/repository-url/build.gradle @@ -23,6 +23,8 @@ import org.elasticsearch.gradle.test.AntFixture apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' +apply plugin: 'elasticsearch.internal-cluster-test' + esplugin { description 'Module for URL repository' @@ -35,6 +37,8 @@ restResources { } } +integTest.enabled = false + // This directory is shared between two URL repositories and one FS repository in YAML integration tests File repositoryDir = new File(project.buildDir, "shared-repository") @@ -48,11 +52,11 @@ task urlFixture(type: AntFixture) { executable = "${BuildParams.runtimeJavaHome}/bin/java" args 'org.elasticsearch.repositories.url.URLFixture', baseDir, "${repositoryDir.absolutePath}" } - yamlRestTest { dependsOn urlFixture } -integTest { + +internalClusterTest { dependsOn urlFixture } testClusters.all { diff --git a/modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java b/modules/repository-url/src/internalClusterTest/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java similarity index 100% rename from modules/repository-url/src/test/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java rename to modules/repository-url/src/internalClusterTest/java/org/elasticsearch/repositories/url/URLSnapshotRestoreIT.java From 0c5ecce369470b7c2d846d61c99d5038b614d8b3 Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Sat, 11 Jul 2020 11:04:17 -0500 Subject: [PATCH 6/7] review changes --- modules/aggs-matrix-stats/build.gradle | 1 - modules/analysis-common/build.gradle | 1 - modules/geo/build.gradle | 3 +-- modules/ingest-common/build.gradle | 1 - modules/ingest-geoip/build.gradle | 1 - modules/ingest-user-agent/build.gradle | 1 - modules/lang-expression/build.gradle | 1 - modules/lang-mustache/build.gradle | 1 - modules/lang-painless/build.gradle | 1 - modules/mapper-extras/build.gradle | 1 - modules/parent-join/build.gradle | 1 - modules/percolator/build.gradle | 1 - modules/rank-eval/build.gradle | 1 - modules/reindex/build.gradle | 1 - modules/repository-url/build.gradle | 1 - modules/transport-netty4/build.gradle | 1 - 16 files changed, 1 insertion(+), 17 deletions(-) diff --git a/modules/aggs-matrix-stats/build.gradle b/modules/aggs-matrix-stats/build.gradle index 75bee17764483..aad781fb2cacd 100644 --- a/modules/aggs-matrix-stats/build.gradle +++ b/modules/aggs-matrix-stats/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/analysis-common/build.gradle b/modules/analysis-common/build.gradle index 9cad089776bf8..f631aa725d017 100644 --- a/modules/analysis-common/build.gradle +++ b/modules/analysis-common/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/geo/build.gradle b/modules/geo/build.gradle index 3c2e379483982..c089b395df062 100644 --- a/modules/geo/build.gradle +++ b/modules/geo/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { @@ -30,7 +29,7 @@ restResources { } } artifacts { - restTests(new File(projectDir, "src/yamlRestTest/resources/rest-api-spec/test")) + restTests(project.file('src/yamlRestTest/resources/rest-api-spec/test')) } integTest.enabled = false diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle index 36caf8ba6c285..2edf77c0c972c 100644 --- a/modules/ingest-common/build.gradle +++ b/modules/ingest-common/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/ingest-geoip/build.gradle b/modules/ingest-geoip/build.gradle index 3ac4357d1c8d8..f0525a05d6f9d 100644 --- a/modules/ingest-geoip/build.gradle +++ b/modules/ingest-geoip/build.gradle @@ -19,7 +19,6 @@ import org.apache.tools.ant.taskdefs.condition.Os -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.internal-cluster-test' diff --git a/modules/ingest-user-agent/build.gradle b/modules/ingest-user-agent/build.gradle index a75a3f7fd91a0..3d38ea9999574 100644 --- a/modules/ingest-user-agent/build.gradle +++ b/modules/ingest-user-agent/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/lang-expression/build.gradle b/modules/lang-expression/build.gradle index 0a16d444170f9..3b8c42fea93e6 100644 --- a/modules/lang-expression/build.gradle +++ b/modules/lang-expression/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.internal-cluster-test' diff --git a/modules/lang-mustache/build.gradle b/modules/lang-mustache/build.gradle index 662eeedb51fca..afa582bec966a 100644 --- a/modules/lang-mustache/build.gradle +++ b/modules/lang-mustache/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/lang-painless/build.gradle b/modules/lang-painless/build.gradle index 92d945c535e32..a8e8147108779 100644 --- a/modules/lang-painless/build.gradle +++ b/modules/lang-painless/build.gradle @@ -18,7 +18,6 @@ */ import org.elasticsearch.gradle.testclusters.DefaultTestClustersTask; -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.validate-rest-spec' apply plugin: 'elasticsearch.yaml-rest-test' diff --git a/modules/mapper-extras/build.gradle b/modules/mapper-extras/build.gradle index 67e609923f220..fc60820b33398 100644 --- a/modules/mapper-extras/build.gradle +++ b/modules/mapper-extras/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/parent-join/build.gradle b/modules/parent-join/build.gradle index 6945478feae6d..d5ce578c8189f 100644 --- a/modules/parent-join/build.gradle +++ b/modules/parent-join/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/percolator/build.gradle b/modules/percolator/build.gradle index d7ee1ff12810c..ce1e68025a044 100644 --- a/modules/percolator/build.gradle +++ b/modules/percolator/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/rank-eval/build.gradle b/modules/rank-eval/build.gradle index 425054964896d..2bf54796abf2d 100644 --- a/modules/rank-eval/build.gradle +++ b/modules/rank-eval/build.gradle @@ -16,7 +16,6 @@ * specific language governing permissions and limitations * under the License. */ -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/reindex/build.gradle b/modules/reindex/build.gradle index 682ce102dd94e..3d5d745255293 100644 --- a/modules/reindex/build.gradle +++ b/modules/reindex/build.gradle @@ -24,7 +24,6 @@ import org.elasticsearch.gradle.info.BuildParams apply plugin: 'elasticsearch.test-with-dependencies' apply plugin: 'elasticsearch.jdk-download' -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' esplugin { diff --git a/modules/repository-url/build.gradle b/modules/repository-url/build.gradle index b03043e85c55b..6f2dff252d9cc 100644 --- a/modules/repository-url/build.gradle +++ b/modules/repository-url/build.gradle @@ -21,7 +21,6 @@ import org.elasticsearch.gradle.PropertyNormalization import org.elasticsearch.gradle.info.BuildParams import org.elasticsearch.gradle.test.AntFixture -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' apply plugin: 'elasticsearch.internal-cluster-test' diff --git a/modules/transport-netty4/build.gradle b/modules/transport-netty4/build.gradle index 50867a92e41c1..d91ccd9c1bdbf 100644 --- a/modules/transport-netty4/build.gradle +++ b/modules/transport-netty4/build.gradle @@ -21,7 +21,6 @@ import org.elasticsearch.gradle.info.BuildParams import org.elasticsearch.gradle.test.RestIntegTestTask -apply plugin: 'elasticsearch.rest-resources' apply plugin: 'elasticsearch.yaml-rest-test' /* From 7dcdf8bf7e2596ff84165750c7515ae8d9b7863c Mon Sep 17 00:00:00 2001 From: Jake Landis Date: Mon, 13 Jul 2020 10:54:10 -0500 Subject: [PATCH 7/7] fix merge conflict --- .../test/rank_eval/50_data_streams.yml | 100 -------------- .../test/delete_by_query/90_data_streams.yml | 73 ----------- .../test/reindex/96_data_streams.yml | 122 ------------------ .../test/update_by_query/90_data_streams.yml | 112 ---------------- 4 files changed, 407 deletions(-) delete mode 100644 modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/50_data_streams.yml delete mode 100644 modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml delete mode 100644 modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/96_data_streams.yml delete mode 100644 modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_data_streams.yml diff --git a/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/50_data_streams.yml b/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/50_data_streams.yml deleted file mode 100644 index 4470c34e605c7..0000000000000 --- a/modules/rank-eval/src/yamlRestTest/resources/rest-api-spec/test/rank_eval/50_data_streams.yml +++ /dev/null @@ -1,100 +0,0 @@ -"Verify rank eval with data streams": - - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" - features: allowed_warnings - - - do: - allowed_warnings: - - "index template [my-template] has index patterns [logs-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-template] will take precedence during new index creation" - indices.put_index_template: - name: my-template - body: - index_patterns: [logs-*] - template: - mappings: - properties: - '@timestamp': - type: date - data_stream: - timestamp_field: '@timestamp' - - - do: - indices.create_data_stream: - name: logs-foobar - - is_true: acknowledged - - - do: - index: - index: logs-foobar - id: doc1 - op_type: create - body: { "text": "berlin", "@timestamp": "2020-01-01" } - - - do: - index: - index: logs-foobar - id: doc2 - op_type: create - body: { "text": "amsterdam", "@timestamp": "2020-01-01" } - - # rollover data stream to split documents across multiple backing indices - - do: - indices.rollover: - alias: "logs-foobar" - - - match: { old_index: .ds-logs-foobar-000001 } - - match: { new_index: .ds-logs-foobar-000002 } - - match: { rolled_over: true } - - match: { dry_run: false } - - - do: - index: - index: logs-foobar - id: doc3 - op_type: create - body: { "text": "amsterdam", "@timestamp": "2020-01-01" } - - - do: - index: - index: logs-foobar - id: doc4 - op_type: create - body: { "text": "something about amsterdam and berlin", "@timestamp": "2020-01-01" } - - - do: - indices.refresh: - index: logs-foobar - - - do: - rank_eval: - index: logs-foobar - search_type: query_then_fetch - body: { - "requests" : [ - { - "id": "amsterdam_query", - "request": { "query": { "match" : {"text" : "amsterdam" }}}, - "ratings": [ - {"_index": ".ds-logs-foobar-000001", "_id": "doc1", "rating": 0}, - {"_index": ".ds-logs-foobar-000001", "_id": "doc2", "rating": 1}, - {"_index": ".ds-logs-foobar-000002", "_id": "doc3", "rating": 1}] - }, - { - "id" : "berlin_query", - "request": { "query": { "match" : { "text" : "berlin" } }, "size" : 10 }, - "ratings": [{"_index": ".ds-logs-foobar-000001", "_id": "doc1", "rating": 1}] - } - ], - "metric" : { "precision": { "ignore_unlabeled" : true }} - } - - - match: { metric_score: 1} - - match: { details.amsterdam_query.metric_score: 1.0} - - length: { details.amsterdam_query.hits: 3} - - match: { details.berlin_query.metric_score: 1.0} - - - do: - indices.delete_data_stream: - name: logs-foobar - - is_true: acknowledged diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml deleted file mode 100644 index feea127ff2312..0000000000000 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/delete_by_query/90_data_streams.yml +++ /dev/null @@ -1,73 +0,0 @@ ---- -"DBQ from data stream": - - skip: - features: allowed_warnings - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" - - - do: - allowed_warnings: - - "index template [my-template1] has index patterns [simple-data-stream1] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-template1] will take precedence during new index creation" - indices.put_index_template: - name: my-template1 - body: - index_patterns: [simple-data-stream1] - template: - mappings: - properties: - '@timestamp': - type: date - data_stream: - timestamp_field: '@timestamp' - - - do: - indices.create_data_stream: - name: simple-data-stream1 - - is_true: acknowledged - - - do: - index: - index: simple-data-stream1 - id: 1 - op_type: create - body: - foo: bar - '@timestamp': '2020-12-12' - - - do: - indices.refresh: - index: simple-data-stream1 - - - do: - delete_by_query: - index: simple-data-stream1 - body: - query: - match_all: {} - - - is_false: timed_out - - match: {deleted: 1} - - is_false: created - - is_false: updated - - match: {version_conflicts: 0} - - match: {batches: 1} - - match: {failures: []} - - match: {noops: 0} - - match: {throttled_millis: 0} - - gte: { took: 0 } - - is_false: task - - - do: - indices.refresh: - index: simple-data-stream1 - - - do: - count: - index: .ds-simple-data-stream1-000001 - - - match: {count: 0} - - - do: - indices.delete_data_stream: - name: simple-data-stream1 - - is_true: acknowledged diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/96_data_streams.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/96_data_streams.yml deleted file mode 100644 index 3159104310bc2..0000000000000 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/reindex/96_data_streams.yml +++ /dev/null @@ -1,122 +0,0 @@ ---- -setup: - - skip: - features: allowed_warnings - - do: - allowed_warnings: - - "index template [generic_logs_template] has index patterns [logs-*] matching patterns from existing older templates [global] with patterns (global => [*]); this template [generic_logs_template] will take precedence during new index creation" - indices.put_index_template: - name: generic_logs_template - body: - index_patterns: logs-* - data_stream: - timestamp_field: '@timestamp' - template: - mappings: - properties: - '@timestamp': - type: date - ---- -teardown: - - do: - indices.delete_data_stream: - name: '*' - ---- -"Reindex from data stream into another data stream": - - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" - features: allowed_warnings - - - do: - index: - index: logs-foobar - refresh: true - body: - foo: bar - '@timestamp': '2020-12-12' - - - do: - reindex: - refresh: true - body: - source: - index: logs-foobar - dest: - index: logs-barbaz - op_type: create - - - do: - search: - index: logs-barbaz - body: { query: { match_all: {} } } - - length: { hits.hits: 1 } - - match: { hits.hits.0._index: .ds-logs-barbaz-000001 } - - match: { hits.hits.0._source.foo: 'bar' } - ---- -"Reindex from index into data stream": - - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" - features: allowed_warnings - - - do: - index: - index: old-logs-index - refresh: true - body: - foo: bar - '@timestamp': '2020-12-12' - - - do: - reindex: - refresh: true - body: - source: - index: old-logs-index - dest: - index: logs-foobar - op_type: create - - - do: - search: - index: logs-foobar - body: { query: { match_all: {} } } - - length: { hits.hits: 1 } - - match: { hits.hits.0._index: .ds-logs-foobar-000001 } - - match: { hits.hits.0._source.foo: 'bar' } - ---- -"Reindex from data stream into an index": - - skip: - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" - features: allowed_warnings - - - do: - index: - index: logs-foobar - refresh: true - body: - foo: bar - '@timestamp': '2020-12-12' - - - do: - reindex: - refresh: true - body: - source: - index: logs-foobar - dest: - index: my-index - - - do: - search: - index: my-index - body: { query: { match_all: {} } } - - length: { hits.hits: 1 } - - match: { hits.hits.0._index: my-index } - - match: { hits.hits.0._source.foo: 'bar' } diff --git a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_data_streams.yml b/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_data_streams.yml deleted file mode 100644 index c1c804bd02f56..0000000000000 --- a/modules/reindex/src/yamlRestTest/resources/rest-api-spec/test/update_by_query/90_data_streams.yml +++ /dev/null @@ -1,112 +0,0 @@ ---- -"Update by query from data stream": - - skip: - features: allowed_warnings - version: " - 7.99.99" - reason: "change to 7.8.99 after backport" - - - do: - allowed_warnings: - - "index template [my-template1] has index patterns [simple-data-stream1] matching patterns from existing older templates [global] with patterns (global => [*]); this template [my-template1] will take precedence during new index creation" - indices.put_index_template: - name: my-template1 - body: - index_patterns: [simple-data-stream1] - template: - mappings: - properties: - '@timestamp': - type: date - data_stream: - timestamp_field: '@timestamp' - - - do: - indices.create_data_stream: - name: simple-data-stream1 - - is_true: acknowledged - - - do: - index: - index: simple-data-stream1 - id: 1 - op_type: create - body: { "number": 4, '@timestamp': '2020-12-12' } - - # rollover data stream to create new backing index - - do: - indices.rollover: - alias: "simple-data-stream1" - - - match: { old_index: .ds-simple-data-stream1-000001 } - - match: { new_index: .ds-simple-data-stream1-000002 } - - match: { rolled_over: true } - - match: { dry_run: false } - - - do: - index: - index: simple-data-stream1 - id: 2 - op_type: create - body: { "number": 1, '@timestamp': '2020-12-12' } - - # rollover data stream to create another new backing index - - do: - indices.rollover: - alias: "simple-data-stream1" - - - match: { old_index: .ds-simple-data-stream1-000002 } - - match: { new_index: .ds-simple-data-stream1-000003 } - - match: { rolled_over: true } - - match: { dry_run: false } - - - do: - index: - index: simple-data-stream1 - id: 3 - op_type: create - body: { "number": 5, '@timestamp': '2020-12-12' } - - - do: - indices.refresh: - index: simple-data-stream1 - - # increment by one any numbers >= 4 - - do: - update_by_query: - index: simple-data-stream1 - body: - script: - source: "ctx._source.number++" - lang: "painless" - query: - range: - number: - - gte: 4 - - - match: {updated: 2} - - match: {version_conflicts: 0} - - match: {batches: 1} - - match: {noops: 0} - - match: {failures: []} - - match: {throttled_millis: 0} - - gte: { took: 0 } - - - do: - indices.refresh: - index: simple-data-stream1 - - # verify that both numbers originally >= 4 have been incremented by one - - do: - search: - index: simple-data-stream1 - body: { query: { range: { number: { gte: 5 } } } } - - length: { hits.hits: 2 } - - match: { hits.hits.0._index: .ds-simple-data-stream1-000001 } - - match: { hits.hits.0._source.number: 5 } - - match: { hits.hits.1._index: .ds-simple-data-stream1-000003 } - - match: { hits.hits.1._source.number: 6 } - - - do: - indices.delete_data_stream: - name: simple-data-stream1 - - is_true: acknowledged