From 018dd53ffc5c0cbb9903e67bfb535da0e5875fbc Mon Sep 17 00:00:00 2001 From: Ryan Ernst Date: Wed, 16 Sep 2015 11:09:46 -0700 Subject: [PATCH] Move rest-api-spec tests to resources dirs See elastic/elasticsearchelastic/elasticsearch#13611 Original commit: elastic/x-pack-elasticsearch@cc26a1a9db5f24c5fb855e9bbc5226736405e919 --- .../rest-api-spec/test/marvel/10_basic.yaml | 0 watcher/pom.xml | 12 +++++++++--- .../rest-api-spec/api/watcher.ack_watch.json | 0 .../rest-api-spec/api/watcher.activate_watch.json | 0 .../rest-api-spec/api/watcher.deactivate_watch.json | 0 .../rest-api-spec/api/watcher.delete_watch.json | 0 .../rest-api-spec/api/watcher.execute_watch.json | 0 .../rest-api-spec/api/watcher.get_watch.json | 0 .../resources}/rest-api-spec/api/watcher.info.json | 0 .../rest-api-spec/api/watcher.put_watch.json | 0 .../rest-api-spec/api/watcher.restart.json | 0 .../resources}/rest-api-spec/api/watcher.start.json | 0 .../resources}/rest-api-spec/api/watcher.stats.json | 0 .../resources}/rest-api-spec/api/watcher.stop.json | 0 .../rest-api-spec/test/ack_watch/10_basic.yaml | 0 .../test/ack_watch/20_ack_individual_action.yaml | 0 .../rest-api-spec/test/activate_watch/10_basic.yaml | 0 .../test/array_compare_watch/10_basic.yaml | 0 .../rest-api-spec/test/delete_watch/10_basic.yaml | 0 .../rest-api-spec/test/execute_watch/10_basic.yaml | 0 .../test/execute_watch/20_minimal_body.yaml | 0 .../test/execute_watch/30_inline_watch.yaml | 0 .../rest-api-spec/test/get_watch/10_basic.yaml | 0 .../rest-api-spec/test/get_watch/20_missing.yaml | 0 .../getting_started/10_monitor_cluster_health.yaml | 0 .../rest-api-spec/test/hijack/10_basic.yaml | 0 .../rest-api-spec/test/put_watch/10_basic.yaml | 0 .../put_watch/20_put_watch_with_throttle_period.yaml | 0 .../30_put_watch_with_action_throttle_period.yaml | 0 .../test/put_watch/40_put_watch_as_inactive.yaml | 0 .../rest-api-spec/test/restart_watcher/10_basic.yaml | 0 .../rest-api-spec/test/start_watcher/10_basic.yaml | 0 .../rest-api-spec/test/stats/10_basic.yaml | 0 .../rest-api-spec/test/stop_watcher/10_basic.yaml | 0 .../rest-api-spec/test/watch_info/10_basic.yaml | 0 35 files changed, 9 insertions(+), 3 deletions(-) rename marvel/{ => src/test/resources}/rest-api-spec/test/marvel/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.ack_watch.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.activate_watch.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.deactivate_watch.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.delete_watch.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.execute_watch.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.get_watch.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.info.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.put_watch.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.restart.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.start.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.stats.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/api/watcher.stop.json (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/ack_watch/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/ack_watch/20_ack_individual_action.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/activate_watch/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/array_compare_watch/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/delete_watch/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/execute_watch/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/execute_watch/20_minimal_body.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/execute_watch/30_inline_watch.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/get_watch/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/get_watch/20_missing.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/getting_started/10_monitor_cluster_health.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/hijack/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/put_watch/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/put_watch/20_put_watch_with_throttle_period.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/put_watch/30_put_watch_with_action_throttle_period.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/put_watch/40_put_watch_as_inactive.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/restart_watcher/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/start_watcher/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/stats/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/stop_watcher/10_basic.yaml (100%) rename watcher/{ => src/test/resources}/rest-api-spec/test/watch_info/10_basic.yaml (100%) diff --git a/marvel/rest-api-spec/test/marvel/10_basic.yaml b/marvel/src/test/resources/rest-api-spec/test/marvel/10_basic.yaml similarity index 100% rename from marvel/rest-api-spec/test/marvel/10_basic.yaml rename to marvel/src/test/resources/rest-api-spec/test/marvel/10_basic.yaml diff --git a/watcher/pom.xml b/watcher/pom.xml index 13d888cb96f..ca903a7e361 100644 --- a/watcher/pom.xml +++ b/watcher/pom.xml @@ -111,9 +111,15 @@ ${basedir}/src/test/resources - - **/*.* - + + rest-api-spec/** + + + + + ${basedir}/src/test/resources/rest-api-spec + rest-api-spec + true ${basedir}/rest-api-spec diff --git a/watcher/rest-api-spec/api/watcher.ack_watch.json b/watcher/src/test/resources/rest-api-spec/api/watcher.ack_watch.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.ack_watch.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.ack_watch.json diff --git a/watcher/rest-api-spec/api/watcher.activate_watch.json b/watcher/src/test/resources/rest-api-spec/api/watcher.activate_watch.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.activate_watch.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.activate_watch.json diff --git a/watcher/rest-api-spec/api/watcher.deactivate_watch.json b/watcher/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.deactivate_watch.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.deactivate_watch.json diff --git a/watcher/rest-api-spec/api/watcher.delete_watch.json b/watcher/src/test/resources/rest-api-spec/api/watcher.delete_watch.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.delete_watch.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.delete_watch.json diff --git a/watcher/rest-api-spec/api/watcher.execute_watch.json b/watcher/src/test/resources/rest-api-spec/api/watcher.execute_watch.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.execute_watch.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.execute_watch.json diff --git a/watcher/rest-api-spec/api/watcher.get_watch.json b/watcher/src/test/resources/rest-api-spec/api/watcher.get_watch.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.get_watch.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.get_watch.json diff --git a/watcher/rest-api-spec/api/watcher.info.json b/watcher/src/test/resources/rest-api-spec/api/watcher.info.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.info.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.info.json diff --git a/watcher/rest-api-spec/api/watcher.put_watch.json b/watcher/src/test/resources/rest-api-spec/api/watcher.put_watch.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.put_watch.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.put_watch.json diff --git a/watcher/rest-api-spec/api/watcher.restart.json b/watcher/src/test/resources/rest-api-spec/api/watcher.restart.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.restart.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.restart.json diff --git a/watcher/rest-api-spec/api/watcher.start.json b/watcher/src/test/resources/rest-api-spec/api/watcher.start.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.start.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.start.json diff --git a/watcher/rest-api-spec/api/watcher.stats.json b/watcher/src/test/resources/rest-api-spec/api/watcher.stats.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.stats.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.stats.json diff --git a/watcher/rest-api-spec/api/watcher.stop.json b/watcher/src/test/resources/rest-api-spec/api/watcher.stop.json similarity index 100% rename from watcher/rest-api-spec/api/watcher.stop.json rename to watcher/src/test/resources/rest-api-spec/api/watcher.stop.json diff --git a/watcher/rest-api-spec/test/ack_watch/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/ack_watch/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/ack_watch/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/ack_watch/10_basic.yaml diff --git a/watcher/rest-api-spec/test/ack_watch/20_ack_individual_action.yaml b/watcher/src/test/resources/rest-api-spec/test/ack_watch/20_ack_individual_action.yaml similarity index 100% rename from watcher/rest-api-spec/test/ack_watch/20_ack_individual_action.yaml rename to watcher/src/test/resources/rest-api-spec/test/ack_watch/20_ack_individual_action.yaml diff --git a/watcher/rest-api-spec/test/activate_watch/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/activate_watch/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/activate_watch/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/activate_watch/10_basic.yaml diff --git a/watcher/rest-api-spec/test/array_compare_watch/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/array_compare_watch/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/array_compare_watch/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/array_compare_watch/10_basic.yaml diff --git a/watcher/rest-api-spec/test/delete_watch/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/delete_watch/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/delete_watch/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/delete_watch/10_basic.yaml diff --git a/watcher/rest-api-spec/test/execute_watch/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/execute_watch/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/execute_watch/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/execute_watch/10_basic.yaml diff --git a/watcher/rest-api-spec/test/execute_watch/20_minimal_body.yaml b/watcher/src/test/resources/rest-api-spec/test/execute_watch/20_minimal_body.yaml similarity index 100% rename from watcher/rest-api-spec/test/execute_watch/20_minimal_body.yaml rename to watcher/src/test/resources/rest-api-spec/test/execute_watch/20_minimal_body.yaml diff --git a/watcher/rest-api-spec/test/execute_watch/30_inline_watch.yaml b/watcher/src/test/resources/rest-api-spec/test/execute_watch/30_inline_watch.yaml similarity index 100% rename from watcher/rest-api-spec/test/execute_watch/30_inline_watch.yaml rename to watcher/src/test/resources/rest-api-spec/test/execute_watch/30_inline_watch.yaml diff --git a/watcher/rest-api-spec/test/get_watch/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/get_watch/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/get_watch/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/get_watch/10_basic.yaml diff --git a/watcher/rest-api-spec/test/get_watch/20_missing.yaml b/watcher/src/test/resources/rest-api-spec/test/get_watch/20_missing.yaml similarity index 100% rename from watcher/rest-api-spec/test/get_watch/20_missing.yaml rename to watcher/src/test/resources/rest-api-spec/test/get_watch/20_missing.yaml diff --git a/watcher/rest-api-spec/test/getting_started/10_monitor_cluster_health.yaml b/watcher/src/test/resources/rest-api-spec/test/getting_started/10_monitor_cluster_health.yaml similarity index 100% rename from watcher/rest-api-spec/test/getting_started/10_monitor_cluster_health.yaml rename to watcher/src/test/resources/rest-api-spec/test/getting_started/10_monitor_cluster_health.yaml diff --git a/watcher/rest-api-spec/test/hijack/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/hijack/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/hijack/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/hijack/10_basic.yaml diff --git a/watcher/rest-api-spec/test/put_watch/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/put_watch/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/put_watch/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/put_watch/10_basic.yaml diff --git a/watcher/rest-api-spec/test/put_watch/20_put_watch_with_throttle_period.yaml b/watcher/src/test/resources/rest-api-spec/test/put_watch/20_put_watch_with_throttle_period.yaml similarity index 100% rename from watcher/rest-api-spec/test/put_watch/20_put_watch_with_throttle_period.yaml rename to watcher/src/test/resources/rest-api-spec/test/put_watch/20_put_watch_with_throttle_period.yaml diff --git a/watcher/rest-api-spec/test/put_watch/30_put_watch_with_action_throttle_period.yaml b/watcher/src/test/resources/rest-api-spec/test/put_watch/30_put_watch_with_action_throttle_period.yaml similarity index 100% rename from watcher/rest-api-spec/test/put_watch/30_put_watch_with_action_throttle_period.yaml rename to watcher/src/test/resources/rest-api-spec/test/put_watch/30_put_watch_with_action_throttle_period.yaml diff --git a/watcher/rest-api-spec/test/put_watch/40_put_watch_as_inactive.yaml b/watcher/src/test/resources/rest-api-spec/test/put_watch/40_put_watch_as_inactive.yaml similarity index 100% rename from watcher/rest-api-spec/test/put_watch/40_put_watch_as_inactive.yaml rename to watcher/src/test/resources/rest-api-spec/test/put_watch/40_put_watch_as_inactive.yaml diff --git a/watcher/rest-api-spec/test/restart_watcher/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/restart_watcher/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/restart_watcher/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/restart_watcher/10_basic.yaml diff --git a/watcher/rest-api-spec/test/start_watcher/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/start_watcher/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/start_watcher/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/start_watcher/10_basic.yaml diff --git a/watcher/rest-api-spec/test/stats/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/stats/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/stats/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/stats/10_basic.yaml diff --git a/watcher/rest-api-spec/test/stop_watcher/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/stop_watcher/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/stop_watcher/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/stop_watcher/10_basic.yaml diff --git a/watcher/rest-api-spec/test/watch_info/10_basic.yaml b/watcher/src/test/resources/rest-api-spec/test/watch_info/10_basic.yaml similarity index 100% rename from watcher/rest-api-spec/test/watch_info/10_basic.yaml rename to watcher/src/test/resources/rest-api-spec/test/watch_info/10_basic.yaml