Default user on libsessiond

Fix test to check default user id
Minor fix in clientExample

Change-Id: I1b95e3e6f77141804d35f04f4c2169b40dc244b5

diff --git a/clientExample/app/main.cpp b/clientExample/app/main.cpp
index 4655bc5..69c1cb9 100644 (file)
--- a/clientExample/app/main.cpp
+++ b/clientExample/app/main.cpp
@@ -254,8 +254,8 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        }
 
-       printf("No of registered users [%d/%zu]...", registered_users, usernames.size());
-       if (usernames.size() == (unsigned) registered_users)
+       printf("No of users [%zu]...", usernames.size());
+       if (usernames.size() == (unsigned) (registered_users-1))
                green_print("ok");
        else
        {
@@ -282,7 +282,7 @@ int main(int argc, char *argv[])
        }
 
        if (!switch_to_each_user_to_generate_events()
-       ||  !check_callbacks_called(registered_users))
+       ||  !check_callbacks_called((registered_users-1)))
                return EXIT_FAILURE;
 
        ///===================================///

diff --git a/libsessiond/target_test/test_api_get_user_list.cpp b/libsessiond/target_test/test_api_get_user_list.cpp
index f13f331..eebcf39 100644 (file)
--- a/libsessiond/target_test/test_api_get_user_list.cpp
+++ b/libsessiond/target_test/test_api_get_user_list.cpp
@@ -107,11 +107,11 @@ TEST(subsession_get_user_list, GetUserListOk) {
 
        loop_run_for_test(callback_pending_ud<ud_get_user_t>,(gpointer*)&ud, ud.loop);
 
-       summarize_results_for_get_user_list(std::get<get_user::get_user_list_0>(ud.t), std::array<std::string, 0>());
-       std::array<std::string, 2> arr{std::string(TestUserStr::user_1), std::string(TestUserStr::user_2)};
+       summarize_results_for_get_user_list(std::get<get_user::get_user_list_0>(ud.t), std::array<std::string, 1>({""}));
+       std::array<std::string, 3> arr{std::string(TestUserStr::user_0), std::string(TestUserStr::user_1), std::string(TestUserStr::user_2)};
 
-       summarize_results_for_get_user_list<std::array<std::string, 2>>(std::get<get_user::get_user_list_1_2>(ud.t), arr);
-       summarize_results_for_counted_only_get_user_list(std::get<get_user::get_user_list_1_2_count_only>(ud.t), 2);
+       summarize_results_for_get_user_list<std::array<std::string, 3>>(std::get<get_user::get_user_list_1_2>(ud.t), arr);
+       summarize_results_for_counted_only_get_user_list(std::get<get_user::get_user_list_1_2_count_only>(ud.t), 3);
        summarize_results<get_user::action_items>(results);
 }