honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Test: Move rest-api-spec for plugins into test resources 

Plugin tests require having rest-api tests, and currently copy that spec
from a directory in the root of the plugin source into the test
resources. This change moves the rest-api-spec dir into test resources
so it is like any other test resources. It also removes unnecessary
configuration for resources from the shared plugin pom.
This commit is contained in:
Ryan Ernst 2015-09-16 03:04:53 -07:00
parent 76b027a979
commit 45f757de6d
32 changed files with 1 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
plugins/analysis-icu/rest-api-spec/test/analysis_icu/10_basic.yaml → plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml
View File

0
plugins/analysis-icu/rest-api-spec/test/analysis_icu/20_search.yaml → plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yaml
View File

0
plugins/analysis-kuromoji/rest-api-spec/test/analysis_kuromoji/10_basic.yaml → plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml
View File

0
plugins/analysis-kuromoji/rest-api-spec/test/analysis_kuromoji/20_search.yaml → plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/20_search.yaml
View File

0
plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml → plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml
View File

0
plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml → plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml
View File

0
plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml → plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml
View File

0
plugins/analysis-phonetic/rest-api-spec/test/analysis_phonetic/40_search.yaml → plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yaml
View File

0
plugins/analysis-smartcn/rest-api-spec/test/analysis_smartcn/10_basic.yaml → plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml
View File

0
plugins/analysis-smartcn/rest-api-spec/test/analysis_smartcn/20_search.yaml → plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yaml
View File

0
plugins/analysis-stempel/rest-api-spec/test/analysis_stempel/10_basic.yaml → plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml
View File

0
plugins/analysis-stempel/rest-api-spec/test/analysis_stempel/20_search.yaml → plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yaml
View File

0
plugins/cloud-azure/rest-api-spec/test/cloud_azure/10_basic.yaml → plugins/cloud-azure/src/test/resources/rest-api-spec/test/cloud_azure/10_basic.yaml
View File

0
plugins/cloud-gce/rest-api-spec/test/cloud_gce/10_basic.yaml → plugins/cloud-gce/src/test/resources/rest-api-spec/test/cloud_gce/10_basic.yaml
View File

0
plugins/delete-by-query/rest-api-spec/api/delete_by_query.json → plugins/delete-by-query/src/test/resources/rest-api-spec/api/delete_by_query.json
View File

0
plugins/delete-by-query/rest-api-spec/test/delete_by_query/10_basic.yaml → plugins/delete-by-query/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yaml
View File

0
plugins/discovery-ec2/rest-api-spec/test/discovery_ec2/10_basic.yaml → plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yaml
View File

0
plugins/discovery-multicast/rest-api-spec/test/discovery_multicast/10_basic.yaml → plugins/discovery-multicast/src/test/resources/rest-api-spec/test/discovery_multicast/10_basic.yaml
View File

0
plugins/jvm-example/rest-api-spec/api/cat.configured_example.json → plugins/jvm-example/src/test/resources/rest-api-spec/api/cat.configured_example.json
View File

0
plugins/jvm-example/rest-api-spec/test/jvm_example/10_basic.yaml → plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/10_basic.yaml
View File

0
plugins/jvm-example/rest-api-spec/test/jvm_example/20_configured_example.yaml → plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/20_configured_example.yaml
View File

0
plugins/lang-javascript/rest-api-spec/test/lang_javascript/10_basic.yaml → plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/10_basic.yaml
View File

0
plugins/lang-javascript/rest-api-spec/test/lang_javascript/20_search.yaml → plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/20_search.yaml
View File

0
plugins/lang-python/rest-api-spec/test/lang_python/10_basic.yaml → plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/10_basic.yaml
View File

0
plugins/lang-python/rest-api-spec/test/lang_python/20_search.yaml → plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/20_search.yaml
View File

0
plugins/lang-python/rest-api-spec/test/lang_python/30_update.yaml → plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/30_update.yaml
View File

0
plugins/mapper-murmur3/rest-api-spec/test/mapper_murmur3/10_basic.yaml → plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yaml
View File

0
plugins/mapper-size/rest-api-spec/test/mapper_size/10_basic.yaml → plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yaml
View File

37
plugins/pom.xml
View File

@ -221,46 +221,11 @@
<!-- typical layout for plugins -->
<build>
<resources>
<resource>
<directory>src/main/resources</directory>
<filtering>true</filtering>
<includes>
<include>**/*.properties</include>
</includes>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/java</directory>
<includes>
<include>**/*.json</include>
<include>**/*.txt</include>
</includes>
</testResource>
<testResource>
<directory>src/test/resources</directory>
<excludes>
<exclude>elasticsearch.yml</exclude>
<exclude>**/*.properties</exclude>
</excludes>
</testResource>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
<includes>
<include>elasticsearch.yml</include>
<include>**/*.properties</include>
</includes>
</testResource>
<!-- REST API specification and test suites -->
<testResource>
<directory>${project.basedir}/rest-api-spec</directory>
<targetPath>rest-api-spec</targetPath>
<includes>
<include>api/*.json</include>
<include>test/**/*.yaml</include>
<include>**/*</include>
</includes>
</testResource>
<!-- REST API specifications copied from main Elasticsearch specs

0
plugins/repository-s3/rest-api-spec/test/repository_s3/10_basic.yaml → plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yaml
View File

0
plugins/repository-s3/rest-api-spec/test/repository_s3/20_repository.yaml → plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/20_repository.yaml
View File

0
plugins/site-example/rest-api-spec/test/example/10_basic.yaml → plugins/site-example/src/test/resources/rest-api-spec/test/example/10_basic.yaml
View File