pidgin/pidgin

Update the history manager tests to only use the default manager when necessary

20 months ago, Gary Kramlich
342d60f51380
Parents 66d473190e94
Children 94c31400486a
Update the history manager tests to only use the default manager when necessary

Testing Done:
Ran the unit tests a few times.

Reviewed at https://reviews.imfreedom.org/r/1923/
1 files changed, 42 insertions(+), 16 deletions(-)
  • +42 -16
    libpurple/tests/test_history_manager.c
    • --- a/libpurple/tests/test_history_manager.c Mon Oct 10 02:46:34 2022 -0500
    +++ b/libpurple/tests/test_history_manager.c Mon Oct 10 02:59:18 2022 -0500
    @@ -159,7 +159,7 @@
    GError *error = NULL;
    gboolean r = FALSE;
    - manager = purple_history_manager_get_default();
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    g_assert_true(PURPLE_IS_HISTORY_MANAGER(manager));
    adapter = test_purple_history_adapter_new();
    @@ -188,6 +188,7 @@
    /* Final clean ups. */
    g_clear_object(&adapter);
    + g_clear_object(&manager);
    }
    /******************************************************************************
    @@ -199,11 +200,13 @@
    GError *error = NULL;
    gboolean ret = FALSE;
    - manager = purple_history_manager_get_default();
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    ret = purple_history_manager_set_active(manager, NULL, &error);
    g_assert_no_error(error);
    g_assert_true(ret);
    +
    + g_clear_object(&manager);
    }
    static void
    @@ -212,12 +215,14 @@
    GError *error = NULL;
    gboolean ret = FALSE;
    - manager = purple_history_manager_get_default();
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    ret = purple_history_manager_set_active(manager, "foo", &error);
    g_assert_error(error, PURPLE_HISTORY_MANAGER_DOMAIN, 0);
    g_assert_false(ret);
    g_clear_error(&error);
    +
    + g_clear_object(&manager);
    }
    static void
    @@ -228,7 +233,7 @@
    gboolean r = FALSE;
    TestPurpleHistoryAdapter *ta = NULL;
    - manager = purple_history_manager_get_default();
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    /* Create the adapter and register it in the manager. */
    adapter = test_purple_history_adapter_new();
    @@ -264,6 +269,7 @@
    /* And our final cleanup. */
    g_clear_object(&adapter);
    + g_clear_object(&manager);
    }
    /******************************************************************************
    @@ -275,13 +281,15 @@
    GList *list = NULL;
    GError *error = NULL;
    - manager = purple_history_manager_get_default();
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    list = purple_history_manager_query(manager, "", &error);
    g_assert_error(error, PURPLE_HISTORY_MANAGER_DOMAIN, 0);
    g_clear_error(&error);
    g_assert_null(list);
    +
    + g_clear_object(&manager);
    }
    static void
    @@ -290,13 +298,15 @@
    GError *error = NULL;
    gboolean result = FALSE;
    - manager = purple_history_manager_get_default();
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    result = purple_history_manager_remove(manager, "", &error);
    g_assert_error(error, PURPLE_HISTORY_MANAGER_DOMAIN, 0);
    g_clear_error(&error);
    g_assert_false(result);
    +
    + g_clear_object(&manager);
    }
    static void
    @@ -308,7 +318,7 @@
    GError *error = NULL;
    gboolean result = FALSE;
    - manager = purple_history_manager_get_default();
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    message = g_object_new(PURPLE_TYPE_MESSAGE, NULL);
    account = purple_account_new("test", "test");
    @@ -330,6 +340,7 @@
    g_clear_object(&message);
    g_clear_object(&conversation);
    + g_clear_object(&manager);
    }
    /******************************************************************************
    @@ -337,13 +348,17 @@
    *****************************************************************************/
    static void
    test_purple_history_manager_adapter_query(void) {
    - PurpleHistoryManager *manager = purple_history_manager_get_default();
    - PurpleHistoryAdapter *adapter = test_purple_history_adapter_new();
    - TestPurpleHistoryAdapter *ta = TEST_PURPLE_HISTORY_ADAPTER(adapter);
    + PurpleHistoryManager *manager = NULL;
    + PurpleHistoryAdapter *adapter = NULL;
    + TestPurpleHistoryAdapter *ta = NULL;
    GList *list = NULL;
    GError *error = NULL;
    gboolean result = FALSE;
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    + adapter = test_purple_history_adapter_new();
    + ta = TEST_PURPLE_HISTORY_ADAPTER(adapter);
    +
    result = purple_history_manager_register(manager, adapter, &error);
    g_assert_no_error(error);
    g_assert_true(result);
    @@ -367,16 +382,21 @@
    g_assert_true(result);
    g_clear_object(&adapter);
    + g_clear_object(&manager);
    }
    static void
    test_purple_history_manager_adapter_remove(void) {
    - PurpleHistoryManager *manager = purple_history_manager_get_default();
    - PurpleHistoryAdapter *adapter = test_purple_history_adapter_new();
    - TestPurpleHistoryAdapter *ta = TEST_PURPLE_HISTORY_ADAPTER(adapter);
    + PurpleHistoryManager *manager = NULL;
    + PurpleHistoryAdapter *adapter = NULL;
    + TestPurpleHistoryAdapter *ta = NULL;
    GError *error = NULL;
    gboolean result = FALSE;
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    + adapter = test_purple_history_adapter_new();
    + ta = TEST_PURPLE_HISTORY_ADAPTER(adapter);
    +
    result = purple_history_manager_register(manager, adapter, &error);
    g_assert_no_error(error);
    g_assert_true(result);
    @@ -400,19 +420,24 @@
    g_assert_true(result);
    g_clear_object(&adapter);
    + g_clear_object(&manager);
    }
    static void
    test_purple_history_manager_adapter_write(void) {
    PurpleAccount *account = NULL;
    PurpleConversation *conversation = NULL;
    - PurpleHistoryManager *manager = purple_history_manager_get_default();
    - PurpleHistoryAdapter *adapter = test_purple_history_adapter_new();
    + PurpleHistoryManager *manager = NULL;
    + PurpleHistoryAdapter *adapter = NULL;
    PurpleMessage *message = NULL;
    - TestPurpleHistoryAdapter *ta = TEST_PURPLE_HISTORY_ADAPTER(adapter);
    + TestPurpleHistoryAdapter *ta = NULL;
    GError *error = NULL;
    gboolean result = FALSE;
    + manager = g_object_new(PURPLE_TYPE_HISTORY_MANAGER, NULL);
    + adapter = test_purple_history_adapter_new();
    + ta = TEST_PURPLE_HISTORY_ADAPTER(adapter);
    +
    result = purple_history_manager_register(manager, adapter, &error);
    g_assert_no_error(error);
    g_assert_true(result);
    @@ -448,6 +473,7 @@
    /* g_clear_object(&account); */
    g_clear_object(&conversation);
    + g_clear_object(&manager);
    }
    /******************************************************************************