MXS-1300: Move the REST API tests back into the core

As the REST API is a part of the core, it is more appropriate for the
tests to reside there as well. Further refactoring of the testing needs to
be done to allow multiple components to use the same framework but with
different tests.

maxctrl/CMakeLists.txt

@@ -9,5 +9,3 @@ if (NPM_FOUND)
 else()
   message(STATUS "Not building MaxCtrl: npm not found")
 endif()
-
-add_subdirectory(test)

server/core/test/CMakeLists.txt

@@ -83,3 +83,5 @@ 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)

server/core/test/rest-api/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/maxctrl/test/*
+cp -t $testdir -r $srcdir/server/core/test/rest-api/*
 
 # Bring MariaDB servers up, this is an asynchronous process
 docker-compose up -d || exit 1