diff options
Diffstat (limited to 'libnm-core/tests')
| -rw-r--r-- | libnm-core/tests/test-compare.c | 3 | ||||
| -rw-r--r-- | libnm-core/tests/test-crypto.c | 9 | ||||
| -rw-r--r-- | libnm-core/tests/test-general.c | 406 | ||||
| -rw-r--r-- | libnm-core/tests/test-keyfile.c | 14 | ||||
| -rw-r--r-- | libnm-core/tests/test-secrets.c | 157 | ||||
| -rw-r--r-- | libnm-core/tests/test-setting-8021x.c | 167 | ||||
| -rw-r--r-- | libnm-core/tests/test-setting-dcb.c | 6 | ||||
| -rw-r--r-- | libnm-core/tests/test-settings-defaults.c | 14 |
8 files changed, 342 insertions, 434 deletions
diff --git a/libnm-core/tests/test-compare.c b/libnm-core/tests/test-compare.c index 914330fe..dca5c7d3 100644 --- a/libnm-core/tests/test-compare.c +++ b/libnm-core/tests/test-compare.c @@ -19,12 +19,11 @@ * Copyright 2007 - 2008 Novell, Inc. */ -#include "config.h" +#include "nm-default.h" #include <arpa/inet.h> #include <netinet/in.h> -#include "nm-default.h" #include "nm-property-compare.h" #include "nm-test-utils.h" diff --git a/libnm-core/tests/test-crypto.c b/libnm-core/tests/test-crypto.c index 926cddb0..bd87c710 100644 --- a/libnm-core/tests/test-crypto.c +++ b/libnm-core/tests/test-crypto.c @@ -21,14 +21,13 @@ * Copyright 2007 - 2011 Red Hat, Inc. */ -#include "config.h" +#include "nm-default.h" #include <unistd.h> #include <stdlib.h> #include <stdio.h> #include <string.h> -#include "nm-default.h" #include "crypto.h" #include "nm-utils.h" #include "nm-errors.h" @@ -439,12 +438,14 @@ int main (int argc, char **argv) { GError *error = NULL; + gboolean success; int ret; nmtst_init (&argc, &argv, TRUE); - if (!crypto_init (&error)) - FAIL ("crypto-init", "failed to initialize crypto: %s", error->message); + success = crypto_init (&error); + g_assert_no_error (error); + g_assert (success); g_test_add_data_func ("/libnm/crypto/cert/pem", "test_ca_cert.pem", diff --git a/libnm-core/tests/test-general.c b/libnm-core/tests/test-general.c index e8eb0baf..82af4140 100644 --- a/libnm-core/tests/test-general.c +++ b/libnm-core/tests/test-general.c @@ -21,13 +21,11 @@ #define NM_GLIB_COMPAT_H_TEST -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> -#include "nm-default.h" - +#include "nm-utils.h" #include "nm-setting-private.h" #include "nm-utils.h" #include "nm-utils-private.h" @@ -62,9 +60,10 @@ #include "nm-simple-connection.h" #include "nm-keyfile-internal.h" -#include "nm-test-utils.h" #include "test-general-enums.h" +#include "nm-test-utils.h" + /* When passing a "bool" typed argument to a variadic function that * expects a gboolean, the compiler will promote the integer type * to have at least size (int). That way: @@ -73,56 +72,47 @@ G_STATIC_ASSERT (sizeof (gboolean) == sizeof (int)); G_STATIC_ASSERT (sizeof (bool) <= sizeof (int)); +/*****************************************************************************/ + static void vpn_check_func (const char *key, const char *value, gpointer user_data) { - const char *test = user_data; - if (!strcmp (key, "foobar1")) { - ASSERT (strcmp (value, "blahblah1") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah1"); return; } if (!strcmp (key, "foobar2")) { - ASSERT (strcmp (value, "blahblah2") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah2"); return; } if (!strcmp (key, "foobar3")) { - ASSERT (strcmp (value, "blahblah3") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah3"); return; } if (!strcmp (key, "foobar4")) { - ASSERT (strcmp (value, "blahblah4") == 0, - test, "unexpected vpn item '%s' / '%s'", key, value); + g_assert_cmpstr (value, ==, "blahblah4"); return; } - ASSERT (FALSE, test, "unexpected vpn item '%s'", key); + g_assert_not_reached (); } static void vpn_check_empty_func (const char *key, const char *value, gpointer user_data) { - const char *test = user_data; - - /* We don't expect any values */ - ASSERT (FALSE, test, "unexpected vpn item '%s'", key); + g_assert_not_reached (); } static void test_setting_vpn_items (void) { - NMSettingVpn *s_vpn; + gs_unref_object NMSettingVpn *s_vpn = NULL; s_vpn = (NMSettingVpn *) nm_setting_vpn_new (); - ASSERT (s_vpn != NULL, - "vpn-items", - "error creating vpn setting"); + g_assert (s_vpn); nm_setting_vpn_add_data_item (s_vpn, "foobar1", "blahblah1"); nm_setting_vpn_add_data_item (s_vpn, "foobar2", "blahblah2"); @@ -130,7 +120,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_data_item (s_vpn, "foobar4", "blahblah4"); /* Ensure that added values are all present */ - nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_func, "vpn-data"); + nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_func, NULL); nm_setting_vpn_remove_data_item (s_vpn, "foobar1"); nm_setting_vpn_remove_data_item (s_vpn, "foobar2"); nm_setting_vpn_remove_data_item (s_vpn, "foobar3"); @@ -142,7 +132,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_secret (s_vpn, "foobar4", "blahblah4"); /* Ensure that added values are all present */ - nm_setting_vpn_foreach_secret (s_vpn, vpn_check_func, "vpn-secrets"); + nm_setting_vpn_foreach_secret (s_vpn, vpn_check_func, NULL); nm_setting_vpn_remove_secret (s_vpn, "foobar1"); nm_setting_vpn_remove_secret (s_vpn, "foobar2"); nm_setting_vpn_remove_secret (s_vpn, "foobar3"); @@ -173,7 +163,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_data_item (s_vpn, "", "blahblah1"); g_test_assert_expected_messages (); - nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_empty_func, "vpn-data-empty"); + nm_setting_vpn_foreach_data_item (s_vpn, vpn_check_empty_func, NULL); /* Try to add some blank secrets and make sure they are rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*key != NULL*"); @@ -200,9 +190,7 @@ test_setting_vpn_items (void) nm_setting_vpn_add_secret (s_vpn, "", "blahblah1"); g_test_assert_expected_messages (); - nm_setting_vpn_foreach_secret (s_vpn, vpn_check_empty_func, "vpn-secrets-empty"); - - g_object_unref (s_vpn); + nm_setting_vpn_foreach_secret (s_vpn, vpn_check_empty_func, NULL); } static void @@ -221,14 +209,7 @@ test_setting_vpn_update_secrets (void) const char *val2 = "value2"; connection = nm_simple_connection_new (); - ASSERT (connection != NULL, - "vpn-update-secrets", - "error creating connection"); - s_vpn = (NMSettingVpn *) nm_setting_vpn_new (); - ASSERT (s_vpn != NULL, - "vpn-update-secrets", - "error creating vpn setting"); nm_connection_add_setting (connection, NM_SETTING (s_vpn)); g_variant_builder_init (&settings_builder, NM_VARIANT_TYPE_CONNECTION); @@ -247,21 +228,17 @@ test_setting_vpn_update_secrets (void) settings = g_variant_builder_end (&settings_builder); success = nm_connection_update_secrets (connection, NM_SETTING_VPN_SETTING_NAME, settings, &error); - ASSERT (success == TRUE, - "vpn-update-secrets", "failed to update VPN secrets: %s", error->message); + g_assert_no_error (error); + g_assert (success); /* Read the secrets back out */ tmp = nm_setting_vpn_get_secret (s_vpn, key1); - ASSERT (tmp != NULL, - "vpn-update-secrets", "unexpected failure getting key #1"); - ASSERT (strcmp (tmp, val1) == 0, - "vpn-update-secrets", "unexpected key #1 value"); + g_assert (tmp); + g_assert_cmpstr (tmp, ==, val1); tmp = nm_setting_vpn_get_secret (s_vpn, key2); - ASSERT (tmp != NULL, - "vpn-update-secrets", "unexpected failure getting key #2"); - ASSERT (strcmp (tmp, val2) == 0, - "vpn-update-secrets", "unexpected key #2 value"); + g_assert (tmp); + g_assert_cmpstr (tmp, ==, val2); g_variant_unref (settings); g_object_unref (connection); @@ -666,25 +643,17 @@ test_setting_gsm_apn_spaces (void) const char *tmp; s_gsm = (NMSettingGsm *) nm_setting_gsm_new (); - ASSERT (s_gsm != NULL, - "gsm-apn-spaces", - "error creating GSM setting"); + g_assert (s_gsm); /* Trailing space */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar ", NULL); tmp = nm_setting_gsm_get_apn (s_gsm); - ASSERT (tmp != NULL, - "gsm-apn-spaces", "empty APN"); - ASSERT (strcmp (tmp, "foobar") == 0, - "gsm-apn-spaces", "unexpected APN"); + g_assert_cmpstr (tmp, ==, "foobar"); /* Leading space */ g_object_set (s_gsm, NM_SETTING_GSM_APN, " foobar", NULL); tmp = nm_setting_gsm_get_apn (s_gsm); - ASSERT (tmp != NULL, - "gsm-apn-spaces", "empty APN"); - ASSERT (strcmp (tmp, "foobar") == 0, - "gsm-apn-spaces", "unexpected APN"); + g_assert_cmpstr (tmp, ==, "foobar"); } static void @@ -693,36 +662,29 @@ test_setting_gsm_apn_bad_chars (void) gs_unref_object NMSettingGsm *s_gsm = NULL; s_gsm = (NMSettingGsm *) nm_setting_gsm_new (); - ASSERT (s_gsm != NULL, - "gsm-apn-bad-chars", - "error creating GSM setting"); + g_assert (s_gsm); g_object_set (s_gsm, NM_SETTING_GSM_NUMBER, "*99#", NULL); /* Make sure a valid APN works */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar123.-baz", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == TRUE, - "gsm-apn-bad-chars", "unexpectedly invalid GSM setting"); + g_assert (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* Random invalid chars */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "@#%$@#%@#%", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* Spaces */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "foobar baz", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* 0 characters long */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); /* 65-character long */ g_object_set (s_gsm, NM_SETTING_GSM_APN, "abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijkl1", NULL); - ASSERT (nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL) == FALSE, - "gsm-apn-bad-chars", "unexpectedly valid GSM setting"); + g_assert (!nm_setting_verify (NM_SETTING (s_gsm), NULL, NULL)); } static void @@ -791,7 +753,7 @@ make_test_wsec_setting (const char *detail) NMSettingWirelessSecurity *s_wsec; s_wsec = (NMSettingWirelessSecurity *) nm_setting_wireless_security_new (); - ASSERT (s_wsec != NULL, detail, "error creating setting"); + g_assert (s_wsec); g_object_set (s_wsec, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, "wpa-psk", @@ -800,24 +762,17 @@ make_test_wsec_setting (const char *detail) NM_SETTING_WIRELESS_SECURITY_PSK_FLAGS, NM_SETTING_SECRET_FLAG_NOT_SAVED, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, "aaaaaaaaaa", NULL); - return s_wsec; } -#define ASSERT_CONTAINS(vardict, key, test_name, msg) \ - { \ - GVariant *value; \ - value = g_variant_lookup_value (vardict, key, NULL); \ - ASSERT (value != NULL, test_name, msg); \ - g_variant_unref (value); \ - } +static gboolean +_variant_contains (GVariant *vardict, const char *key) +{ + gs_unref_variant GVariant *value = NULL; -#define ASSERT_NOT_CONTAINS(vardict, key, test_name, msg) \ - { \ - GVariant *value; \ - value = g_variant_lookup_value (vardict, key, NULL); \ - ASSERT (value == NULL, test_name, msg); \ - } + value = g_variant_lookup_value (vardict, key, NULL); + return !!value; +} static void test_setting_to_dbus_all (void) @@ -830,14 +785,10 @@ test_setting_to_dbus_all (void) dict = _nm_setting_to_dbus (NM_SETTING (s_wsec), NULL, NM_CONNECTION_SERIALIZE_ALL); /* Make sure all keys are there */ - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, - "setting-to-dbus-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, - "setting-to-dbus-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_PSK, - "setting-to-dbus-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_PSK); - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, - "setting-to-dbus-all", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME)); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_PSK)); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)); g_variant_unref (dict); g_object_unref (s_wsec); @@ -854,16 +805,12 @@ test_setting_to_dbus_no_secrets (void) dict = _nm_setting_to_dbus (NM_SETTING (s_wsec), NULL, NM_CONNECTION_SERIALIZE_NO_SECRETS); /* Make sure non-secret keys are there */ - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, - "setting-to-dbus-no-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, - "setting-to-dbus-no-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME)); /* Make sure secrets are not there */ - ASSERT_NOT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_PSK, - "setting-to-dbus-no-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_PSK); - ASSERT_NOT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, - "setting-to-dbus-no-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); + g_assert (!_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_PSK)); + g_assert (!_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)); g_variant_unref (dict); g_object_unref (s_wsec); @@ -880,16 +827,12 @@ test_setting_to_dbus_only_secrets (void) dict = _nm_setting_to_dbus (NM_SETTING (s_wsec), NULL, NM_CONNECTION_SERIALIZE_ONLY_SECRETS); /* Make sure non-secret keys are not there */ - ASSERT_NOT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT, - "setting-to-dbus-only-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_KEY_MGMT); - ASSERT_NOT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME, - "setting-to-dbus-only-secrets", "unexpectedly present " NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME); + g_assert (!_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_KEY_MGMT)); + g_assert (!_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_LEAP_USERNAME)); /* Make sure secrets are there */ - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_PSK, - "setting-to-dbus-only-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_PSK); - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0, - "setting-to-dbus-only-secrets", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_WEP_KEY0); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_PSK)); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_WEP_KEY0)); g_variant_unref (dict); g_object_unref (s_wsec); @@ -1011,8 +954,7 @@ test_connection_to_dbus_setting_name (void) /* Make sure the keys of the first level dict are setting names, not * the GType name of the setting objects. */ - ASSERT_CONTAINS (dict, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME, - "connection-to-dbus-setting-name", "unexpectedly missing " NM_SETTING_WIRELESS_SECURITY_SETTING_NAME); + g_assert (_variant_contains (dict, NM_SETTING_WIRELESS_SECURITY_SETTING_NAME)); g_variant_unref (dict); g_object_unref (connection); @@ -1643,24 +1585,20 @@ test_connection_new_from_dbus (void) static void check_permission (NMSettingConnection *s_con, guint32 idx, - const char *expected_uname, - const char *tag) + const char *expected_uname) { gboolean success; const char *ptype = NULL, *pitem = NULL, *detail = NULL; success = nm_setting_connection_get_permission (s_con, 0, &ptype, &pitem, &detail); - ASSERT (success == TRUE, tag, "unexpected failure getting added permission"); + g_assert (success); - /* Permission type */ - ASSERT (ptype != NULL, tag, "unexpected failure getting permission type"); - ASSERT (strcmp (ptype, "user") == 0, tag, "retrieved unexpected permission type"); + g_assert_cmpstr (ptype, ==, "user"); - /* Permission item */ - ASSERT (pitem != NULL, tag, "unexpected failure getting permission item"); - ASSERT (strcmp (pitem, expected_uname) == 0, tag, "retrieved unexpected permission item"); + g_assert (pitem); + g_assert_cmpstr (pitem, ==, expected_uname); - ASSERT (detail == NULL, tag, "unexpected success getting permission detail"); + g_assert (!detail); } #define TEST_UNAME "asdfasfasdf" @@ -1680,79 +1618,66 @@ test_setting_connection_permissions_helpers (void) g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strcmp (ptype, \"user\") == 0*"); success = nm_setting_connection_add_permission (s_con, "foobar", "blah", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission type #1"); + g_assert (!success); /* Ensure a bad [type] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*ptype*"); success = nm_setting_connection_add_permission (s_con, NULL, "blah", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission type #2"); + g_assert (!success); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*uname*"); g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", NULL, NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #1"); + g_assert (!success); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*uname[0] != '\\0'*"); g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #2"); + g_assert (!success); /* Ensure an [item] with ':' is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strchr (uname, ':')*"); g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "ad:asdf", NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #3"); + g_assert (!success); /* Ensure a non-UTF-8 [item] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (uname, -1, NULL)*"); g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*p != NULL*"); success = nm_setting_connection_add_permission (s_con, "user", buf, NULL); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad permission item #4"); + g_assert (!success); /* Ensure a non-NULL [detail] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*detail == NULL*"); success = nm_setting_connection_add_permission (s_con, "user", "dafasdf", "asdf"); g_test_assert_expected_messages (); - ASSERT (success == FALSE, - "setting-connection-permissions-helpers", "unexpected success adding bad detail"); + g_assert (!success); /* Ensure a valid call results in success */ success = nm_setting_connection_add_permission (s_con, "user", TEST_UNAME, NULL); - ASSERT (success == TRUE, - "setting-connection-permissions-helpers", "unexpected failure adding valid user permisson"); + g_assert (success); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 1, - "setting-connection-permissions-helpers", "unexpected failure getting number of permissions"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 1); - check_permission (s_con, 0, TEST_UNAME, "setting-connection-permissions-helpers"); + check_permission (s_con, 0, TEST_UNAME); /* Check the actual GObject property just to be paranoid */ g_object_get (G_OBJECT (s_con), NM_SETTING_CONNECTION_PERMISSIONS, &perms, NULL); - ASSERT (perms != NULL, - "setting-connection-permissions-helpers", "unexpected failure getting permissions"); - ASSERT (g_strv_length (perms) == 1, - "setting-connection-permissions-helpers", "unexpected failure getting number of permissions"); - ASSERT (strcmp (perms[0], expected_perm) == 0, - "setting-connection-permissions-helpers", "unexpected permission property data"); + g_assert (perms); + g_assert_cmpint (g_strv_length (perms), ==, 1); + g_assert_cmpstr (perms[0], ==, expected_perm); g_strfreev (perms); /* Now remove that permission and ensure we have 0 permissions */ nm_setting_connection_remove_permission (s_con, 0); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-helpers", "unexpected failure removing permission"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); g_object_unref (s_con); } @@ -1804,69 +1729,59 @@ test_setting_connection_permissions_property (void) g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*"); add_permission_property (s_con, "foobar", "blah", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission type #1"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a bad [type] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*strncmp (str, PERM_USER_PREFIX, strlen (PERM_USER_PREFIX)) == 0*"); add_permission_property (s_con, NULL, "blah", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission type #2"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*last_colon > str*"); add_permission_property (s_con, "user", NULL, -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #1"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a bad [item] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*last_colon > str*"); add_permission_property (s_con, "user", "", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #2"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure an [item] with ':' in the middle is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*"); add_permission_property (s_con, "user", "ad:asdf", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #3"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure an [item] with ':' at the end is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*str[i] != ':'*"); add_permission_property (s_con, "user", "adasdfaf:", -1, NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #4"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a non-UTF-8 [item] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*g_utf8_validate (str, -1, NULL)*"); add_permission_property (s_con, "user", buf, (int) sizeof (buf), NULL); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad permission item #5"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a non-NULL [detail] is rejected */ g_test_expect_message ("libnm", G_LOG_LEVEL_CRITICAL, "*(last_colon + 1) == '\\0'*"); add_permission_property (s_con, "user", "dafasdf", -1, "asdf"); g_test_assert_expected_messages (); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected success adding bad detail"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); /* Ensure a valid call results in success */ success = nm_setting_connection_add_permission (s_con, "user", TEST_UNAME, NULL); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 1, - "setting-connection-permissions-property", "unexpected failure adding valid user permisson"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 1); - check_permission (s_con, 0, TEST_UNAME, "setting-connection-permissions-property"); + check_permission (s_con, 0, TEST_UNAME); /* Now remove that permission and ensure we have 0 permissions */ nm_setting_connection_remove_permission (s_con, 0); - ASSERT (nm_setting_connection_get_num_permissions (s_con) == 0, - "setting-connection-permissions-property", "unexpected failure removing permission"); + g_assert_cmpint (nm_setting_connection_get_num_permissions (s_con), ==, 0); g_object_unref (s_con); } @@ -2040,12 +1955,13 @@ test_connection_diff_a_only (void) { NM_SETTING_IP_CONFIG_IGNORE_AUTO_ROUTES, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_IP_CONFIG_IGNORE_AUTO_DNS, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_IP4_CONFIG_DHCP_CLIENT_ID, NM_SETTING_DIFF_RESULT_IN_A }, - { NM_SETTING_IP4_CONFIG_DHCP_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, + { NM_SETTING_IP_CONFIG_DHCP_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_IP_CONFIG_DHCP_SEND_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_IP_CONFIG_DHCP_HOSTNAME, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_IP4_CONFIG_DHCP_FQDN, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_IP_CONFIG_NEVER_DEFAULT, NM_SETTING_DIFF_RESULT_IN_A }, { NM_SETTING_IP_CONFIG_MAY_FAIL, NM_SETTING_DIFF_RESULT_IN_A }, + { NM_SETTING_IP_CONFIG_DAD_TIMEOUT, NM_SETTING_DIFF_RESULT_IN_A }, { NULL, NM_SETTING_DIFF_RESULT_UNKNOWN }, } }, }; @@ -2773,18 +2689,18 @@ test_ip4_netmask_to_prefix (void) } #define ASSERT_CHANGED(statement) \ -{ \ +G_STMT_START { \ changed = FALSE; \ statement; \ g_assert (changed); \ -} +} G_STMT_END #define ASSERT_UNCHANGED(statement) \ -{ \ +G_STMT_START { \ changed = FALSE; \ statement; \ g_assert (!changed); \ -} +} G_STMT_END static void test_connection_changed_signal (void) @@ -3389,6 +3305,7 @@ _test_connection_normalize_type_normalizable_setting (const char *type, g_assert (!nm_connection_get_setting_by_name (con, type)); nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING); + nmtst_connection_normalize (con); s_base = nm_connection_get_setting_by_name (con, type); g_assert (s_base); @@ -3445,6 +3362,7 @@ _test_connection_normalize_type_normalizable_type (const char *type, g_assert (nm_connection_get_setting_by_name (con, type) == s_base); nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY); + nmtst_connection_normalize (con); g_assert_cmpstr (nm_connection_get_connection_type (con), ==, type); g_assert (nm_connection_get_setting_by_name (con, type) == s_base); @@ -3709,6 +3627,7 @@ test_connection_normalize_slave_type_1 (void) g_assert (!nm_connection_get_setting_by_name (con, NM_SETTING_BRIDGE_PORT_SETTING_NAME)); nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_SETTING); + nmtst_connection_normalize (con); g_assert (nm_connection_get_setting_by_name (con, NM_SETTING_BRIDGE_PORT_SETTING_NAME)); g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); } @@ -3739,6 +3658,7 @@ test_connection_normalize_slave_type_2 (void) g_assert (nm_connection_get_setting_by_name (con, NM_SETTING_BRIDGE_PORT_SETTING_NAME)); g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NULL); nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_MISSING_PROPERTY); + nmtst_connection_normalize (con); g_assert (nm_connection_get_setting_by_name (con, NM_SETTING_BRIDGE_PORT_SETTING_NAME)); g_assert_cmpstr (nm_setting_connection_get_slave_type (s_con), ==, NM_SETTING_BRIDGE_SETTING_NAME); } @@ -3762,7 +3682,8 @@ test_connection_normalize_infiniband_mtu (void) NM_SETTING_INFINIBAND_TRANSPORT_MODE, "datagram", NM_SETTING_INFINIBAND_MTU, (guint) 2044, NULL); - nmtst_assert_connection_verifies_without_normalization (con); + nmtst_assert_connection_verifies_and_normalizable (con); + nmtst_connection_normalize (con); g_assert_cmpint (2044, ==, nm_setting_infiniband_get_mtu (s_infini)); g_object_set (s_infini, @@ -3770,6 +3691,7 @@ test_connection_normalize_infiniband_mtu (void) NM_SETTING_INFINIBAND_MTU, (guint) 2045, NULL); nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY); + nmtst_connection_normalize (con); g_assert_cmpint (2044, ==, nm_setting_infiniband_get_mtu (s_infini)); g_object_set (s_infini, @@ -3784,6 +3706,7 @@ test_connection_normalize_infiniband_mtu (void) NM_SETTING_INFINIBAND_MTU, (guint) 65521, NULL); nmtst_assert_connection_verifies_after_normalization (con, NM_CONNECTION_ERROR, NM_CONNECTION_ERROR_INVALID_PROPERTY); + nmtst_connection_normalize (con); g_assert_cmpint (65520, ==, nm_setting_infiniband_get_mtu (s_infini)); } @@ -4023,6 +3946,7 @@ test_setting_compare_default_strv (void) c1 = nmtst_create_minimal_connection ("test_compare_default_strv", NULL, NM_SETTING_WIRED_SETTING_NAME, NULL); nmtst_assert_connection_verifies_and_normalizable (c1); + nmtst_connection_normalize (c1); c2 = nm_simple_connection_new_clone (c1); nmtst_assert_connection_verifies_without_normalization (c2); @@ -4863,6 +4787,8 @@ test_nm_in_set (void) _ASSERT (4, NM_IN_SET (-1, G( 1), G( 2), G( 3), G(-1))); _ASSERT (4, NM_IN_SET (-1, G( 1), G( 2), G( 3), G(-1), G( 5))); + _ASSERT (5, NM_IN_SET (-1, G( 1), G( 2), G( 3), G( 4), G(-1))); + _ASSERT (6, NM_IN_SET (-1, G( 1), G( 2), G( 3), G( 4), G( 5), G( -1))); _ASSERT (1, !NM_IN_SET_SE (-1, G( 1))); _ASSERT (1, NM_IN_SET_SE (-1, G(-1))); @@ -4888,6 +4814,133 @@ test_nm_in_set (void) _ASSERT (4, NM_IN_SET_SE (-1, G( 1), G( 2), G( 3), G(-1))); _ASSERT (5, NM_IN_SET_SE (-1, G( 1), G( 2), G( 3), G(-1), G( 5))); + _ASSERT (6, NM_IN_SET_SE (-1, G( 1), G( 2), G( 3), G( 4), G( 5), G(-1))); +#undef G +#undef N +#undef _ASSERT +} + +/******************************************************************************/ + +static const char * +_test_nm_in_set_getstr (int *call_counter, gboolean allow_called, const char *value) +{ + g_assert (call_counter); + *call_counter += 1; + if (!allow_called) + g_assert_not_reached (); + return value; +} + +static void +test_nm_in_strset (void) +{ + int call_counter = 0; + +#define G(x) _test_nm_in_set_getstr (&call_counter, TRUE, x) +#define N(x) _test_nm_in_set_getstr (&call_counter, FALSE, x) +#define _ASSERT(expected, expr) \ + G_STMT_START { \ + _test_nm_in_set_assert (&call_counter, 0); \ + g_assert (expr); \ + _test_nm_in_set_assert (&call_counter, (expected)); \ + } G_STMT_END + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL))); + _ASSERT (1, !NM_IN_STRSET ("a", G(NULL))); + _ASSERT (1, !NM_IN_STRSET (NULL, G("a"))); + + _ASSERT (1, NM_IN_STRSET_SE (NULL, G(NULL))); + _ASSERT (1, !NM_IN_STRSET_SE ("a", G(NULL))); + _ASSERT (1, !NM_IN_STRSET_SE (NULL, G("a"))); + + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N(NULL))); + _ASSERT (2, !NM_IN_STRSET ("a", G(NULL), G(NULL))); + _ASSERT (2, NM_IN_STRSET (NULL, G("a"), G(NULL))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("a"))); + _ASSERT (2, NM_IN_STRSET ("a", G(NULL), G("a"))); + _ASSERT (2, !NM_IN_STRSET (NULL, G("a"), G("a"))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("b"))); + _ASSERT (2, !NM_IN_STRSET ("a", G(NULL), G("b"))); + _ASSERT (2, !NM_IN_STRSET (NULL, G("a"), G("b"))); + + _ASSERT (2, NM_IN_STRSET_SE (NULL, G(NULL), G(NULL))); + _ASSERT (2, !NM_IN_STRSET_SE ("a", G(NULL), G(NULL))); + _ASSERT (2, NM_IN_STRSET_SE (NULL, G("a"), G(NULL))); + _ASSERT (2, NM_IN_STRSET_SE (NULL, G(NULL), G("a"))); + _ASSERT (2, NM_IN_STRSET_SE ("a", G(NULL), G("a"))); + _ASSERT (2, !NM_IN_STRSET_SE (NULL, G("a"), G("a"))); + _ASSERT (2, NM_IN_STRSET_SE (NULL, G(NULL), G("b"))); + _ASSERT (2, !NM_IN_STRSET_SE ("a", G(NULL), G("b"))); + _ASSERT (2, !NM_IN_STRSET_SE (NULL, G("a"), G("b"))); + + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N(NULL), N(NULL))); + _ASSERT (3, !NM_IN_STRSET ("a", G(NULL), G(NULL), G(NULL))); + _ASSERT (2, NM_IN_STRSET (NULL, G("a"), G(NULL), N(NULL))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("a"), N(NULL))); + _ASSERT (2, NM_IN_STRSET ("a", G(NULL), G("a"), N(NULL))); + _ASSERT (3, NM_IN_STRSET (NULL, G("a"), G("a"), G(NULL))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("b"), N(NULL))); + _ASSERT (3, !NM_IN_STRSET ("a", G(NULL), G("b"), G(NULL))); + _ASSERT (3, NM_IN_STRSET (NULL, G("a"), G("b"), G(NULL))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N(NULL), N("a"))); + _ASSERT (3, NM_IN_STRSET ("a", G(NULL), G(NULL), G("a"))); + _ASSERT (2, NM_IN_STRSET (NULL, G("a"), G(NULL), N("a"))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("a"), N("a"))); + _ASSERT (2, NM_IN_STRSET ("a", G(NULL), G("a"), N("a"))); + _ASSERT (3, !NM_IN_STRSET (NULL, G("a"), G("a"), G("a"))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("b"), N("a"))); + _ASSERT (3, NM_IN_STRSET ("a", G(NULL), G("b"), G("a"))); + _ASSERT (3, !NM_IN_STRSET (NULL, G("a"), G("b"), G("a"))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N(NULL), N("b"))); + _ASSERT (3, !NM_IN_STRSET ("a", G(NULL), G(NULL), G("b"))); + _ASSERT (2, NM_IN_STRSET (NULL, G("a"), G(NULL), N("b"))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("a"), N("b"))); + _ASSERT (2, NM_IN_STRSET ("a", G(NULL), G("a"), N("b"))); + _ASSERT (3, !NM_IN_STRSET (NULL, G("a"), G("a"), G("b"))); + _ASSERT (1, NM_IN_STRSET (NULL, G(NULL), N("b"), N("b"))); + _ASSERT (3, !NM_IN_STRSET ("a", G(NULL), G("b"), G("b"))); + _ASSERT (3, !NM_IN_STRSET (NULL, G("a"), G("b"), G("b"))); + + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G(NULL), G(NULL))); + _ASSERT (3, !NM_IN_STRSET_SE ("a", G(NULL), G(NULL), G(NULL))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G("a"), G(NULL), G(NULL))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G("a"), G(NULL))); + _ASSERT (3, NM_IN_STRSET_SE ("a", G(NULL), G("a"), G(NULL))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G("a"), G("a"), G(NULL))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G("b"), G(NULL))); + _ASSERT (3, !NM_IN_STRSET_SE ("a", G(NULL), G("b"), G(NULL))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G("a"), G("b"), G(NULL))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G(NULL), G("a"))); + _ASSERT (3, NM_IN_STRSET_SE ("a", G(NULL), G(NULL), G("a"))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G("a"), G(NULL), G("a"))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G("a"), G("a"))); + _ASSERT (3, NM_IN_STRSET_SE ("a", G(NULL), G("a"), G("a"))); + _ASSERT (3, !NM_IN_STRSET_SE (NULL, G("a"), G("a"), G("a"))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G("b"), G("a"))); + _ASSERT (3, NM_IN_STRSET_SE ("a", G(NULL), G("b"), G("a"))); + _ASSERT (3, !NM_IN_STRSET_SE (NULL, G("a"), G("b"), G("a"))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G(NULL), G("b"))); + _ASSERT (3, !NM_IN_STRSET_SE ("a", G(NULL), G(NULL), G("b"))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G("a"), G(NULL), G("b"))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G("a"), G("b"))); + _ASSERT (3, NM_IN_STRSET_SE ("a", G(NULL), G("a"), G("b"))); + _ASSERT (3, !NM_IN_STRSET_SE (NULL, G("a"), G("a"), G("b"))); + _ASSERT (3, NM_IN_STRSET_SE (NULL, G(NULL), G("b"), G("b"))); + _ASSERT (3, !NM_IN_STRSET_SE ("a", G(NULL), G("b"), G("b"))); + _ASSERT (3, !NM_IN_STRSET_SE (NULL, G("a"), G("b"), G("b"))); + + + _ASSERT (3, NM_IN_STRSET ("a", G(NULL), G("b"), G("a"), N("a"))); + _ASSERT (4, NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("a"))); + _ASSERT (4, !NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d"))); + + _ASSERT (4, NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("a"), N("a"))); + _ASSERT (5, NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d"), G("a"))); + _ASSERT (5, !NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d"), G("e"))); + + _ASSERT (5, NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d"), G("a"), N("a"))); + _ASSERT (6, NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d"), G("e"), G("a"))); + _ASSERT (6, !NM_IN_STRSET ("a", G(NULL), G("b"), G("c"), G("d"), G("e"), G("f"))); #undef G #undef N #undef _ASSERT @@ -4903,6 +4956,7 @@ int main (int argc, char **argv) /* The tests */ g_test_add_func ("/core/general/test_nm_in_set", test_nm_in_set); + g_test_add_func ("/core/general/test_nm_in_strset", test_nm_in_strset); g_test_add_func ("/core/general/test_setting_vpn_items", test_setting_vpn_items); g_test_add_func ("/core/general/test_setting_vpn_update_secrets", test_setting_vpn_update_secrets); g_test_add_func ("/core/general/test_setting_vpn_modify_during_foreach", test_setting_vpn_modify_during_foreach); diff --git a/libnm-core/tests/test-keyfile.c b/libnm-core/tests/test-keyfile.c index 99f88ac5..92b6c1f5 100644 --- a/libnm-core/tests/test-keyfile.c +++ b/libnm-core/tests/test-keyfile.c @@ -19,12 +19,10 @@ * */ -#include "config.h" +#include "nm-default.h" -#include "nm-macros-internal.h" #include "nm-keyfile-utils.h" #include "nm-keyfile-internal.h" - #include "nm-simple-connection.h" #include "nm-setting-connection.h" #include "nm-setting-wired.h" @@ -113,9 +111,10 @@ _nm_keyfile_read (GKeyFile *keyfile, con = nm_keyfile_read (keyfile, keyfile_name, base_dir, read_handler, read_data, &error); g_assert_no_error (error); g_assert (NM_IS_CONNECTION (con)); - if (needs_normalization) + if (needs_normalization) { nmtst_assert_connection_verifies_after_normalization (con, 0, 0); - else + nmtst_connection_normalize (con); + } else nmtst_assert_connection_verifies_without_normalization (con); return con; } @@ -287,7 +286,7 @@ _test_8021x_cert_check_blob_full (NMConnection *con, const void *data, gsize len _test_8021x_cert_check (con, NM_SETTING_802_1X_CK_SCHEME_BLOB, g_bytes_get_data (bytes, NULL), g_bytes_get_size (bytes)); g_bytes_unref (bytes); } -#define _test_8021x_cert_check_blob(con, data) _test_8021x_cert_check_blob_full(con, data, STRLEN (data)) +#define _test_8021x_cert_check_blob(con, data) _test_8021x_cert_check_blob_full(con, data, NM_STRLEN (data)) static void test_8021x_cert (void) @@ -334,6 +333,7 @@ test_8021x_cert (void) nm_connection_add_setting (con, NM_SETTING (s_8021x)); nmtst_assert_connection_verifies_and_normalizable (con); + nmtst_connection_normalize (con); _test_8021x_cert_check (con, scheme, full_TEST_WIRED_TLS_CA_CERT, -1); @@ -352,7 +352,7 @@ test_8021x_cert (void) _test_8021x_cert_check_blob (con, "\0"); _test_8021x_cert_check_blob (con, "10"); _test_8021x_cert_check_blob (con, "data:;base64,a"); - _test_8021x_cert_check_blob_full (con, "data:;base64,a", STRLEN ("data:;base64,a") + 1); + _test_8021x_cert_check_blob_full (con, "data:;base64,a", NM_STRLEN ("data:;base64,a") + 1); _test_8021x_cert_check_blob (con, "data:;base64,file://a"); _test_8021x_cert_check_blob (con, "123"); diff --git a/libnm-core/tests/test-secrets.c b/libnm-core/tests/test-secrets.c index 4c0c7f5d..a32ed4f1 100644 --- a/libnm-core/tests/test-secrets.c +++ b/libnm-core/tests/test-secrets.c @@ -19,11 +19,10 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include "nm-default.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" @@ -37,6 +36,7 @@ #include "nm-setting-wireless.h" #include "nm-simple-connection.h" #include "nm-utils.h" +#include "nm-core-internal.h" #include "nm-test-utils.h" @@ -44,16 +44,20 @@ #define TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT TEST_CERT_DIR "/test_key_and_cert.pem" #define TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY TEST_CERT_DIR "/test_key_and_cert.pem" -static gboolean -find_hints_item (GPtrArray *hints, const char *item) +static void +_assert_hints_has (GPtrArray *hints, const char *item) { - int i; + guint i; + guint found = 0; + g_assert (hints); + g_assert (item); for (i = 0; i < hints->len; i++) { - if (!strcmp (item, (const char *) g_ptr_array_index (hints, i))) - return TRUE; + g_assert (hints->pdata[i]); + if (strcmp (hints->pdata[i], item) == 0) + found++; } - return FALSE; + g_assert_cmpint (found, ==, 1); } static NMConnection * @@ -100,18 +104,14 @@ make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set CA certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CA_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_client_cert (s_8021x, TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set client certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_private_key (s_8021x, TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, @@ -119,9 +119,7 @@ make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set private key '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, error->message); + nmtst_assert_success (success, error); /* IP4 setting */ s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new (); @@ -129,9 +127,7 @@ make_tls_connection (const char *detail, NMSetting8021xCKScheme scheme) g_object_set (s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); - ASSERT (nm_connection_verify (connection, &error) == TRUE, - detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); + nmtst_assert_connection_verifies_and_normalizable (connection); return connection; } @@ -144,37 +140,19 @@ test_need_tls_secrets_path (void) GPtrArray *hints = NULL; connection = make_tls_connection ("need-tls-secrets-path-key", NM_SETTING_802_1X_CK_SCHEME_PATH); - ASSERT (connection != NULL, - "need-tls-secrets-path-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-secrets-path-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-secrets-path-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Connection is good; clear secrets and ensure private key password is then required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-secrets-path-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-secrets-path-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-secrets-path-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), - "need-tls-secrets-path-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); @@ -188,37 +166,19 @@ test_need_tls_secrets_blob (void) GPtrArray *hints = NULL; connection = make_tls_connection ("need-tls-secrets-blob-key", NM_SETTING_802_1X_CK_SCHEME_BLOB); - ASSERT (connection != NULL, - "need-tls-secrets-blob-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-secrets-blob-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-secrets-blob-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Clear secrets and ensure password is again required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-secrets-blob-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-secrets-blob-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-secrets-blob-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD), - "need-tls-secrets-blob-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); @@ -270,18 +230,14 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set phase2 CA certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CA_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_phase2_client_cert (s_8021x, TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set phase2 client certificate '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_CLIENT_CERT, error->message); + nmtst_assert_success (success, error); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, @@ -289,9 +245,7 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) scheme, NULL, &error); - ASSERT (success == TRUE, - detail, "failed to set phase2 private key '%s': %s", - TEST_NEED_SECRETS_EAP_TLS_PRIVATE_KEY, error->message); + nmtst_assert_success (success, error); /* IP4 setting */ s_ip4 = (NMSettingIP4Config *) nm_setting_ip4_config_new (); @@ -299,10 +253,7 @@ make_tls_phase2_connection (const char *detail, NMSetting8021xCKScheme scheme) g_object_set (s_ip4, NM_SETTING_IP_CONFIG_METHOD, NM_SETTING_IP4_CONFIG_METHOD_AUTO, NULL); - ASSERT (nm_connection_verify (connection, &error) == TRUE, - detail, "failed to verify connection: %s", - (error && error->message) ? error->message : "(unknown)"); - + nmtst_assert_connection_verifies_and_normalizable (connection); return connection; } @@ -315,37 +266,19 @@ test_need_tls_phase2_secrets_path (void) connection = make_tls_phase2_connection ("need-tls-phase2-secrets-path-key", NM_SETTING_802_1X_CK_SCHEME_PATH); - ASSERT (connection != NULL, - "need-tls-phase2-secrets-path-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-phase2-secrets-path-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-phase2-secrets-path-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Connection is good; clear secrets and ensure private key password is then required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-phase2-secrets-path-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-phase2-secrets-path-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-phase2-secrets-path-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), - "need-tls-phase2-secrets-path-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); @@ -360,37 +293,19 @@ test_need_tls_phase2_secrets_blob (void) connection = make_tls_phase2_connection ("need-tls-phase2-secrets-blob-key", NM_SETTING_802_1X_CK_SCHEME_BLOB); - ASSERT (connection != NULL, - "need-tls-phase2-secrets-blob-key", - "error creating test connection"); /* Ensure we don't need any secrets since we just set up the connection */ setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name == NULL, - "need-tls-phase2-secrets-blob-key", - "secrets are unexpectedly required"); - ASSERT (hints == NULL, - "need-tls-phase2-secrets-blob-key", - "hints should be NULL since no secrets were required"); + g_assert (!setting_name); + g_assert (!hints); /* Connection is good; clear secrets and ensure private key password is then required */ nm_connection_clear_secrets (connection); hints = NULL; setting_name = nm_connection_need_secrets (connection, &hints); - ASSERT (setting_name != NULL, - "need-tls-phase2-secrets-blob-key-password", - "unexpected secrets success"); - ASSERT (strcmp (setting_name, NM_SETTING_802_1X_SETTING_NAME) == 0, - "need-tls-phase2-secrets-blob-key-password", - "unexpected setting secrets required"); - - ASSERT (hints != NULL, - "need-tls-phase2-secrets-blob-key-password", - "expected returned secrets hints"); - ASSERT (find_hints_item (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD), - "need-tls-phase2-secrets-blob-key-password", - "expected to require private key password, but it wasn't"); + g_assert_cmpstr (setting_name, ==, NM_SETTING_802_1X_SETTING_NAME); + _assert_hints_has (hints, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY_PASSWORD); g_ptr_array_free (hints, TRUE); g_object_unref (connection); diff --git a/libnm-core/tests/test-setting-8021x.c b/libnm-core/tests/test-setting-8021x.c index 49d7448e..56563a6f 100644 --- a/libnm-core/tests/test-setting-8021x.c +++ b/libnm-core/tests/test-setting-8021x.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-connection.h" #include "nm-setting-8021x.h" @@ -41,18 +39,12 @@ compare_blob_data (const char *test, GError *error = NULL; gboolean success; - success = g_file_get_contents (key_path, &contents, &len, &error); - ASSERT (success == TRUE, - test, "failed to read blob key file: %s", error->message); + g_assert (key && g_bytes_get_size (key) > 0); - ASSERT (len > 0, test, "blob key file invalid (size 0)"); - - ASSERT (len == g_bytes_get_size (key), - test, "blob key file (%d) and setting key data (%d) lengths don't match", - len, g_bytes_get_size (key)); + success = g_file_get_contents (key_path, &contents, &len, &error); + nmtst_assert_success (success, error); - ASSERT (memcmp (contents, g_bytes_get_data (key, NULL), len) == 0, - test, "blob key file and blob key data don't match"); + g_assert_cmpmem (contents, len, g_bytes_get_data (key, NULL), g_bytes_get_size (key)); g_free (contents); } @@ -60,8 +52,11 @@ compare_blob_data (const char *test, static void check_scheme_path (GBytes *value, const char *path) { - const guint8 *p = g_bytes_get_data (value, NULL); + const guint8 *p; + + g_assert (value); + p = g_bytes_get_data (value, NULL); g_assert (memcmp (p, NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH, strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH)) == 0); p += strlen (NM_SETTING_802_1X_CERT_SCHEME_PREFIX_PATH); g_assert (memcmp (p, path, strlen (path)) == 0); @@ -83,7 +78,7 @@ test_private_key_import (const char *path, const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "private-key-import", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_private_key (s_8021x, path, @@ -91,29 +86,21 @@ test_private_key_import (const char *path, scheme, &format, &error); - ASSERT (success == TRUE, - "private-key-import", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "private-key-import", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); tmp_fmt = nm_setting_802_1x_get_private_key_format (s_8021x); - ASSERT (tmp_fmt == format, - "private-key-import", "unexpected re-read private key format (expected %d, got %d)", - format, tmp_fmt); + g_assert (tmp_fmt == format); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_private_key_password (s_8021x); - ASSERT (pw != NULL, - "private-key-import", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "private-key-import", "failed to compare private key password"); + g_assert (pw != NULL); + g_assert_cmpstr (pw, ==, password); if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) { tmp_key = nm_setting_802_1x_get_private_key_blob (s_8021x); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key blob"); compare_blob_data ("private-key-import", path, tmp_key); } else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) { g_object_get (s_8021x, NM_SETTING_802_1X_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key value"); check_scheme_path (tmp_key, path); g_bytes_unref (tmp_key); } else @@ -122,14 +109,13 @@ test_private_key_import (const char *path, /* If it's PKCS#12 ensure the client cert is the same value */ if (format == NM_SETTING_802_1X_CK_FORMAT_PKCS12) { g_object_get (s_8021x, NM_SETTING_802_1X_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key value"); + g_assert (tmp_key); g_object_get (s_8021x, NM_SETTING_802_1X_CLIENT_CERT, &client_cert, NULL); - ASSERT (client_cert != NULL, "private-key-import", "missing client certificate value"); + g_assert (client_cert); /* make sure they are the same */ - ASSERT (g_bytes_equal (tmp_key, client_cert), - "private-key-import", "unexpected different private key and client cert data"); + g_assert (g_bytes_equal (tmp_key, client_cert)); g_bytes_unref (tmp_key); g_bytes_unref (client_cert); @@ -152,7 +138,7 @@ test_phase2_private_key_import (const char *path, const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "phase2-private-key-import", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, path, @@ -160,29 +146,21 @@ test_phase2_private_key_import (const char *path, scheme, &format, &error); - ASSERT (success == TRUE, - "phase2-private-key-import", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "phase2-private-key-import", "unexpected private key format"); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); tmp_fmt = nm_setting_802_1x_get_phase2_private_key_format (s_8021x); - ASSERT (tmp_fmt == format, - "phase2-private-key-import", "unexpected re-read private key format (expected %d, got %d)", - format, tmp_fmt); + g_assert (tmp_fmt == format); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_phase2_private_key_password (s_8021x); - ASSERT (pw != NULL, - "phase2-private-key-import", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "phase2-private-key-import", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); if (scheme == NM_SETTING_802_1X_CK_SCHEME_BLOB) { tmp_key = nm_setting_802_1x_get_phase2_private_key_blob (s_8021x); - ASSERT (tmp_key != NULL, "phase2-private-key-import", "missing private key blob"); compare_blob_data ("phase2-private-key-import", path, tmp_key); } else if (scheme == NM_SETTING_802_1X_CK_SCHEME_PATH) { g_object_get (s_8021x, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "phase2-private-key-import", "missing private key value"); check_scheme_path (tmp_key, path); g_bytes_unref (tmp_key); } else @@ -191,14 +169,13 @@ test_phase2_private_key_import (const char *path, /* If it's PKCS#12 ensure the client cert is the same value */ if (format == NM_SETTING_802_1X_CK_FORMAT_PKCS12) { g_object_get (s_8021x, NM_SETTING_802_1X_PHASE2_PRIVATE_KEY, &tmp_key, NULL); - ASSERT (tmp_key != NULL, "private-key-import", "missing private key value"); + g_assert (tmp_key); g_object_get (s_8021x, NM_SETTING_802_1X_PHASE2_CLIENT_CERT, &client_cert, NULL); - ASSERT (client_cert != NULL, "private-key-import", "missing client certificate value"); + g_assert (client_cert); /* make sure they are the same */ - ASSERT (g_bytes_equal (tmp_key, client_cert), - "private-key-import", "unexpected different private key and client cert data"); + g_assert (g_bytes_equal (tmp_key, client_cert)); g_bytes_unref (tmp_key); g_bytes_unref (client_cert); @@ -217,7 +194,7 @@ test_wrong_password_keeps_data (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "wrong-password-keeps-data", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_private_key (s_8021x, path, @@ -225,10 +202,8 @@ test_wrong_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "wrong-password-keeps-data", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-password-keeps-data", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Now try to set it to something that's not a certificate */ format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; @@ -238,20 +213,14 @@ test_wrong_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == FALSE, - "wrong-password-keeps-data", "unexpected success reading private key"); - ASSERT (error != NULL, - "wrong-password-keeps-data", "unexpected missing error"); - ASSERT (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-password-keeps-data", "unexpected success reading private key format"); + nmtst_assert_no_success (success, error); + g_assert (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); g_clear_error (&error); /* Make sure the password hasn't changed */ pw = nm_setting_802_1x_get_private_key_password (s_8021x); - ASSERT (pw != NULL, - "wrong-password-keeps-data", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "wrong-password-keeps-data", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); g_object_unref (s_8021x); } @@ -266,7 +235,7 @@ test_clear_private_key (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "clear-private-key", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_private_key (s_8021x, path, @@ -274,17 +243,13 @@ test_clear_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "clear-private-key", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "clear-private-key", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_private_key_password (s_8021x); - ASSERT (pw != NULL, - "clear-private-key", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "clear-private-key", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); /* Now clear it */ success = nm_setting_802_1x_set_private_key (s_8021x, @@ -293,14 +258,10 @@ test_clear_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, NULL, &error); - ASSERT (success == TRUE, - "clear-private-key", "unexpected failure clearing private key"); - ASSERT (error == NULL, - "clear-private-key", "unexpected error clearing private key"); + nmtst_assert_success (success, error); /* Ensure the password is also now clear */ - ASSERT (nm_setting_802_1x_get_private_key_password (s_8021x) == NULL, - "clear-private-key", "unexpected private key password"); + g_assert (!nm_setting_802_1x_get_private_key_password (s_8021x)); g_object_unref (s_8021x); } @@ -315,7 +276,7 @@ test_wrong_phase2_password_keeps_data (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "wrong-phase2-password-keeps-data", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, path, @@ -323,10 +284,8 @@ test_wrong_phase2_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "wrong-phase2-password-keeps-data", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-phase2-password-keeps-data", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Now try to set it to something that's not a certificate */ format = NM_SETTING_802_1X_CK_FORMAT_UNKNOWN; @@ -336,20 +295,14 @@ test_wrong_phase2_password_keeps_data (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == FALSE, - "wrong-phase2-password-keeps-data", "unexpected success reading private key"); - ASSERT (error != NULL, - "wrong-phase2-password-keeps-data", "unexpected missing error"); - ASSERT (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "wrong-phase2-password-keeps-data", "unexpected success reading private key format"); + nmtst_assert_no_success (success, error); + g_assert (format == NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); g_clear_error (&error); /* Make sure the password hasn't changed */ pw = nm_setting_802_1x_get_phase2_private_key_password (s_8021x); - ASSERT (pw != NULL, - "wrong-phase2-password-keeps-data", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "wrong-phase2-password-keeps-data", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); g_object_unref (s_8021x); } @@ -364,7 +317,7 @@ test_clear_phase2_private_key (const char *path, const char *password) const char *pw; s_8021x = (NMSetting8021x *) nm_setting_802_1x_new (); - ASSERT (s_8021x != NULL, "clear-phase2-private-key", "setting was NULL"); + g_assert (s_8021x); success = nm_setting_802_1x_set_phase2_private_key (s_8021x, path, @@ -372,17 +325,13 @@ test_clear_phase2_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, &format, &error); - ASSERT (success == TRUE, - "clear-phase2-private-key", "error reading private key: %s", error->message); - ASSERT (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN, - "clear-phase2-private-key", "unexpected private key format (got %d)", format); + nmtst_assert_success (success, error); + g_assert (format != NM_SETTING_802_1X_CK_FORMAT_UNKNOWN); /* Make sure the password is what we expect */ pw = nm_setting_802_1x_get_phase2_private_key_password (s_8021x); - ASSERT (pw != NULL, - "clear-phase2-private-key", "failed to get previous private key password"); - ASSERT (strcmp (pw, password) == 0, - "clear-phase2-private-key", "failed to compare private key password"); + g_assert (pw); + g_assert_cmpstr (pw, ==, password); /* Now clear it */ success = nm_setting_802_1x_set_phase2_private_key (s_8021x, @@ -391,14 +340,10 @@ test_clear_phase2_private_key (const char *path, const char *password) NM_SETTING_802_1X_CK_SCHEME_BLOB, NULL, &error); - ASSERT (success == TRUE, - "clear-phase2-private-key", "unexpected failure clearing private key"); - ASSERT (error == NULL, - "clear-phase2-private-key", "unexpected error clearing private key"); + nmtst_assert_success (success, error); /* Ensure the password is also now clear */ - ASSERT (nm_setting_802_1x_get_phase2_private_key_password (s_8021x) == NULL, - "clear-phase2-private-key", "unexpected private key password"); + g_assert (!nm_setting_802_1x_get_phase2_private_key_password (s_8021x)); g_object_unref (s_8021x); } diff --git a/libnm-core/tests/test-setting-dcb.c b/libnm-core/tests/test-setting-dcb.c index f8b789c1..09cf8d98 100644 --- a/libnm-core/tests/test-setting-dcb.c +++ b/libnm-core/tests/test-setting-dcb.c @@ -19,11 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> -#include "nm-default.h" + +#include "nm-utils.h" #include "nm-setting-dcb.h" #include "nm-connection.h" #include "nm-errors.h" diff --git a/libnm-core/tests/test-settings-defaults.c b/libnm-core/tests/test-settings-defaults.c index 21e16f3d..366910ac 100644 --- a/libnm-core/tests/test-settings-defaults.c +++ b/libnm-core/tests/test-settings-defaults.c @@ -19,13 +19,11 @@ * */ -#include "config.h" +#include "nm-default.h" #include <string.h> -#include <nm-utils.h> - -#include "nm-default.h" +#include "nm-utils.h" #include "nm-setting-8021x.h" #include "nm-setting-cdma.h" #include "nm-setting-connection.h" @@ -53,9 +51,7 @@ test_defaults (GType type, const char *name) setting = g_object_new (type, NULL); property_specs = g_object_class_list_properties (G_OBJECT_GET_CLASS (setting), &n_property_specs); - ASSERT (property_specs != NULL, - name, "couldn't find property specs for object of type '%s'", - g_type_name (G_OBJECT_TYPE (setting))); + g_assert (property_specs); for (i = 0; i < n_property_specs; i++) { GParamSpec *prop_spec = property_specs[i]; @@ -87,9 +83,7 @@ test_defaults (GType type, const char *name) } else ok = g_param_value_defaults (prop_spec, &value); - ASSERT (ok, - name, "property '%s' value '%s' not the expected default value '%s'", - prop_spec->name, actual, expected); + g_assert (ok); g_free (actual); g_free (expected); |