diff options
| author | Stefan Boberg <[email protected]> | 2026-03-02 09:37:14 +0100 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2026-03-02 09:37:14 +0100 |
| commit | d604351cb5dc3032a7cb8c84d6ad5f1480325e5c (patch) | |
| tree | ecf3e5a0de3ae58e2f81988b72ae520a347d4433 /src/zenserver-test | |
| parent | added `--verbose` option to zenserver-test and `xmake test` (#798) (diff) | |
| download | zen-d604351cb5dc3032a7cb8c84d6ad5f1480325e5c.tar.xz zen-d604351cb5dc3032a7cb8c84d6ad5f1480325e5c.zip | |
Add test suites (#799)
Makes all test cases part of a test suite. Test suites are named after the module and the name of the file containing the implementation of the test.
* This allows for better and more predictable filtering of which test cases to run which should also be able to reduce the time CI spends in tests since it can filter on the tests for that particular module.
Also improves `xmake test` behaviour:
* instead of an explicit list of projects just enumerate the test projects which are available based on build system state
* also introduces logic to avoid running `xmake config` unnecessarily which would invalidate the existing build and do lots of unnecessary work since dependencies were invalidated by the updated config
* also invokes build only for the chosen test targets
As a bonus, also adds `xmake sln --open` which allows opening IDE after generation of solution/xmake project is done.
Diffstat (limited to 'src/zenserver-test')
| -rw-r--r-- | src/zenserver-test/buildstore-tests.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver-test/cache-tests.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver-test/cacherequests.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver-test/function-tests.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver-test/hub-tests.cpp | 6 | ||||
| -rw-r--r-- | src/zenserver-test/projectstore-tests.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver-test/workspace-tests.cpp | 4 | ||||
| -rw-r--r-- | src/zenserver-test/zenserver-test.cpp | 5 |
8 files changed, 32 insertions, 3 deletions
diff --git a/src/zenserver-test/buildstore-tests.cpp b/src/zenserver-test/buildstore-tests.cpp index 7cd31db06..cf9b10896 100644 --- a/src/zenserver-test/buildstore-tests.cpp +++ b/src/zenserver-test/buildstore-tests.cpp @@ -27,6 +27,8 @@ namespace zen::tests { using namespace std::literals; +TEST_SUITE_BEGIN("server.buildstore"); + TEST_CASE("buildstore.blobs") { std::filesystem::path SystemRootPath = TestEnv.CreateNewTestDir(); @@ -700,5 +702,7 @@ TEST_CASE("buildstore.cache") } } +TEST_SUITE_END(); + } // namespace zen::tests #endif diff --git a/src/zenserver-test/cache-tests.cpp b/src/zenserver-test/cache-tests.cpp index 745a89253..334dd04ab 100644 --- a/src/zenserver-test/cache-tests.cpp +++ b/src/zenserver-test/cache-tests.cpp @@ -23,6 +23,8 @@ namespace zen::tests { +TEST_SUITE_BEGIN("server.cache"); + TEST_CASE("zcache.basic") { using namespace std::literals; @@ -2663,6 +2665,8 @@ TEST_CASE("zcache.batchoperations") } } +TEST_SUITE_END(); + } // namespace zen::tests #endif diff --git a/src/zenserver-test/cacherequests.cpp b/src/zenserver-test/cacherequests.cpp index 46339aebb..f5302a359 100644 --- a/src/zenserver-test/cacherequests.cpp +++ b/src/zenserver-test/cacherequests.cpp @@ -1037,6 +1037,8 @@ namespace zen { namespace cacherequests { static CompressedBuffer MakeCompressedBuffer(size_t Size) { return CompressedBuffer::Compress(SharedBuffer(IoBuffer(Size))); }; + TEST_SUITE_BEGIN("server.cacherequests"); + TEST_CASE("cacherequests.put.cache.records") { PutCacheRecordsRequest EmptyRequest; @@ -1458,5 +1460,7 @@ namespace zen { namespace cacherequests { "!default!", Invalid)); } + + TEST_SUITE_END(); #endif }} // namespace zen::cacherequests diff --git a/src/zenserver-test/function-tests.cpp b/src/zenserver-test/function-tests.cpp index 559387fa2..82848c6ad 100644 --- a/src/zenserver-test/function-tests.cpp +++ b/src/zenserver-test/function-tests.cpp @@ -16,6 +16,8 @@ namespace zen::tests { using namespace std::literals; +TEST_SUITE_BEGIN("server.function"); + TEST_CASE("function.run") { std::filesystem::path TestDir = TestEnv.CreateNewTestDir(); @@ -29,6 +31,8 @@ TEST_CASE("function.run") Instance.WaitUntilReady(); } +TEST_SUITE_END(); + } // namespace zen::tests #endif diff --git a/src/zenserver-test/hub-tests.cpp b/src/zenserver-test/hub-tests.cpp index bd85a5020..11531e30f 100644 --- a/src/zenserver-test/hub-tests.cpp +++ b/src/zenserver-test/hub-tests.cpp @@ -24,7 +24,7 @@ namespace zen::tests::hub { using namespace std::literals; -TEST_SUITE_BEGIN("hub.lifecycle"); +TEST_SUITE_BEGIN("server.hub"); TEST_CASE("hub.lifecycle.basic") { @@ -230,8 +230,6 @@ TEST_CASE("hub.lifecycle.children") } } -TEST_SUITE_END(); - TEST_CASE("hub.consul.lifecycle" * doctest::skip()) { zen::consul::ConsulProcess ConsulProc; @@ -248,5 +246,7 @@ TEST_CASE("hub.consul.lifecycle" * doctest::skip()) ConsulProc.StopConsulAgent(); } +TEST_SUITE_END(); + } // namespace zen::tests::hub #endif diff --git a/src/zenserver-test/projectstore-tests.cpp b/src/zenserver-test/projectstore-tests.cpp index 487832405..c73910aaa 100644 --- a/src/zenserver-test/projectstore-tests.cpp +++ b/src/zenserver-test/projectstore-tests.cpp @@ -27,6 +27,8 @@ namespace zen::tests { using namespace std::literals; +TEST_SUITE_BEGIN("server.projectstore"); + TEST_CASE("project.basic") { using namespace std::literals; @@ -1053,6 +1055,8 @@ TEST_CASE("project.rpcappendop") } } +TEST_SUITE_END(); + } // namespace zen::tests #endif diff --git a/src/zenserver-test/workspace-tests.cpp b/src/zenserver-test/workspace-tests.cpp index aedadf0c3..655f28872 100644 --- a/src/zenserver-test/workspace-tests.cpp +++ b/src/zenserver-test/workspace-tests.cpp @@ -73,6 +73,8 @@ GenerateFolderContent2(const std::filesystem::path& RootPath) return Result; } +TEST_SUITE_BEGIN("server.workspace"); + TEST_CASE("workspaces.create") { using namespace std::literals; @@ -537,5 +539,7 @@ TEST_CASE("workspaces.share") CHECK(Client.Get(fmt::format("/ws/{}", WorkspaceId)).StatusCode == HttpResponseCode::NotFound); } +TEST_SUITE_END(); + } // namespace zen::tests #endif diff --git a/src/zenserver-test/zenserver-test.cpp b/src/zenserver-test/zenserver-test.cpp index c7ce633d3..bd36d731f 100644 --- a/src/zenserver-test/zenserver-test.cpp +++ b/src/zenserver-test/zenserver-test.cpp @@ -123,6 +123,7 @@ main(int argc, char** argv) ZEN_INFO("Running tests...(base dir: '{}')", TestBaseDir); zen::testing::TestRunner Runner; + Runner.SetDefaultSuiteFilter("server.*"); Runner.ApplyCommandLine(argc, argv); return Runner.Run(); @@ -130,6 +131,8 @@ main(int argc, char** argv) namespace zen::tests { +TEST_SUITE_BEGIN("server.zenserver"); + TEST_CASE("default.single") { std::filesystem::path TestDir = TestEnv.CreateNewTestDir(); @@ -336,6 +339,8 @@ TEST_CASE("http.package") CHECK_EQ(ResponsePackage, TestPackage); } +TEST_SUITE_END(); + # if 0 TEST_CASE("lifetime.owner") { |