From e377b308033d870e22f6a2a264f8c7eea02e86ab Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Fri, 10 Nov 2017 14:25:02 +0200 Subject: [PATCH] Name core tests consistently Now, given a concept xyz, * the main test file is called test_xyz.cc * the executable is called test_xyz, and * the ctest test is called text_xyz. --- server/core/test/CMakeLists.txt | 138 +++++++++--------- ...rofile.cc => profile_trxboundaryparser.cc} | 0 .../{testadminusers.cc => test_adminusers.cc} | 0 .../test/{testatomic.cc => test_atomic.cc} | 0 .../test/{testbuffer.cc => test_buffer.cc} | 0 .../test/{testconfig.cc => test_config.cc} | 0 server/core/test/{testdcb.cc => test_dcb.cc} | 0 .../test/{testfilter.cc => test_filter.cc} | 0 .../core/test/{testhash.cc => test_hash.cc} | 0 .../core/test/{testhint.cc => test_hint.cc} | 0 .../core/test/{testhttp.cc => test_http.cc} | 0 .../core/test/{testjson.cc => test_json.cc} | 0 server/core/test/{testlog.cc => test_log.cc} | 0 .../{testlogorder.cc => test_logorder.cc} | 0 ...logthrottling.cc => test_logthrottling.cc} | 0 .../{testmaxpasswd.sh => test_maxpasswd.sh} | 0 ...maxscalepcre2.cc => test_maxscalepcre2.cc} | 0 .../{testmodulecmd.cc => test_modulecmd.cc} | 0 .../test/{testmodutil.cc => test_modutil.cc} | 0 .../core/test/{testpoll.cc => test_poll.cc} | 0 .../{testsemaphore.cc => test_semaphore.cc} | 0 .../test/{testserver.cc => test_server.cc} | 0 .../test/{testservice.cc => test_service.cc} | 0 .../test/{testsession.cc => test_session.cc} | 0 .../{testspinlock.cc => test_spinlock.cc} | 0 .../test/{testthread.cc => test_thread.cc} | 0 .../{testtrxcompare.cc => test_trxcompare.cc} | 0 ...testtrxtracking.cc => test_trxtracking.cc} | 0 .../core/test/{testusers.cc => test_users.cc} | 0 .../core/test/{testutils.cc => test_utils.cc} | 0 30 files changed, 70 insertions(+), 68 deletions(-) rename server/core/test/{trxboundaryparser_profile.cc => profile_trxboundaryparser.cc} (100%) rename server/core/test/{testadminusers.cc => test_adminusers.cc} (100%) rename server/core/test/{testatomic.cc => test_atomic.cc} (100%) rename server/core/test/{testbuffer.cc => test_buffer.cc} (100%) rename server/core/test/{testconfig.cc => test_config.cc} (100%) rename server/core/test/{testdcb.cc => test_dcb.cc} (100%) rename server/core/test/{testfilter.cc => test_filter.cc} (100%) rename server/core/test/{testhash.cc => test_hash.cc} (100%) rename server/core/test/{testhint.cc => test_hint.cc} (100%) rename server/core/test/{testhttp.cc => test_http.cc} (100%) rename server/core/test/{testjson.cc => test_json.cc} (100%) rename server/core/test/{testlog.cc => test_log.cc} (100%) rename server/core/test/{testlogorder.cc => test_logorder.cc} (100%) rename server/core/test/{testlogthrottling.cc => test_logthrottling.cc} (100%) rename server/core/test/{testmaxpasswd.sh => test_maxpasswd.sh} (100%) rename server/core/test/{testmaxscalepcre2.cc => test_maxscalepcre2.cc} (100%) rename server/core/test/{testmodulecmd.cc => test_modulecmd.cc} (100%) rename server/core/test/{testmodutil.cc => test_modutil.cc} (100%) rename server/core/test/{testpoll.cc => test_poll.cc} (100%) rename server/core/test/{testsemaphore.cc => test_semaphore.cc} (100%) rename server/core/test/{testserver.cc => test_server.cc} (100%) rename server/core/test/{testservice.cc => test_service.cc} (100%) rename server/core/test/{testsession.cc => test_session.cc} (100%) rename server/core/test/{testspinlock.cc => test_spinlock.cc} (100%) rename server/core/test/{testthread.cc => test_thread.cc} (100%) rename server/core/test/{testtrxcompare.cc => test_trxcompare.cc} (100%) rename server/core/test/{testtrxtracking.cc => test_trxtracking.cc} (100%) rename server/core/test/{testusers.cc => test_users.cc} (100%) rename server/core/test/{testutils.cc => test_utils.cc} (100%) diff --git a/server/core/test/CMakeLists.txt b/server/core/test/CMakeLists.txt index 489dff9a9..60c70725f 100644 --- a/server/core/test/CMakeLists.txt +++ b/server/core/test/CMakeLists.txt @@ -1,40 +1,47 @@ -add_executable(test_atomic testatomic.cc) -add_executable(test_adminusers testadminusers.cc) -add_executable(test_buffer testbuffer.cc) -add_executable(test_dcb testdcb.cc) -add_executable(test_filter testfilter.cc) -add_executable(test_hash testhash.cc) -add_executable(test_hint testhint.cc) -add_executable(test_log testlog.cc) -add_executable(test_logorder testlogorder.cc) -add_executable(test_logthrottling testlogthrottling.cc) -add_executable(test_modutil testmodutil.cc) -add_executable(test_poll testpoll.cc) -add_executable(test_semaphore testsemaphore.cc) -add_executable(test_server testserver.cc) -add_executable(test_service testservice.cc) -add_executable(test_spinlock testspinlock.cc) -add_executable(test_thread testthread.cc) -add_executable(test_trxcompare testtrxcompare.cc ../../../query_classifier/test/testreader.cc) -add_executable(test_trxtracking testtrxtracking.cc) -add_executable(test_users testusers.cc) -add_executable(test_utils testutils.cc) -add_executable(testmaxscalepcre2 testmaxscalepcre2.cc) -add_executable(testmodulecmd testmodulecmd.cc) -add_executable(testconfig testconfig.cc) -add_executable(trxboundaryparser_profile trxboundaryparser_profile.cc) -add_executable(testjson testjson.cc) -add_executable(testhttp testhttp.cc) -target_link_libraries(test_atomic maxscale-common) +add_executable(profile_trxboundaryparser profile_trxboundaryparser.cc) +add_executable(test_adminusers test_adminusers.cc) +add_executable(test_atomic test_atomic.cc) +add_executable(test_buffer test_buffer.cc) +add_executable(test_config test_config.cc) +add_executable(test_dcb test_dcb.cc) +add_executable(test_filter test_filter.cc) +add_executable(test_hash test_hash.cc) +add_executable(test_hint test_hint.cc) +add_executable(test_http test_http.cc) +add_executable(test_json test_json.cc) +add_executable(test_log test_log.cc) +add_executable(test_logorder test_logorder.cc) +add_executable(test_logthrottling test_logthrottling.cc) +add_executable(test_maxscalepcre2 test_maxscalepcre2.cc) +add_executable(test_modulecmd test_modulecmd.cc) +add_executable(test_modutil test_modutil.cc) +add_executable(test_poll test_poll.cc) +add_executable(test_semaphore test_semaphore.cc) +add_executable(test_server test_server.cc) +add_executable(test_service test_service.cc) +add_executable(test_spinlock test_spinlock.cc) +add_executable(test_thread test_thread.cc) +add_executable(test_trxcompare test_trxcompare.cc ../../../query_classifier/test/testreader.cc) +add_executable(test_trxtracking test_trxtracking.cc) +add_executable(test_users test_users.cc) +add_executable(test_utils test_utils.cc) + +target_link_libraries(profile_trxboundaryparser maxscale-common) target_link_libraries(test_adminusers maxscale-common) +target_link_libraries(test_atomic maxscale-common) target_link_libraries(test_buffer maxscale-common) +target_link_libraries(test_config maxscale-common) target_link_libraries(test_dcb maxscale-common) target_link_libraries(test_filter maxscale-common) target_link_libraries(test_hash maxscale-common) target_link_libraries(test_hint maxscale-common) +target_link_libraries(test_http maxscale-common) +target_link_libraries(test_json maxscale-common) target_link_libraries(test_log maxscale-common) target_link_libraries(test_logorder maxscale-common) target_link_libraries(test_logthrottling maxscale-common) +target_link_libraries(test_maxscalepcre2 maxscale-common) +target_link_libraries(test_modulecmd maxscale-common) target_link_libraries(test_modutil maxscale-common) target_link_libraries(test_poll maxscale-common) target_link_libraries(test_semaphore maxscale-common) @@ -46,45 +53,40 @@ target_link_libraries(test_trxcompare maxscale-common) target_link_libraries(test_trxtracking maxscale-common) target_link_libraries(test_users maxscale-common) target_link_libraries(test_utils maxscale-common) -target_link_libraries(testmaxscalepcre2 maxscale-common) -target_link_libraries(testmodulecmd maxscale-common) -target_link_libraries(testconfig maxscale-common) -target_link_libraries(trxboundaryparser_profile maxscale-common) -target_link_libraries(testjson maxscale-common) -target_link_libraries(testhttp maxscale-common) -add_test(TestAtomic test_atomic) -add_test(TestAdminUsers test_adminusers) -add_test(TestBuffer test_buffer) -add_test(TestDCB test_dcb) -add_test(TestFilter test_filter) -add_test(TestHash test_hash) -add_test(TestHint test_hint) -add_test(TestLog test_log) -add_test(NAME TestLogOrder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh 200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log) -add_test(TestLogThrottling test_logthrottling) -add_test(TestMaxScalePCRE2 testmaxscalepcre2) -add_test(TestModutil test_modutil) -add_test(NAME TestMaxPasswd COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/testmaxpasswd.sh) -add_test(TestPoll test_poll) -add_test(TestSemaphore test_semaphore) -add_test(TestServer test_server) -add_test(TestService test_service) -add_test(TestSpinlock test_spinlock) -add_test(TestThread test_thread) -add_test(TestUsers test_users) -add_test(TestUtils test_utils) -add_test(TestModulecmd testmodulecmd) -add_test(TestConfig testconfig) -add_test(TestTrxTracking test_trxtracking) -add_test(TestTrxCompare_Create test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/create.test) -add_test(TestTrxCompare_Delete test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/delete.test) -add_test(TestTrxCompare_Insert test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/insert.test) -add_test(TestTrxCompare_Join test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/join.test) -add_test(TestTrxCompare_Select test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/select.test) -add_test(TestTrxCompare_Set test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/set.test) -add_test(TestTrxCompare_Update test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/update.test) -add_test(TestTrxCompare_MaxScale test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/maxscale.test) -add_test(TestJson testjson) -add_test(TestHttp testhttp) + +add_test(test_adminusers test_adminusers) +add_test(test_atomic test_atomic) +add_test(test_buffer test_buffer) +add_test(test_config testconfig) +add_test(test_dcb test_dcb) +add_test(test_filter test_filter) +add_test(test_hash test_hash) +add_test(test_hint test_hint) +add_test(test_http testhttp) +add_test(test_json testjson) +add_test(test_log test_log) +add_test(NAME test_logorder COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/logorder.sh 200 0 1000 ${CMAKE_CURRENT_BINARY_DIR}/logorder.log) +add_test(test_logthrottling test_logthrottling) +add_test(NAME test_maxpasswd COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/test_maxpasswd.sh) +add_test(test_maxscalepcre2 testmaxscalepcre2) +add_test(test_modulecmd testmodulecmd) +add_test(test_modutil test_modutil) +add_test(test_poll test_poll) +add_test(test_semaphore test_semaphore) +add_test(test_server test_server) +add_test(test_service test_service) +add_test(test_spinlock test_spinlock) +add_test(test_thread test_thread) +add_test(test_trxcompare_create test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/create.test) +add_test(test_trxcompare_delete test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/delete.test) +add_test(test_trxcompare_insert test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/insert.test) +add_test(test_trxcompare_join test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/join.test) +add_test(test_trxcompare_select test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/select.test) +add_test(test_trxcompare_set test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/set.test) +add_test(test_trxcompare_update test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/update.test) +add_test(test_trxcompare_maxscale test_trxcompare ${CMAKE_CURRENT_SOURCE_DIR}/../../../query_classifier/test/maxscale.test) +add_test(test_trxtracking test_trxtracking) +add_test(test_users test_users) +add_test(test_utils test_utils) add_subdirectory(rest-api) diff --git a/server/core/test/trxboundaryparser_profile.cc b/server/core/test/profile_trxboundaryparser.cc similarity index 100% rename from server/core/test/trxboundaryparser_profile.cc rename to server/core/test/profile_trxboundaryparser.cc diff --git a/server/core/test/testadminusers.cc b/server/core/test/test_adminusers.cc similarity index 100% rename from server/core/test/testadminusers.cc rename to server/core/test/test_adminusers.cc diff --git a/server/core/test/testatomic.cc b/server/core/test/test_atomic.cc similarity index 100% rename from server/core/test/testatomic.cc rename to server/core/test/test_atomic.cc diff --git a/server/core/test/testbuffer.cc b/server/core/test/test_buffer.cc similarity index 100% rename from server/core/test/testbuffer.cc rename to server/core/test/test_buffer.cc diff --git a/server/core/test/testconfig.cc b/server/core/test/test_config.cc similarity index 100% rename from server/core/test/testconfig.cc rename to server/core/test/test_config.cc diff --git a/server/core/test/testdcb.cc b/server/core/test/test_dcb.cc similarity index 100% rename from server/core/test/testdcb.cc rename to server/core/test/test_dcb.cc diff --git a/server/core/test/testfilter.cc b/server/core/test/test_filter.cc similarity index 100% rename from server/core/test/testfilter.cc rename to server/core/test/test_filter.cc diff --git a/server/core/test/testhash.cc b/server/core/test/test_hash.cc similarity index 100% rename from server/core/test/testhash.cc rename to server/core/test/test_hash.cc diff --git a/server/core/test/testhint.cc b/server/core/test/test_hint.cc similarity index 100% rename from server/core/test/testhint.cc rename to server/core/test/test_hint.cc diff --git a/server/core/test/testhttp.cc b/server/core/test/test_http.cc similarity index 100% rename from server/core/test/testhttp.cc rename to server/core/test/test_http.cc diff --git a/server/core/test/testjson.cc b/server/core/test/test_json.cc similarity index 100% rename from server/core/test/testjson.cc rename to server/core/test/test_json.cc diff --git a/server/core/test/testlog.cc b/server/core/test/test_log.cc similarity index 100% rename from server/core/test/testlog.cc rename to server/core/test/test_log.cc diff --git a/server/core/test/testlogorder.cc b/server/core/test/test_logorder.cc similarity index 100% rename from server/core/test/testlogorder.cc rename to server/core/test/test_logorder.cc diff --git a/server/core/test/testlogthrottling.cc b/server/core/test/test_logthrottling.cc similarity index 100% rename from server/core/test/testlogthrottling.cc rename to server/core/test/test_logthrottling.cc diff --git a/server/core/test/testmaxpasswd.sh b/server/core/test/test_maxpasswd.sh similarity index 100% rename from server/core/test/testmaxpasswd.sh rename to server/core/test/test_maxpasswd.sh diff --git a/server/core/test/testmaxscalepcre2.cc b/server/core/test/test_maxscalepcre2.cc similarity index 100% rename from server/core/test/testmaxscalepcre2.cc rename to server/core/test/test_maxscalepcre2.cc diff --git a/server/core/test/testmodulecmd.cc b/server/core/test/test_modulecmd.cc similarity index 100% rename from server/core/test/testmodulecmd.cc rename to server/core/test/test_modulecmd.cc diff --git a/server/core/test/testmodutil.cc b/server/core/test/test_modutil.cc similarity index 100% rename from server/core/test/testmodutil.cc rename to server/core/test/test_modutil.cc diff --git a/server/core/test/testpoll.cc b/server/core/test/test_poll.cc similarity index 100% rename from server/core/test/testpoll.cc rename to server/core/test/test_poll.cc diff --git a/server/core/test/testsemaphore.cc b/server/core/test/test_semaphore.cc similarity index 100% rename from server/core/test/testsemaphore.cc rename to server/core/test/test_semaphore.cc diff --git a/server/core/test/testserver.cc b/server/core/test/test_server.cc similarity index 100% rename from server/core/test/testserver.cc rename to server/core/test/test_server.cc diff --git a/server/core/test/testservice.cc b/server/core/test/test_service.cc similarity index 100% rename from server/core/test/testservice.cc rename to server/core/test/test_service.cc diff --git a/server/core/test/testsession.cc b/server/core/test/test_session.cc similarity index 100% rename from server/core/test/testsession.cc rename to server/core/test/test_session.cc diff --git a/server/core/test/testspinlock.cc b/server/core/test/test_spinlock.cc similarity index 100% rename from server/core/test/testspinlock.cc rename to server/core/test/test_spinlock.cc diff --git a/server/core/test/testthread.cc b/server/core/test/test_thread.cc similarity index 100% rename from server/core/test/testthread.cc rename to server/core/test/test_thread.cc diff --git a/server/core/test/testtrxcompare.cc b/server/core/test/test_trxcompare.cc similarity index 100% rename from server/core/test/testtrxcompare.cc rename to server/core/test/test_trxcompare.cc diff --git a/server/core/test/testtrxtracking.cc b/server/core/test/test_trxtracking.cc similarity index 100% rename from server/core/test/testtrxtracking.cc rename to server/core/test/test_trxtracking.cc diff --git a/server/core/test/testusers.cc b/server/core/test/test_users.cc similarity index 100% rename from server/core/test/testusers.cc rename to server/core/test/test_users.cc diff --git a/server/core/test/testutils.cc b/server/core/test/test_utils.cc similarity index 100% rename from server/core/test/testutils.cc rename to server/core/test/test_utils.cc