diff --git a/.gitignore b/.gitignore index d0828e4..097e5ff 100644 --- a/.gitignore +++ b/.gitignore @@ -7,9 +7,9 @@ build/ .deps/ .dirstamp .libs/ -test/libsdbus-c++_unittests -test/libsdbus-c++_integrationtests -test/run-test-on-device.sh +tests/libsdbus-c++_unittests +tests/libsdbus-c++_integrationtests +tests/run-test-on-device.sh #eclipse .cproject diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b1bf3f..ec02543 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,7 +121,7 @@ option(BUILD_TESTS "Build and install tests (default OFF)" OFF) if(BUILD_TESTS) enable_testing() - add_subdirectory("${CMAKE_SOURCE_DIR}/test") + add_subdirectory("${CMAKE_SOURCE_DIR}/tests") endif() #---------------------------------- diff --git a/docs/using-sdbus-c++.md b/docs/using-sdbus-c++.md index 9e7a75d..7bc149d 100644 --- a/docs/using-sdbus-c++.md +++ b/docs/using-sdbus-c++.md @@ -882,7 +882,7 @@ sdbus-c++ stub generator can generate stub code for server-side async methods. W ``` -For a real example of a server-side asynchronous D-Bus method, please look at sdbus-c++ [stress tests](/test/stresstests). +For a real example of a server-side asynchronous D-Bus method, please look at sdbus-c++ [stress tests](/tests/stresstests). Asynchronous client-side methods -------------------------------- @@ -999,7 +999,7 @@ For each client-side async method, a corresponding `onReply` pure vi So in the specific example above, the stub generator will generate a `Concatenator_proxy` class similar to one shown in a [dedicated section above](#concatenator-client-glueh), with the difference that it will also generate an additional `virtual void onConcatenateReply(const sdbus::Error* error, const std::string& concatenatedString);` method, which we shall override in derived `ConcatenatorProxy`. -For a real example of a client-side asynchronous D-Bus method, please look at sdbus-c++ [stress tests](/test/stresstests). +For a real example of a client-side asynchronous D-Bus method, please look at sdbus-c++ [stress tests](/tests/stresstests). Using D-Bus properties ---------------------- diff --git a/test/CMakeLists.txt b/tests/CMakeLists.txt similarity index 100% rename from test/CMakeLists.txt rename to tests/CMakeLists.txt diff --git a/test/googletest-download/CMakeLists.txt.in b/tests/googletest-download/CMakeLists.txt.in similarity index 100% rename from test/googletest-download/CMakeLists.txt.in rename to tests/googletest-download/CMakeLists.txt.in diff --git a/test/integrationtests/AdaptorAndProxy_test.cpp b/tests/integrationtests/AdaptorAndProxy_test.cpp similarity index 100% rename from test/integrationtests/AdaptorAndProxy_test.cpp rename to tests/integrationtests/AdaptorAndProxy_test.cpp diff --git a/test/integrationtests/Connection_test.cpp b/tests/integrationtests/Connection_test.cpp similarity index 100% rename from test/integrationtests/Connection_test.cpp rename to tests/integrationtests/Connection_test.cpp diff --git a/test/integrationtests/TestingAdaptor.h b/tests/integrationtests/TestingAdaptor.h similarity index 100% rename from test/integrationtests/TestingAdaptor.h rename to tests/integrationtests/TestingAdaptor.h diff --git a/test/integrationtests/TestingProxy.h b/tests/integrationtests/TestingProxy.h similarity index 100% rename from test/integrationtests/TestingProxy.h rename to tests/integrationtests/TestingProxy.h diff --git a/test/integrationtests/adaptor-glue.h b/tests/integrationtests/adaptor-glue.h similarity index 100% rename from test/integrationtests/adaptor-glue.h rename to tests/integrationtests/adaptor-glue.h diff --git a/test/integrationtests/defs.h b/tests/integrationtests/defs.h similarity index 100% rename from test/integrationtests/defs.h rename to tests/integrationtests/defs.h diff --git a/test/integrationtests/files/org.sdbuscpp.integrationtests.conf b/tests/integrationtests/files/org.sdbuscpp.integrationtests.conf similarity index 100% rename from test/integrationtests/files/org.sdbuscpp.integrationtests.conf rename to tests/integrationtests/files/org.sdbuscpp.integrationtests.conf diff --git a/test/integrationtests/proxy-glue.h b/tests/integrationtests/proxy-glue.h similarity index 100% rename from test/integrationtests/proxy-glue.h rename to tests/integrationtests/proxy-glue.h diff --git a/test/integrationtests/sdbus-c++-integration-tests.cpp b/tests/integrationtests/sdbus-c++-integration-tests.cpp similarity index 100% rename from test/integrationtests/sdbus-c++-integration-tests.cpp rename to tests/integrationtests/sdbus-c++-integration-tests.cpp diff --git a/test/perftests/client.cpp b/tests/perftests/client.cpp similarity index 100% rename from test/perftests/client.cpp rename to tests/perftests/client.cpp diff --git a/test/perftests/files/org.sdbuscpp.perftests.conf b/tests/perftests/files/org.sdbuscpp.perftests.conf similarity index 100% rename from test/perftests/files/org.sdbuscpp.perftests.conf rename to tests/perftests/files/org.sdbuscpp.perftests.conf diff --git a/test/perftests/org.sdbuscpp.perftests.xml b/tests/perftests/org.sdbuscpp.perftests.xml similarity index 100% rename from test/perftests/org.sdbuscpp.perftests.xml rename to tests/perftests/org.sdbuscpp.perftests.xml diff --git a/test/perftests/perftests-adaptor.h b/tests/perftests/perftests-adaptor.h similarity index 100% rename from test/perftests/perftests-adaptor.h rename to tests/perftests/perftests-adaptor.h diff --git a/test/perftests/perftests-proxy.h b/tests/perftests/perftests-proxy.h similarity index 100% rename from test/perftests/perftests-proxy.h rename to tests/perftests/perftests-proxy.h diff --git a/test/perftests/server.cpp b/tests/perftests/server.cpp similarity index 100% rename from test/perftests/server.cpp rename to tests/perftests/server.cpp diff --git a/test/stresstests/celsius-thermometer-adaptor.h b/tests/stresstests/celsius-thermometer-adaptor.h similarity index 100% rename from test/stresstests/celsius-thermometer-adaptor.h rename to tests/stresstests/celsius-thermometer-adaptor.h diff --git a/test/stresstests/celsius-thermometer-proxy.h b/tests/stresstests/celsius-thermometer-proxy.h similarity index 100% rename from test/stresstests/celsius-thermometer-proxy.h rename to tests/stresstests/celsius-thermometer-proxy.h diff --git a/test/stresstests/concatenator-adaptor.h b/tests/stresstests/concatenator-adaptor.h similarity index 100% rename from test/stresstests/concatenator-adaptor.h rename to tests/stresstests/concatenator-adaptor.h diff --git a/test/stresstests/concatenator-proxy.h b/tests/stresstests/concatenator-proxy.h similarity index 100% rename from test/stresstests/concatenator-proxy.h rename to tests/stresstests/concatenator-proxy.h diff --git a/test/stresstests/fahrenheit-thermometer-adaptor.h b/tests/stresstests/fahrenheit-thermometer-adaptor.h similarity index 100% rename from test/stresstests/fahrenheit-thermometer-adaptor.h rename to tests/stresstests/fahrenheit-thermometer-adaptor.h diff --git a/test/stresstests/fahrenheit-thermometer-proxy.h b/tests/stresstests/fahrenheit-thermometer-proxy.h similarity index 100% rename from test/stresstests/fahrenheit-thermometer-proxy.h rename to tests/stresstests/fahrenheit-thermometer-proxy.h diff --git a/test/stresstests/files/org.sdbuscpp.stresstests.conf b/tests/stresstests/files/org.sdbuscpp.stresstests.conf similarity index 100% rename from test/stresstests/files/org.sdbuscpp.stresstests.conf rename to tests/stresstests/files/org.sdbuscpp.stresstests.conf diff --git a/test/stresstests/org.sdbuscpp.stresstest.celsius.thermometer.xml b/tests/stresstests/org.sdbuscpp.stresstest.celsius.thermometer.xml similarity index 100% rename from test/stresstests/org.sdbuscpp.stresstest.celsius.thermometer.xml rename to tests/stresstests/org.sdbuscpp.stresstest.celsius.thermometer.xml diff --git a/test/stresstests/org.sdbuscpp.stresstest.concatenator.xml b/tests/stresstests/org.sdbuscpp.stresstest.concatenator.xml similarity index 100% rename from test/stresstests/org.sdbuscpp.stresstest.concatenator.xml rename to tests/stresstests/org.sdbuscpp.stresstest.concatenator.xml diff --git a/test/stresstests/org.sdbuscpp.stresstest.fahrenheit.thermometer.xml b/tests/stresstests/org.sdbuscpp.stresstest.fahrenheit.thermometer.xml similarity index 100% rename from test/stresstests/org.sdbuscpp.stresstest.fahrenheit.thermometer.xml rename to tests/stresstests/org.sdbuscpp.stresstest.fahrenheit.thermometer.xml diff --git a/test/stresstests/sdbus-c++-stress-tests.cpp b/tests/stresstests/sdbus-c++-stress-tests.cpp similarity index 100% rename from test/stresstests/sdbus-c++-stress-tests.cpp rename to tests/stresstests/sdbus-c++-stress-tests.cpp diff --git a/test/unittests/Connection_test.cpp b/tests/unittests/Connection_test.cpp similarity index 100% rename from test/unittests/Connection_test.cpp rename to tests/unittests/Connection_test.cpp diff --git a/test/unittests/Message_test.cpp b/tests/unittests/Message_test.cpp similarity index 100% rename from test/unittests/Message_test.cpp rename to tests/unittests/Message_test.cpp diff --git a/test/unittests/TypeTraits_test.cpp b/tests/unittests/TypeTraits_test.cpp similarity index 100% rename from test/unittests/TypeTraits_test.cpp rename to tests/unittests/TypeTraits_test.cpp diff --git a/test/unittests/Types_test.cpp b/tests/unittests/Types_test.cpp similarity index 100% rename from test/unittests/Types_test.cpp rename to tests/unittests/Types_test.cpp diff --git a/test/unittests/mocks/SdBusMock.h b/tests/unittests/mocks/SdBusMock.h similarity index 100% rename from test/unittests/mocks/SdBusMock.h rename to tests/unittests/mocks/SdBusMock.h diff --git a/test/unittests/sdbus-c++-unit-tests.cpp b/tests/unittests/sdbus-c++-unit-tests.cpp similarity index 100% rename from test/unittests/sdbus-c++-unit-tests.cpp rename to tests/unittests/sdbus-c++-unit-tests.cpp