Split up the add/removal test into cases

Helps vs the timeout stacking and is generally a good idea.

Change-Id: I0fe34e6b751872a09fa9d33c47e351bd3479bb92

diff --git a/tests/api_tests/test_api_add_remove_user.cpp b/tests/api_tests/test_api_add_remove_user.cpp
index 6e1a16910c3e9a622bec7042e134b24dbc44b0b3..bb4814b184676a1d11c3a7689d4c1fb3b5bdca4a 100644 (file)
--- a/tests/api_tests/test_api_add_remove_user.cpp
+++ b/tests/api_tests/test_api_add_remove_user.cpp
@@ -9,10 +9,9 @@
 #include "test_hlp.hpp"
 
 
-const int  action_items = 20;
-
-TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
 
+TEST(subsession_add_remove_user_test, BasicRegularDir) {
+       const int action_items = 2;
        using ud_t = ud_data_t<std::array<api_call_res_t, action_items>>;
 
        ud_t ud_data = { .loop = g_main_loop_new(NULL, FALSE),
@@ -29,6 +28,19 @@ TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
                                                        .desc = "Check if remove " + std::string(TestUserStr::user_1) + " is successful (regular dir backend)",
                                                        .cb_expected = SUBSESSION_ERROR_NONE,
                                                        .cb_desc = "Check if remove " + std::string(TestUserStr::user_1) + " callback is successful (regular dir backend)", },
+               }
+       };
+
+       loop_run_for_test(callback_pending<ud_t, api_call_res_t>, &ud_data, ud_data.loop);
+       summarize<action_items>(ud_data.results);
+}
+
+TEST(subsession_add_remove_user_test, BasicRegularDirLongName) {
+       const int action_items = 2;
+       using ud_t = ud_data_t<std::array<api_call_res_t, action_items>>;
+
+       ud_t ud_data = { .loop = g_main_loop_new(NULL, FALSE),
+               .results = std::array<api_call_res_t, action_items>  {
 
                        api_call_res_t{ .call_result = std::move(subsession_add_user_l<subsession_5001>( TestUserStr::user_19)),
                                                        .expected = SUBSESSION_ERROR_NONE,
@@ -41,9 +53,20 @@ TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
                                                        .desc = "Check if remove " + std::string(TestUserStr::user_19) + " is successful (regular dir backend)",
                                                        .cb_expected = SUBSESSION_ERROR_NONE,
                                                        .cb_desc = "Check if remove " + std::string(TestUserStr::user_19) + " callback is successful (regular dir backend)", },
+               }
+       };
+
+       loop_run_for_test(callback_pending<ud_t, api_call_res_t>, &ud_data, ud_data.loop);
+       summarize<action_items>(ud_data.results);
+}
 
-                       // Fixed-size backend
+TEST(subsession_add_remove_user_test, BasicFixedSize) {
 
+       const int action_items = 2;
+       using ud_t = ud_data_t<std::array<api_call_res_t, action_items>>;
+
+       ud_t ud_data = { .loop = g_main_loop_new(NULL, FALSE),
+               .results = std::array<api_call_res_t, action_items>  {
                        api_call_res_t{ .call_result = std::move(subsession_add_user_fixed_size_l<subsession_5001>( TestUserStr::user_2, 10*1024)),
                                                        .expected = SUBSESSION_ERROR_NONE,
                                                        .desc = "Check if add  " + std::string(TestUserStr::user_2) + " is successful (fixed-size backend, 10 MB)",
@@ -55,6 +78,21 @@ TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
                                                        .desc = "Check if remove " + std::string(TestUserStr::user_2) + " is successful (fixed-size backend)",
                                                        .cb_expected = SUBSESSION_ERROR_NONE,
                                                        .cb_desc = "Check if remove " + std::string(TestUserStr::user_2) + " callback is successful (fixed-size backend)", },
+               }
+       };
+
+       loop_run_for_test(callback_pending<ud_t, api_call_res_t>, &ud_data, ud_data.loop);
+       summarize<action_items>(ud_data.results);
+}
+
+
+TEST(subsession_add_remove_user_test, ReuseNameFixedSizeSameSize) {
+
+       const int action_items = 6;
+       using ud_t = ud_data_t<std::array<api_call_res_t, action_items>>;
+
+       ud_t ud_data = { .loop = g_main_loop_new(NULL, FALSE),
+               .results = std::array<api_call_res_t, action_items>  {
 
                        api_call_res_t{ .call_result = std::move(subsession_add_user_fixed_size_l<subsession_5001>( TestUserStr::user_3, 25*1024)),
                                                        .expected = SUBSESSION_ERROR_NONE,
@@ -95,8 +133,21 @@ TEST(subsession_add_remove_user_test, APIAddRemoveUserTest) {
                                                        .desc = "Check if remove " + std::string(TestUserStr::user_3) + " is successful",
                                                        .cb_expected = SUBSESSION_ERROR_NONE,
                                                        .cb_desc = "Check if remove " + std::string(TestUserStr::user_3) + " callback is successful", },
+               }
+       };
+
+       loop_run_for_test(callback_pending<ud_t, api_call_res_t>, &ud_data, ud_data.loop);
+       summarize<action_items>(ud_data.results);
+}
+
 
-                       // Both backends reusing the same name alternatingly
+TEST(subsession_add_remove_user_test, ReuseNameAlternatingBackends) {
+
+       const int action_items = 8;
+       using ud_t = ud_data_t<std::array<api_call_res_t, action_items>>;
+
+       ud_t ud_data = { .loop = g_main_loop_new(NULL, FALSE),
+               .results = std::array<api_call_res_t, action_items>  {
 
                        api_call_res_t{ .call_result = std::move(subsession_add_user_fixed_size_l<subsession_5001>( TestUserStr::user_5, 10*1024)),
                                                        .expected = SUBSESSION_ERROR_NONE,