From d59d3ab6389decfe357ae5074015e1a87226f22e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Tue, 11 Jul 2017 11:30:36 +0300 Subject: [PATCH] MXS-1300: Combine REST API and MaxCtrl tests The REST API tests are now located under the maxctrl directory. This allows both tests to use the same framework for testing. --- CMakeLists.txt | 1 + maxctrl/CMakeLists.txt | 1 + {client/maxctrl => maxctrl}/build.sh | 0 {client/maxctrl => maxctrl}/common.js | 0 {client/maxctrl => maxctrl}/core.js | 0 {client/maxctrl => maxctrl}/lib/alter.js | 0 {client/maxctrl => maxctrl}/lib/call.js | 0 {client/maxctrl => maxctrl}/lib/clear.js | 0 {client/maxctrl => maxctrl}/lib/create.js | 0 {client/maxctrl => maxctrl}/lib/destroy.js | 0 {client/maxctrl => maxctrl}/lib/disable.js | 0 {client/maxctrl => maxctrl}/lib/enable.js | 0 {client/maxctrl => maxctrl}/lib/link.js | 0 {client/maxctrl => maxctrl}/lib/list.js | 0 {client/maxctrl => maxctrl}/lib/rotate.js | 0 {client/maxctrl => maxctrl}/lib/set.js | 0 {client/maxctrl => maxctrl}/lib/show.js | 0 {client/maxctrl => maxctrl}/lib/start.js | 0 {client/maxctrl => maxctrl}/lib/stop.js | 0 {client/maxctrl => maxctrl}/lib/unlink.js | 0 {client/maxctrl => maxctrl}/maxctrl.js | 0 {client/maxctrl => maxctrl}/package.json | 0 {server/core/test/rest-api => maxctrl/test}/CMakeLists.txt | 0 {server/core/test/rest-api => maxctrl/test}/after.sh | 0 {server/core/test/rest-api => maxctrl/test}/before.sh | 0 {server/core/test/rest-api => maxctrl/test}/package.json | 0 {server/core/test/rest-api => maxctrl/test}/test/auth.js | 0 {server/core/test/rest-api => maxctrl/test}/test/core.js | 0 {server/core/test/rest-api => maxctrl/test}/test/errors.js | 0 {server/core/test/rest-api => maxctrl/test}/test/http.js | 0 {server/core/test/rest-api => maxctrl/test}/test/logs.js | 0 {server/core/test/rest-api => maxctrl/test}/test/monitor.js | 0 {server/core/test/rest-api => maxctrl/test}/test/options.js | 0 .../test/rest-api => maxctrl/test}/test/schema_validation.js | 0 {server/core/test/rest-api => maxctrl/test}/test/server.js | 0 {server/core/test/rest-api => maxctrl/test}/test/service.js | 0 {server/core/test/rest-api => maxctrl/test}/test/users.js | 0 {server/core/test/rest-api => maxctrl/test}/test_rest_api.sh | 2 +- {server/core/test/rest-api => maxctrl/test}/utils.js | 0 server/core/test/CMakeLists.txt | 2 -- 40 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 maxctrl/CMakeLists.txt rename {client/maxctrl => maxctrl}/build.sh (100%) rename {client/maxctrl => maxctrl}/common.js (100%) rename {client/maxctrl => maxctrl}/core.js (100%) rename {client/maxctrl => maxctrl}/lib/alter.js (100%) rename {client/maxctrl => maxctrl}/lib/call.js (100%) rename {client/maxctrl => maxctrl}/lib/clear.js (100%) rename {client/maxctrl => maxctrl}/lib/create.js (100%) rename {client/maxctrl => maxctrl}/lib/destroy.js (100%) rename {client/maxctrl => maxctrl}/lib/disable.js (100%) rename {client/maxctrl => maxctrl}/lib/enable.js (100%) rename {client/maxctrl => maxctrl}/lib/link.js (100%) rename {client/maxctrl => maxctrl}/lib/list.js (100%) rename {client/maxctrl => maxctrl}/lib/rotate.js (100%) rename {client/maxctrl => maxctrl}/lib/set.js (100%) rename {client/maxctrl => maxctrl}/lib/show.js (100%) rename {client/maxctrl => maxctrl}/lib/start.js (100%) rename {client/maxctrl => maxctrl}/lib/stop.js (100%) rename {client/maxctrl => maxctrl}/lib/unlink.js (100%) rename {client/maxctrl => maxctrl}/maxctrl.js (100%) rename {client/maxctrl => maxctrl}/package.json (100%) rename {server/core/test/rest-api => maxctrl/test}/CMakeLists.txt (100%) rename {server/core/test/rest-api => maxctrl/test}/after.sh (100%) rename {server/core/test/rest-api => maxctrl/test}/before.sh (100%) rename {server/core/test/rest-api => maxctrl/test}/package.json (100%) rename {server/core/test/rest-api => maxctrl/test}/test/auth.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/core.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/errors.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/http.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/logs.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/monitor.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/options.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/schema_validation.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/server.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/service.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test/users.js (100%) rename {server/core/test/rest-api => maxctrl/test}/test_rest_api.sh (96%) rename {server/core/test/rest-api => maxctrl/test}/utils.js (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f7df2c39..333165b57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -186,6 +186,7 @@ add_subdirectory(plugins) add_subdirectory(query_classifier) add_subdirectory(server) add_subdirectory(include/maxscale) +add_subdirectory(maxctrl) if(NOT WITHOUT_MAXADMIN) add_subdirectory(client) endif() diff --git a/maxctrl/CMakeLists.txt b/maxctrl/CMakeLists.txt new file mode 100644 index 000000000..552439ebc --- /dev/null +++ b/maxctrl/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory(test) diff --git a/client/maxctrl/build.sh b/maxctrl/build.sh similarity index 100% rename from client/maxctrl/build.sh rename to maxctrl/build.sh diff --git a/client/maxctrl/common.js b/maxctrl/common.js similarity index 100% rename from client/maxctrl/common.js rename to maxctrl/common.js diff --git a/client/maxctrl/core.js b/maxctrl/core.js similarity index 100% rename from client/maxctrl/core.js rename to maxctrl/core.js diff --git a/client/maxctrl/lib/alter.js b/maxctrl/lib/alter.js similarity index 100% rename from client/maxctrl/lib/alter.js rename to maxctrl/lib/alter.js diff --git a/client/maxctrl/lib/call.js b/maxctrl/lib/call.js similarity index 100% rename from client/maxctrl/lib/call.js rename to maxctrl/lib/call.js diff --git a/client/maxctrl/lib/clear.js b/maxctrl/lib/clear.js similarity index 100% rename from client/maxctrl/lib/clear.js rename to maxctrl/lib/clear.js diff --git a/client/maxctrl/lib/create.js b/maxctrl/lib/create.js similarity index 100% rename from client/maxctrl/lib/create.js rename to maxctrl/lib/create.js diff --git a/client/maxctrl/lib/destroy.js b/maxctrl/lib/destroy.js similarity index 100% rename from client/maxctrl/lib/destroy.js rename to maxctrl/lib/destroy.js diff --git a/client/maxctrl/lib/disable.js b/maxctrl/lib/disable.js similarity index 100% rename from client/maxctrl/lib/disable.js rename to maxctrl/lib/disable.js diff --git a/client/maxctrl/lib/enable.js b/maxctrl/lib/enable.js similarity index 100% rename from client/maxctrl/lib/enable.js rename to maxctrl/lib/enable.js diff --git a/client/maxctrl/lib/link.js b/maxctrl/lib/link.js similarity index 100% rename from client/maxctrl/lib/link.js rename to maxctrl/lib/link.js diff --git a/client/maxctrl/lib/list.js b/maxctrl/lib/list.js similarity index 100% rename from client/maxctrl/lib/list.js rename to maxctrl/lib/list.js diff --git a/client/maxctrl/lib/rotate.js b/maxctrl/lib/rotate.js similarity index 100% rename from client/maxctrl/lib/rotate.js rename to maxctrl/lib/rotate.js diff --git a/client/maxctrl/lib/set.js b/maxctrl/lib/set.js similarity index 100% rename from client/maxctrl/lib/set.js rename to maxctrl/lib/set.js diff --git a/client/maxctrl/lib/show.js b/maxctrl/lib/show.js similarity index 100% rename from client/maxctrl/lib/show.js rename to maxctrl/lib/show.js diff --git a/client/maxctrl/lib/start.js b/maxctrl/lib/start.js similarity index 100% rename from client/maxctrl/lib/start.js rename to maxctrl/lib/start.js diff --git a/client/maxctrl/lib/stop.js b/maxctrl/lib/stop.js similarity index 100% rename from client/maxctrl/lib/stop.js rename to maxctrl/lib/stop.js diff --git a/client/maxctrl/lib/unlink.js b/maxctrl/lib/unlink.js similarity index 100% rename from client/maxctrl/lib/unlink.js rename to maxctrl/lib/unlink.js diff --git a/client/maxctrl/maxctrl.js b/maxctrl/maxctrl.js similarity index 100% rename from client/maxctrl/maxctrl.js rename to maxctrl/maxctrl.js diff --git a/client/maxctrl/package.json b/maxctrl/package.json similarity index 100% rename from client/maxctrl/package.json rename to maxctrl/package.json diff --git a/server/core/test/rest-api/CMakeLists.txt b/maxctrl/test/CMakeLists.txt similarity index 100% rename from server/core/test/rest-api/CMakeLists.txt rename to maxctrl/test/CMakeLists.txt diff --git a/server/core/test/rest-api/after.sh b/maxctrl/test/after.sh similarity index 100% rename from server/core/test/rest-api/after.sh rename to maxctrl/test/after.sh diff --git a/server/core/test/rest-api/before.sh b/maxctrl/test/before.sh similarity index 100% rename from server/core/test/rest-api/before.sh rename to maxctrl/test/before.sh diff --git a/server/core/test/rest-api/package.json b/maxctrl/test/package.json similarity index 100% rename from server/core/test/rest-api/package.json rename to maxctrl/test/package.json diff --git a/server/core/test/rest-api/test/auth.js b/maxctrl/test/test/auth.js similarity index 100% rename from server/core/test/rest-api/test/auth.js rename to maxctrl/test/test/auth.js diff --git a/server/core/test/rest-api/test/core.js b/maxctrl/test/test/core.js similarity index 100% rename from server/core/test/rest-api/test/core.js rename to maxctrl/test/test/core.js diff --git a/server/core/test/rest-api/test/errors.js b/maxctrl/test/test/errors.js similarity index 100% rename from server/core/test/rest-api/test/errors.js rename to maxctrl/test/test/errors.js diff --git a/server/core/test/rest-api/test/http.js b/maxctrl/test/test/http.js similarity index 100% rename from server/core/test/rest-api/test/http.js rename to maxctrl/test/test/http.js diff --git a/server/core/test/rest-api/test/logs.js b/maxctrl/test/test/logs.js similarity index 100% rename from server/core/test/rest-api/test/logs.js rename to maxctrl/test/test/logs.js diff --git a/server/core/test/rest-api/test/monitor.js b/maxctrl/test/test/monitor.js similarity index 100% rename from server/core/test/rest-api/test/monitor.js rename to maxctrl/test/test/monitor.js diff --git a/server/core/test/rest-api/test/options.js b/maxctrl/test/test/options.js similarity index 100% rename from server/core/test/rest-api/test/options.js rename to maxctrl/test/test/options.js diff --git a/server/core/test/rest-api/test/schema_validation.js b/maxctrl/test/test/schema_validation.js similarity index 100% rename from server/core/test/rest-api/test/schema_validation.js rename to maxctrl/test/test/schema_validation.js diff --git a/server/core/test/rest-api/test/server.js b/maxctrl/test/test/server.js similarity index 100% rename from server/core/test/rest-api/test/server.js rename to maxctrl/test/test/server.js diff --git a/server/core/test/rest-api/test/service.js b/maxctrl/test/test/service.js similarity index 100% rename from server/core/test/rest-api/test/service.js rename to maxctrl/test/test/service.js diff --git a/server/core/test/rest-api/test/users.js b/maxctrl/test/test/users.js similarity index 100% rename from server/core/test/rest-api/test/users.js rename to maxctrl/test/test/users.js diff --git a/server/core/test/rest-api/test_rest_api.sh b/maxctrl/test/test_rest_api.sh similarity index 96% rename from server/core/test/rest-api/test_rest_api.sh rename to maxctrl/test/test_rest_api.sh index 820937445..e9c7eec8b 100755 --- a/server/core/test/rest-api/test_rest_api.sh +++ b/maxctrl/test/test_rest_api.sh @@ -16,7 +16,7 @@ testdir=$PWD/local_test/ mkdir -p $testdir && cd $testdir # Currently all tests that use npm are for the REST API -cp -t $testdir -r $srcdir/server/core/test/rest-api/* +cp -t $testdir -r $srcdir/maxctrl/test/* npm install mkdir -p $maxscaledir && cd $maxscaledir diff --git a/server/core/test/rest-api/utils.js b/maxctrl/test/utils.js similarity index 100% rename from server/core/test/rest-api/utils.js rename to maxctrl/test/utils.js diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt index 0696b650d..edf0d19e9 100644 --- a/server/core/test/CMakeLists.txt +++ b/server/core/test/CMakeLists.txt @@ -83,5 +83,3 @@ add_test(TestTrxCompare_Update test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../.. add_test(TestTrxCompare_MaxScale test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/maxscale.test) add_test(TestJson testjson) add_test(TestHttp testhttp) - -add_subdirectory(rest-api)