pidgin/pidgin

When testing make sure we don't have an error before we check return values.

2021-01-03, Gary Kramlich
bdeaceebb0bd
Parents a0c11a532ee7
Children fa1a8ad13da4
When testing make sure we don't have an error before we check return values.

Testing Done:
Compiled and ran unit tests locally.

Reviewed at https://reviews.imfreedom.org/r/328/
3 files changed, 21 insertions(+), 15 deletions(-)
  • +3 -1
    libpurple/tests/test_credential_provider.c
  • +18 -13
    libpurple/tests/test_queued_output_stream.c
  • +0 -1
    libpurple/tests/test_smiley.c
    • --- a/libpurple/tests/test_credential_provider.c Sat Jan 02 23:24:44 2021 -0600
    +++ b/libpurple/tests/test_credential_provider.c Sun Jan 03 01:00:58 2021 -0600
    @@ -185,6 +185,7 @@
    PurpleCredentialProvider *provider = NULL;
    PurpleCredentialProviderClass *klass = NULL;
    GError *error = NULL;
    + gboolean ret = FALSE;
    provider = g_object_new(
    TEST_PURPLE_TYPE_CREDENTIAL_PROVIDER_EMPTY,
    @@ -198,8 +199,9 @@
    klass->write_password_async = test_purple_credential_provider_empty_write_password_async;
    klass->write_password_finish = test_purple_credential_provider_empty_write_password_finish;
    - g_assert_true(purple_credential_provider_is_valid(provider, &error));
    + ret = purple_credential_provider_is_valid(provider, &error);
    g_assert_no_error(error);
    + g_assert_true(ret);
    g_object_unref(G_OBJECT(provider));
    }
    --- a/libpurple/tests/test_queued_output_stream.c Sat Jan 02 23:24:44 2021 -0600
    +++ b/libpurple/tests/test_queued_output_stream.c Sun Jan 03 01:00:58 2021 -0600
    @@ -39,6 +39,7 @@
    GOutputStream *output;
    PurpleQueuedOutputStream *queued;
    GError *err = NULL;
    + gboolean ret = FALSE;
    output = g_memory_output_stream_new_resizable();
    g_assert_nonnull(output);
    @@ -46,9 +47,9 @@
    queued = purple_queued_output_stream_new(output);
    g_assert_true(PURPLE_IS_QUEUED_OUTPUT_STREAM(queued));
    - g_assert_true(g_output_stream_close(
    - G_OUTPUT_STREAM(queued), NULL, &err));
    + ret = g_output_stream_close(G_OUTPUT_STREAM(queued), NULL, &err);
    g_assert_no_error(err);
    + g_assert_true(ret);
    g_clear_object(&queued);
    g_clear_object(&output);
    @@ -61,10 +62,11 @@
    PurpleQueuedOutputStream *queued = PURPLE_QUEUED_OUTPUT_STREAM(source);
    gboolean *done = user_data;
    GError *err = NULL;
    + gboolean ret = FALSE;
    - g_assert_true(purple_queued_output_stream_push_bytes_finish(queued,
    - res, &err));
    + ret = purple_queued_output_stream_push_bytes_finish(queued, res, &err);
    g_assert_no_error(err);
    + g_assert_true(ret);
    *done = TRUE;
    }
    @@ -75,7 +77,7 @@
    PurpleQueuedOutputStream *queued;
    GBytes *bytes;
    GError *err = NULL;
    - gboolean done = FALSE;
    + gboolean done = FALSE, ret = FALSE;
    output = G_MEMORY_OUTPUT_STREAM(g_memory_output_stream_new_resizable());
    g_assert_nonnull(output);
    @@ -97,9 +99,9 @@
    g_memory_output_stream_get_data_size(output),
    test_bytes_data, test_bytes_data_len);
    - g_assert_true(g_output_stream_close(
    - G_OUTPUT_STREAM(queued), NULL, &err));
    + ret = g_output_stream_close(G_OUTPUT_STREAM(queued), NULL, &err);
    g_assert_no_error(err);
    + g_assert_true(ret);
    g_clear_object(&queued);
    g_clear_object(&output);
    @@ -112,10 +114,11 @@
    PurpleQueuedOutputStream *queued = PURPLE_QUEUED_OUTPUT_STREAM(source);
    gint *done = user_data;
    GError *err = NULL;
    + gboolean ret = FALSE;
    - g_assert_true(purple_queued_output_stream_push_bytes_finish(queued,
    - res, &err));
    + ret = purple_queued_output_stream_push_bytes_finish(queued, res, &err);
    g_assert_no_error(err);
    + g_assert_true(ret);
    --*done;
    }
    @@ -128,6 +131,7 @@
    gchar *all_test_bytes_data;
    GError *err = NULL;
    int done = 3;
    + gboolean ret = FALSE;
    output = G_MEMORY_OUTPUT_STREAM(g_memory_output_stream_new_resizable());
    g_assert_nonnull(output);
    @@ -171,9 +175,9 @@
    g_free(all_test_bytes_data);
    - g_assert_true(g_output_stream_close(
    - G_OUTPUT_STREAM(queued), NULL, &err));
    + ret = g_output_stream_close(G_OUTPUT_STREAM(queued), NULL, &err);
    g_assert_no_error(err);
    + g_assert_true(ret);
    g_clear_object(&queued);
    g_clear_object(&output);
    @@ -204,6 +208,7 @@
    GCancellable *cancellable;
    GError *err = NULL;
    gint done = 3;
    + gboolean ret = FALSE;
    output = G_MEMORY_OUTPUT_STREAM(g_memory_output_stream_new_resizable());
    g_assert_nonnull(output);
    @@ -246,9 +251,9 @@
    g_memory_output_stream_get_data_size(output),
    NULL, 0);
    - g_assert_true(g_output_stream_close(
    - G_OUTPUT_STREAM(queued), NULL, &err));
    + ret = g_output_stream_close(G_OUTPUT_STREAM(queued), NULL, &err);
    g_assert_no_error(err);
    + g_assert_true(ret);
    g_clear_object(&queued);
    g_clear_object(&output);
    --- a/libpurple/tests/test_smiley.c Sat Jan 02 23:24:44 2021 -0600
    +++ b/libpurple/tests/test_smiley.c Sun Jan 03 01:00:58 2021 -0600
    @@ -124,7 +124,6 @@
    path = g_build_filename(TEST_DATA_DIR, "test-image.png", NULL);
    smiley = purple_smiley_new("^_^", path);
    - g_assert_no_error(error);
    g_file_get_contents(path, &edata, &elen, &error);
    g_assert_no_error(error);