Browse Source

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.
Ryan Ernst 10 years ago
parent
commit
45f757de6d
32 changed files with 1 additions and 36 deletions
  1. 0 0
      plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/10_basic.yaml
  2. 0 0
      plugins/analysis-icu/src/test/resources/rest-api-spec/test/analysis_icu/20_search.yaml
  3. 0 0
      plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/10_basic.yaml
  4. 0 0
      plugins/analysis-kuromoji/src/test/resources/rest-api-spec/test/analysis_kuromoji/20_search.yaml
  5. 0 0
      plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/10_metaphone.yaml
  6. 0 0
      plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/20_double_metaphone.yaml
  7. 0 0
      plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/30_beider_morse.yaml
  8. 0 0
      plugins/analysis-phonetic/src/test/resources/rest-api-spec/test/analysis_phonetic/40_search.yaml
  9. 0 0
      plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/10_basic.yaml
  10. 0 0
      plugins/analysis-smartcn/src/test/resources/rest-api-spec/test/analysis_smartcn/20_search.yaml
  11. 0 0
      plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/10_basic.yaml
  12. 0 0
      plugins/analysis-stempel/src/test/resources/rest-api-spec/test/analysis_stempel/20_search.yaml
  13. 0 0
      plugins/cloud-azure/src/test/resources/rest-api-spec/test/cloud_azure/10_basic.yaml
  14. 0 0
      plugins/cloud-gce/src/test/resources/rest-api-spec/test/cloud_gce/10_basic.yaml
  15. 0 0
      plugins/delete-by-query/src/test/resources/rest-api-spec/api/delete_by_query.json
  16. 0 0
      plugins/delete-by-query/src/test/resources/rest-api-spec/test/delete_by_query/10_basic.yaml
  17. 0 0
      plugins/discovery-ec2/src/test/resources/rest-api-spec/test/discovery_ec2/10_basic.yaml
  18. 0 0
      plugins/discovery-multicast/src/test/resources/rest-api-spec/test/discovery_multicast/10_basic.yaml
  19. 0 0
      plugins/jvm-example/src/test/resources/rest-api-spec/api/cat.configured_example.json
  20. 0 0
      plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/10_basic.yaml
  21. 0 0
      plugins/jvm-example/src/test/resources/rest-api-spec/test/jvm_example/20_configured_example.yaml
  22. 0 0
      plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/10_basic.yaml
  23. 0 0
      plugins/lang-javascript/src/test/resources/rest-api-spec/test/lang_javascript/20_search.yaml
  24. 0 0
      plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/10_basic.yaml
  25. 0 0
      plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/20_search.yaml
  26. 0 0
      plugins/lang-python/src/test/resources/rest-api-spec/test/lang_python/30_update.yaml
  27. 0 0
      plugins/mapper-murmur3/src/test/resources/rest-api-spec/test/mapper_murmur3/10_basic.yaml
  28. 0 0
      plugins/mapper-size/src/test/resources/rest-api-spec/test/mapper_size/10_basic.yaml
  29. 1 36
      plugins/pom.xml
  30. 0 0
      plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/10_basic.yaml
  31. 0 0
      plugins/repository-s3/src/test/resources/rest-api-spec/test/repository_s3/20_repository.yaml
  32. 0 0
      plugins/site-example/src/test/resources/rest-api-spec/test/example/10_basic.yaml

+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 0 - 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


+ 1 - 36
plugins/pom.xml

@@ -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 - 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


+ 0 - 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


+ 0 - 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