From 3bdf32a16db4e700e942bcb9fcbe2475babd48a1 Mon Sep 17 00:00:00 2001 From: Benjamin Dauvergne Date: Wed, 16 Nov 2022 16:21:12 +0100 Subject: [PATCH 3/6] Fix all warnings in tests (#71313) --- tests/Makefile.am | 1 + tests/basic_tests.c | 244 +++++++++++++++++++------------------- tests/login_tests.c | 140 +++++++++++----------- tests/login_tests_saml2.c | 114 +++++++++--------- tests/metadata_tests.c | 14 +-- tests/random_tests.c | 114 +++++++++--------- tests/tests.c | 8 +- tests/tests.h | 25 ++-- 8 files changed, 328 insertions(+), 332 deletions(-) diff --git a/tests/Makefile.am b/tests/Makefile.am index 762fd4ce..691d43ec 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -12,6 +12,7 @@ AM_CPPFLAGS = \ -DTESTSMETADATADIR=\"$(srcdir)/data/metadata/\" \ $(LASSO_CFLAGS) \ $(CHECK_CFLAGS) + -Werror -Wall tests_SOURCES = tests.c login_tests.c basic_tests.c non_regression_tests.c random_tests.c metadata_tests.c login_tests_saml2.c assertion_query_saml2.c diff --git a/tests/basic_tests.c b/tests/basic_tests.c index e28ef36f..eaea4c51 100644 --- a/tests/basic_tests.c +++ b/tests/basic_tests.c @@ -39,7 +39,7 @@ START_TEST(test01_server_load_dump_empty_string) { LassoServer *serverContext; serverContext = lasso_server_new_from_dump(""); - fail_unless(serverContext == NULL, + ck_assert_msg(serverContext == NULL, "serverContext was created from an empty string dump"); } END_TEST @@ -50,7 +50,7 @@ START_TEST(test02_server_load_dump_random_string) begin_check_do_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: Start tag expected, '<' not found\n", FALSE); serverContext = lasso_server_new_from_dump("foo"); end_check_do_log("libxml2"); - fail_unless(serverContext == NULL, + ck_assert_msg(serverContext == NULL, "serverContext was created from a fake dump"); } END_TEST @@ -61,7 +61,7 @@ START_TEST(test03_server_load_dump_random_xml) begin_check_do_log(NULL, G_LOG_LEVEL_CRITICAL, " Unable to build a LassoNode from a xmlNode", TRUE); serverContext = lasso_server_new_from_dump(""); end_check_do_log(NULL); - fail_unless(serverContext == NULL, + ck_assert_msg(serverContext == NULL, "serverContext was created from fake (but valid XML) dump"); } END_TEST @@ -72,7 +72,7 @@ START_TEST(test04_identity_load_dump_null) LassoIdentity *identity; identity = lasso_identity_new_from_dump(NULL); - fail_unless(identity == NULL, "identity was created from NULL dump"); + ck_assert_msg(identity == NULL, "identity was created from NULL dump"); } END_TEST @@ -81,7 +81,7 @@ START_TEST(test05_identity_load_dump_empty) LassoIdentity *identity; identity = lasso_identity_new_from_dump(""); - fail_unless(identity == NULL, "identity was created from empty dump"); + ck_assert_msg(identity == NULL, "identity was created from empty dump"); } END_TEST @@ -94,13 +94,13 @@ START_TEST(test06_registry_direct_mapping) r = lasso_registry_default_add_direct_mapping(LASSO_LIB_HREF, "test", LASSO_LASSO_HREF, "LassoTestClass"); - fail_unless(r == 0, "lasso_registry_default_add_direct_mapping should return 0 for new mappings"); + ck_assert_msg(r == 0, "lasso_registry_default_add_direct_mapping should return 0 for new mappings"); name = lasso_registry_default_get_mapping(LASSO_LIB_HREF, "test", LASSO_LASSO_HREF); - fail_unless(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping"); - fail_unless(strcmp(name, "LassoTestClass") == 0, "lasso_registry_default_get_mapping should return LassoTestClass"); + ck_assert_msg(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping"); + ck_assert_msg(strcmp(name, "LassoTestClass") == 0, "lasso_registry_default_get_mapping should return LassoTestClass"); r = lasso_registry_default_add_direct_mapping(LASSO_LIB_HREF, "test", LASSO_LASSO_HREF, "LassoTestClass"); - fail_unless(r == LASSO_REGISTRY_ERROR_KEY_EXISTS, "lasso_registry_default_add_direct_mapping should return LASSO_REGISTRY_KEY_EXISTS when done two times"); + ck_assert_msg(r == LASSO_REGISTRY_ERROR_KEY_EXISTS, "lasso_registry_default_add_direct_mapping should return LASSO_REGISTRY_KEY_EXISTS when done two times"); } END_TEST @@ -124,12 +124,12 @@ START_TEST(test07_registry_functional_mapping) gint r; r = lasso_registry_default_add_functional_mapping("coin", LASSO_LASSO_HREF, trad); - fail_unless(r == 0, "lasso_registry_default_add_functional mapping should return 0 for new mapping"); + ck_assert_msg(r == 0, "lasso_registry_default_add_functional mapping should return 0 for new mapping"); name = lasso_registry_default_get_mapping("coin", "Assertion", LASSO_LASSO_HREF); - fail_unless(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping"); - fail_unless(strcmp(name, "LassoAssertion") == 0, "lasso_registry_default_get_mapping should return LassoAssertion"); + ck_assert_msg(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping"); + ck_assert_msg(strcmp(name, "LassoAssertion") == 0, "lasso_registry_default_get_mapping should return LassoAssertion"); r = lasso_registry_default_add_functional_mapping("coin", LASSO_LASSO_HREF, trad); - fail_unless(r == LASSO_REGISTRY_ERROR_KEY_EXISTS, "lasso_registry_default_add_functional_mapping should return LASSO_REGISTRY_KEY_EXISTS when done two times"); + ck_assert_msg(r == LASSO_REGISTRY_ERROR_KEY_EXISTS, "lasso_registry_default_add_functional_mapping should return LASSO_REGISTRY_KEY_EXISTS when done two times"); } END_TEST @@ -170,12 +170,12 @@ START_TEST(test08_test_new_from_xmlNode) g_type_register_static(LASSO_TYPE_NODE, "LassoTest", &this_info, 0); r = lasso_registry_default_add_direct_mapping("http://example.com", "Test1", LASSO_LASSO_HREF, "LassoTest"); - fail_unless(r == 0, "no mapping for http://example.com:Test1 should exist"); + ck_assert_msg(r == 0, "no mapping for http://example.com:Test1 should exist"); begin_check_do_log(NULL, G_LOG_LEVEL_WARNING, " Class LassoTest has no node_data so no initialization is possible", TRUE); node = lasso_node_new_from_dump(""); end_check_do_log(NULL); - fail_unless(node != NULL, "parsing should return an object"); - fail_unless(strcmp(G_OBJECT_TYPE_NAME(node), "LassoTest") == 0, "node classname should be LassoTest"); + ck_assert_msg(node != NULL, "parsing should return an object"); + ck_assert_msg(strcmp(G_OBJECT_TYPE_NAME(node), "LassoTest") == 0, "node classname should be LassoTest"); g_object_unref(node); } END_TEST @@ -188,9 +188,9 @@ START_TEST(test09_test_deserialization) g_file_get_contents(TESTSDATADIR "/response-1", &content, &len, NULL); - fail_unless(content != NULL, "content should be read"); + ck_assert_msg(content != NULL, "content should be read"); node = lasso_node_new_from_dump(content); - fail_unless(node != NULL, "node should be parsed"); + ck_assert_msg(node != NULL, "node should be parsed"); g_object_unref(node); g_free(content); } @@ -204,574 +204,574 @@ START_TEST(test10_test_alldumps) node = LASSO_NODE(lasso_identity_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_identity_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_identity_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_session_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_session_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_session_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_ds_key_info_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_info_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_info_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_ds_key_value_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_value_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_value_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_ds_rsa_key_value_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_rsa_key_value_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_rsa_key_value_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); /* ID-FF 1.2 */ node = LASSO_NODE(lasso_lib_assertion_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_assertion_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_assertion_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_authn_context_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_context_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_context_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_authn_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_authn_request_envelope_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_envelope_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_envelope_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_federation_termination_notification_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_federation_termination_notification_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_federation_termination_notification_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_idp_entries_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entries_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entries_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_idp_entry_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entry_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entry_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_idp_list_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_list_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_list_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_logout_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_logout_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_name_identifier_mapping_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_name_identifier_mapping_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_register_name_identifier_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_register_name_identifier_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_request_authn_context_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_request_authn_context_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_request_authn_context_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_scoping_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_scoping_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_scoping_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_lib_subject_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_subject_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_subject_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_misc_text_node_new()); node_dump = lasso_node_dump(node); - fail_unless(node_dump && strcmp(node_dump, "") == 0, "LassoMiscTextNode dump failed"); + ck_assert_msg(node_dump && strcmp(node_dump, "") == 0, "LassoMiscTextNode dump failed"); lasso_release_string(node_dump); lasso_release_gobject(node); /* SAML 2.0 */ node = LASSO_NODE(lasso_saml2_action_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_action_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_action_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_advice_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_advice_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_advice_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_assertion_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_assertion_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_assertion_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_attribute_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_attribute_statement_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_statement_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_statement_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_attribute_value_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_value_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_value_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_audience_restriction_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_audience_restriction_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_audience_restriction_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_authn_context_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_context_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_context_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_authn_statement_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_statement_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_statement_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_authz_decision_statement_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authz_decision_statement_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authz_decision_statement_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_base_idabstract_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_base_idabstract_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_base_idabstract_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_condition_abstract_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_condition_abstract_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_condition_abstract_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_conditions_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_conditions_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_conditions_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_encrypted_element_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_encrypted_element_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_encrypted_element_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_evidence_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_evidence_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_evidence_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_key_info_confirmation_data_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_key_info_confirmation_data_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_key_info_confirmation_data_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_name_id_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_name_id_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_name_id_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_one_time_use_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_one_time_use_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_one_time_use_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_proxy_restriction_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_proxy_restriction_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_proxy_restriction_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_statement_abstract_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_statement_abstract_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_statement_abstract_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_subject_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_subject_confirmation_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_subject_confirmation_data_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_data_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_data_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml2_subject_locality_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_locality_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_locality_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_artifact_resolve_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_resolve_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_resolve_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_artifact_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_assertion_id_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_assertion_id_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_assertion_id_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_attribute_query_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_attribute_query_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_attribute_query_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_authn_query_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_query_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_query_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_authn_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_authz_decision_query_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authz_decision_query_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authz_decision_query_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_extensions_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_extensions_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_extensions_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_idp_entry_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_entry_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_entry_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_idp_list_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_list_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_list_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); /* node = LASSO_NODE(lasso_samlp2_logout_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); */ node = LASSO_NODE(lasso_samlp2_logout_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); /* node = LASSO_NODE(lasso_samlp2_manage_name_id_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); */ node = LASSO_NODE(lasso_samlp2_manage_name_id_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_name_id_mapping_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_name_id_mapping_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_name_id_policy_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_policy_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_policy_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_request_abstract_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_request_abstract_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_request_abstract_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_requested_authn_context_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_requested_authn_context_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_requested_authn_context_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_scoping_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_scoping_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_scoping_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_status_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_status_code_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_code_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_code_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_status_detail_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_detail_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_detail_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_status_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_subject_query_abstract_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_subject_query_abstract_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_subject_query_abstract_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp2_terminate_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_terminate_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_terminate_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); /* SAML 1.0 */ node = LASSO_NODE(lasso_saml_advice_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_advice_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_advice_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_assertion_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_assertion_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_assertion_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_attribute_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_attribute_designator_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_designator_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_designator_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_attribute_statement_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_statement_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_statement_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_attribute_value_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_value_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_value_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_audience_restriction_condition_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_audience_restriction_condition_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_audience_restriction_condition_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_authentication_statement_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authentication_statement_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authentication_statement_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_authority_binding_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authority_binding_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authority_binding_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_conditions_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_conditions_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_conditions_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_name_identifier_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_name_identifier_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_name_identifier_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_subject_confirmation_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_confirmation_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_confirmation_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_saml_subject_statement_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_statement_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_statement_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp_request_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_request_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_request_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp_response_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_response_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_response_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp_status_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_samlp_status_code_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_code_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_code_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); /* SOAP */ node = LASSO_NODE(lasso_soap_body_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_body_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_body_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_soap_detail_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_detail_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_detail_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_soap_fault_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_fault_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_fault_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); node = LASSO_NODE(lasso_soap_header_new()); node_dump = lasso_node_dump(node); - fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_header_new"); + ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_header_new"); lasso_release_string(node_dump); lasso_release_gobject(node2); lasso_release_gobject(node); @@ -799,10 +799,10 @@ START_TEST(test10_test_alldumps) LassoNode *node; xmldoc = xmlParseDoc (BAD_CAST (*iter)); - fail_unless(xmldoc != NULL, "Failed to parse %s: no xmldoc", *iter); - fail_unless(xmlDocGetRootElement (xmldoc) != NULL, "Failed to parse %s: no root node element", *iter); + ck_assert_msg(xmldoc != NULL, "Failed to parse %s: no xmldoc", *iter); + ck_assert_msg(xmlDocGetRootElement (xmldoc) != NULL, "Failed to parse %s: no root node element", *iter); node = lasso_node_new_from_xmlNode(xmlDocGetRootElement(xmldoc)); - fail_unless (LASSO_IS_SAML2_ENCRYPTED_ELEMENT (node), "Parsing of %s did not return a saml2:EncryptedElement, %s", *iter); + ck_assert_msg(LASSO_IS_SAML2_ENCRYPTED_ELEMENT (node), "Parsing of %s did not return a saml2:EncryptedElement, %s", (char*)*iter, g_type_name(G_TYPE_FROM_INSTANCE(node))); g_object_unref(node); lasso_release_doc(xmldoc); ++iter; @@ -818,15 +818,15 @@ START_TEST(test11_get_default_name_id_format) const GList *name_id_formats; provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSDATADIR "/sp5-saml2/metadata.xml", NULL, NULL); - fail_unless(provider != NULL, "lasso_provider_new failed on metadata file: %s", TESTSDATADIR "/sp5-saml2/metadata.xml"); + ck_assert_msg(provider != NULL, "lasso_provider_new failed on metadata file: %s", TESTSDATADIR "/sp5-saml2/metadata.xml"); name_id_format = lasso_provider_get_default_name_id_format(provider); - fail_unless(name_id_format != NULL, "no default name id format found!"); - fail_unless(strcmp(name_id_format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_EMAIL) == 0, "default name id format is not email, it is: %s", name_id_format); + ck_assert_msg(name_id_format != NULL, "no default name id format found!"); + ck_assert_msg(strcmp(name_id_format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_EMAIL) == 0, "default name id format is not email, it is: %s", name_id_format); lasso_release_string(name_id_format); name_id_formats = lasso_provider_get_metadata_list(provider, "NameIDFormat"); - fail_unless(g_list_length((GList*)name_id_formats) == 1, "lasso_provider_get_metadata_list returned more or less than 1 NameIDFormat: %u", g_list_length((GList*)name_id_formats)); - fail_unless(name_id_formats->data != NULL, "first name id format is NULL"); - fail_unless(strcmp((char*)name_id_formats->data, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_EMAIL) == 0, "first name id format is not email, it is %s", (char*)name_id_formats->data); + ck_assert_msg(g_list_length((GList*)name_id_formats) == 1, "lasso_provider_get_metadata_list returned more or less than 1 NameIDFormat: %u", g_list_length((GList*)name_id_formats)); + ck_assert_msg(name_id_formats->data != NULL, "first name id format is NULL"); + ck_assert_msg(strcmp((char*)name_id_formats->data, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_EMAIL) == 0, "first name id format is not email, it is %s", (char*)name_id_formats->data); /* cleanup */ lasso_release_gobject(provider); } diff --git a/tests/login_tests.c b/tests/login_tests.c index 9a49b913..b4ede586 100644 --- a/tests/login_tests.c +++ b/tests/login_tests.c @@ -122,11 +122,11 @@ START_TEST(test01_generateServersContextDumps) char *serviceProviderContextDump; identityProviderContextDump = generateIdentityProviderContextDump(); - fail_unless(identityProviderContextDump != NULL, + ck_assert_msg(identityProviderContextDump != NULL, "generateIdentityProviderContextDump should not return NULL"); g_free(identityProviderContextDump); serviceProviderContextDump = generateServiceProviderContextDump(); - fail_unless(serviceProviderContextDump != NULL, + ck_assert_msg(serviceProviderContextDump != NULL, "generateServiceProviderContextDump should not return NULL"); g_free(serviceProviderContextDump); } @@ -155,12 +155,12 @@ START_TEST(test02_serviceProviderLogin) serviceProviderContextDump = generateServiceProviderContextDump(); spContext = lasso_server_new_from_dump(serviceProviderContextDump); spLoginContext = lasso_login_new(spContext); - fail_unless(spLoginContext != NULL, + ck_assert_msg(spLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); check_good_rc(lasso_login_init_authn_request(spLoginContext, "https://idp1/metadata", LASSO_HTTP_METHOD_REDIRECT)); request = LASSO_LIB_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request); - fail_unless(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request"); + ck_assert_msg(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request"); request->IsPassive = 0; request->NameIDPolicy = g_strdup(LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED); request->consent = g_strdup(LASSO_LIB_CONSENT_OBTAINED); @@ -168,34 +168,34 @@ START_TEST(test02_serviceProviderLogin) request->RelayState = g_strdup(relayState); check_good_rc(lasso_login_build_authn_request_msg(spLoginContext)); authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url; - fail_unless(authnRequestUrl != NULL, + ck_assert_msg(authnRequestUrl != NULL, "authnRequestUrl shouldn't be NULL"); authnRequestQuery = strchr(authnRequestUrl, '?')+1; - fail_unless(strlen(authnRequestQuery) > 0, + ck_assert_msg(strlen(authnRequestQuery) > 0, "authnRequestQuery shouldn't be an empty string"); spLoginDump = lasso_node_dump(LASSO_NODE(spLoginContext)); - fail_unless(strstr(authnRequestQuery, "RelayState") != NULL, + ck_assert_msg(strstr(authnRequestQuery, "RelayState") != NULL, "authnRequestQuery should contain a RelayState parameter"); - fail_unless(strstr(authnRequestQuery, "fake%5B%5D") != NULL, + ck_assert_msg(strstr(authnRequestQuery, "fake%5B%5D") != NULL, "authnRequestQuery RelayState parameter should be encoded"); /* Identity provider singleSignOn, for a user having no federation. */ identityProviderContextDump = generateIdentityProviderContextDump(); idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new(idpContext); - fail_unless(idpLoginContext != NULL, + ck_assert_msg(idpLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); check_good_rc(lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery)); - fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed"); - fail_unless(lasso_login_must_authenticate(idpLoginContext), + ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed"); + ck_assert_msg(lasso_login_must_authenticate(idpLoginContext), "lasso_login_must_authenticate() should be TRUE"); - fail_unless(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART, + ck_assert_msg(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART, "protocoleProfile should be ProfileBrwsArt"); - fail_unless(! lasso_login_must_ask_for_consent(idpLoginContext), + ck_assert_msg(! lasso_login_must_ask_for_consent(idpLoginContext), "lasso_login_must_ask_for_consent() should be FALSE"); - fail_unless(idpLoginContext->parent.msg_relayState != NULL, + ck_assert_msg(idpLoginContext->parent.msg_relayState != NULL, "lasso_login_process_authn_request_msg should restore the RelayState parameter"); - fail_unless(lasso_strisequal(idpLoginContext->parent.msg_relayState,relayState), + ck_assert_msg(lasso_strisequal(idpLoginContext->parent.msg_relayState,relayState), "lasso_login_process_authn_request_msg should restore the same RelayState thant sent in the request"); check_good_rc(lasso_login_validate_request_msg(idpLoginContext, 1, /* authentication_result */ @@ -211,22 +211,22 @@ START_TEST(test02_serviceProviderLogin) check_good_rc(lasso_login_build_artifact_msg(idpLoginContext, LASSO_HTTP_METHOD_REDIRECT)); idpIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(idpLoginContext)->identity); - fail_unless(idpIdentityContextDump != NULL, + ck_assert_msg(idpIdentityContextDump != NULL, "lasso_identity_dump shouldn't return NULL"); idpSessionContextDump = lasso_session_dump(LASSO_PROFILE(idpLoginContext)->session); - fail_unless(idpSessionContextDump != NULL, + ck_assert_msg(idpSessionContextDump != NULL, "lasso_session_dump shouldn't return NULL"); responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url; - fail_unless(responseUrl != NULL, "responseUrl shouldn't be NULL"); + ck_assert_msg(responseUrl != NULL, "responseUrl shouldn't be NULL"); responseQuery = strchr(responseUrl, '?')+1; - fail_unless(strlen(responseQuery) > 0, + ck_assert_msg(strlen(responseQuery) > 0, "responseQuery shouldn't be an empty string"); - fail_unless(strstr(responseQuery, "RelayState") != NULL, + ck_assert_msg(strstr(responseQuery, "RelayState") != NULL, "responseQuery should contain a RelayState parameter"); - fail_unless(strstr(responseQuery, "fake%5B%5D") != NULL, + ck_assert_msg(strstr(responseQuery, "fake%5B%5D") != NULL, "responseQuery RelayState parameter should be encoded"); serviceProviderId = g_strdup(LASSO_PROFILE(idpLoginContext)->remote_providerID); - fail_unless(serviceProviderId != NULL, + ck_assert_msg(serviceProviderId != NULL, "lasso_profile_get_remote_providerID shouldn't return NULL"); if (lasso_flag_thin_sessions) { /* when using thin sessions, the way artifact message is constructed changes as the @@ -246,21 +246,21 @@ START_TEST(test02_serviceProviderLogin) check_good_rc(lasso_login_init_request(spLoginContext, responseQuery, LASSO_HTTP_METHOD_REDIRECT)); - fail_unless(spLoginContext->parent.msg_relayState != NULL, + ck_assert_msg(spLoginContext->parent.msg_relayState != NULL, "lasso_login_init_request should restore the RelayState parameter"); - fail_unless(lasso_strisequal(spLoginContext->parent.msg_relayState,relayState), + ck_assert_msg(lasso_strisequal(spLoginContext->parent.msg_relayState,relayState), "lasso_login_init_request should restore the same RelayState thant sent in the request"); - fail_unless(rc == 0, "lasso_login_init_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_request failed"); check_good_rc(lasso_login_build_request_msg(spLoginContext)); - fail_unless(rc == 0, "lasso_login_build_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_request_msg failed"); soapRequestMsg = LASSO_PROFILE(spLoginContext)->msg_body; - fail_unless(soapRequestMsg != NULL, "soapRequestMsg must not be NULL"); + ck_assert_msg(soapRequestMsg != NULL, "soapRequestMsg must not be NULL"); /* Identity provider SOAP endpoint */ lasso_server_destroy(idpContext); lasso_login_destroy(idpLoginContext); requestType = lasso_profile_get_request_type_from_soap_msg(soapRequestMsg); - fail_unless(requestType == LASSO_REQUEST_TYPE_LOGIN, + ck_assert_msg(requestType == LASSO_REQUEST_TYPE_LOGIN, "requestType should be LASSO_REQUEST_TYPE_LOGIN"); idpContext = lasso_server_new_from_dump(identityProviderContextDump); @@ -276,12 +276,12 @@ START_TEST(test02_serviceProviderLogin) idpSessionContextDump)); check_good_rc(lasso_login_build_response_msg(idpLoginContext, serviceProviderId)); soapResponseMsg = LASSO_PROFILE(idpLoginContext)->msg_body; - fail_unless(soapResponseMsg != NULL, "soapResponseMsg must not be NULL"); + ck_assert_msg(soapResponseMsg != NULL, "soapResponseMsg must not be NULL"); /* Service provider assertion consumer (step 2: process SOAP response) */ check_good_rc(lasso_login_process_response_msg(spLoginContext, soapResponseMsg)); check_good_rc(lasso_login_accept_sso(spLoginContext)); - fail_unless(LASSO_PROFILE(spLoginContext)->identity != NULL, + ck_assert_msg(LASSO_PROFILE(spLoginContext)->identity != NULL, "spLoginContext has no identity"); spIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(spLoginContext)->identity); check_not_null(spIdentityContextDump); @@ -290,9 +290,9 @@ START_TEST(test02_serviceProviderLogin) /* Test InResponseTo checking */ found = strstr(soapResponseMsg, "Assertion"); - fail_unless(found != NULL, "We must find an Assertion"); + ck_assert_msg(found != NULL, "We must find an Assertion"); found = strstr(found, "InResponseTo=\""); - fail_unless(found != NULL, "We must find an InResponseTo attribute"); + ck_assert_msg(found != NULL, "We must find an InResponseTo attribute"); found[sizeof("InResponseTo=\"")] = '?'; lasso_set_flag("no-verify-signature"); begin_check_do_log(NULL, G_LOG_LEVEL_CRITICAL, " If inResponseTo attribute is present, a matching " @@ -301,7 +301,7 @@ START_TEST(test02_serviceProviderLogin) end_check_do_log(NULL); lasso_set_flag("verify-signature"); check_good_rc(lasso_login_accept_sso(spLoginContext)); - fail_unless(rc == 0, "lasso_login_accept_sso must fail"); + ck_assert_msg(rc == 0, "lasso_login_accept_sso must fail"); g_free(spLoginDump); g_free(serviceProviderId); @@ -339,40 +339,40 @@ START_TEST(test03_serviceProviderLogin) serviceProviderContextDump = generateServiceProviderContextDump(); spContext = lasso_server_new_from_dump(serviceProviderContextDump); spLoginContext = lasso_login_new(spContext); - fail_unless(spLoginContext != NULL, + ck_assert_msg(spLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_init_authn_request(spLoginContext, "https://idp1/metadata", LASSO_HTTP_METHOD_REDIRECT); - fail_unless(rc == 0, "lasso_login_init_authn_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed"); request = LASSO_LIB_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request); - fail_unless(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request"); + ck_assert_msg(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request"); request->IsPassive = 0; request->NameIDPolicy = g_strdup(LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED); request->consent = g_strdup(LASSO_LIB_CONSENT_OBTAINED); relayState = "fake"; request->RelayState = g_strdup(relayState); rc = lasso_login_build_authn_request_msg(spLoginContext); - fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed"); authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url; - fail_unless(authnRequestUrl != NULL, + ck_assert_msg(authnRequestUrl != NULL, "authnRequestUrl shouldn't be NULL"); authnRequestQuery = strchr(authnRequestUrl, '?')+1; - fail_unless(strlen(authnRequestQuery) > 0, + ck_assert_msg(strlen(authnRequestQuery) > 0, "authnRequestRequest shouldn't be an empty string"); /* Identity provider singleSignOn, for a user having no federation. */ identityProviderContextDump = generateIdentityProviderContextDumpMemory(); idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new(idpContext); - fail_unless(idpLoginContext != NULL, + ck_assert_msg(idpLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery); - fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed"); - fail_unless(lasso_login_must_authenticate(idpLoginContext), + ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed"); + ck_assert_msg(lasso_login_must_authenticate(idpLoginContext), "lasso_login_must_authenticate() should be TRUE"); - fail_unless(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART, + ck_assert_msg(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART, "protocoleProfile should be ProfileBrwsArt"); - fail_unless(! lasso_login_must_ask_for_consent(idpLoginContext), + ck_assert_msg(! lasso_login_must_ask_for_consent(idpLoginContext), "lasso_login_must_ask_for_consent() should be FALSE"); rc = lasso_login_validate_request_msg(idpLoginContext, 1, /* authentication_result */ @@ -385,20 +385,20 @@ START_TEST(test03_serviceProviderLogin) "FIXME: notBefore", "FIXME: notOnOrAfter"); rc = lasso_login_build_artifact_msg(idpLoginContext, LASSO_HTTP_METHOD_REDIRECT); - fail_unless(rc == 0, "lasso_login_build_artifact_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_artifact_msg failed"); idpIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(idpLoginContext)->identity); - fail_unless(idpIdentityContextDump != NULL, + ck_assert_msg(idpIdentityContextDump != NULL, "lasso_identity_dump shouldn't return NULL"); idpSessionContextDump = lasso_session_dump(LASSO_PROFILE(idpLoginContext)->session); - fail_unless(idpSessionContextDump != NULL, + ck_assert_msg(idpSessionContextDump != NULL, "lasso_session_dump shouldn't return NULL"); responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url; - fail_unless(responseUrl != NULL, "responseUrl shouldn't be NULL"); + ck_assert_msg(responseUrl != NULL, "responseUrl shouldn't be NULL"); responseQuery = strchr(responseUrl, '?')+1; - fail_unless(strlen(responseQuery) > 0, + ck_assert_msg(strlen(responseQuery) > 0, "responseQuery shouldn't be an empty string"); serviceProviderId = g_strdup(LASSO_PROFILE(idpLoginContext)->remote_providerID); - fail_unless(serviceProviderId != NULL, + ck_assert_msg(serviceProviderId != NULL, "lasso_profile_get_remote_providerID shouldn't return NULL"); if (lasso_flag_thin_sessions) { /* when using thin sessions, the way artifact message is constructed changes as the @@ -416,44 +416,44 @@ START_TEST(test03_serviceProviderLogin) rc = lasso_login_init_request(spLoginContext, responseQuery, LASSO_HTTP_METHOD_REDIRECT); - fail_unless(rc == 0, "lasso_login_init_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_request failed"); rc = lasso_login_build_request_msg(spLoginContext); - fail_unless(rc == 0, "lasso_login_build_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_request_msg failed"); soapRequestMsg = LASSO_PROFILE(spLoginContext)->msg_body; - fail_unless(soapRequestMsg != NULL, "soapRequestMsg must not be NULL"); + ck_assert_msg(soapRequestMsg != NULL, "soapRequestMsg must not be NULL"); /* Identity provider SOAP endpoint */ lasso_server_destroy(idpContext); lasso_login_destroy(idpLoginContext); requestType = lasso_profile_get_request_type_from_soap_msg(soapRequestMsg); - fail_unless(requestType == LASSO_REQUEST_TYPE_LOGIN, + ck_assert_msg(requestType == LASSO_REQUEST_TYPE_LOGIN, "requestType should be LASSO_REQUEST_TYPE_LOGIN"); idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new(idpContext); rc = lasso_login_process_request_msg(idpLoginContext, soapRequestMsg); - fail_unless(rc == 0, "lasso_login_process_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_process_request_msg failed"); if (lasso_flag_thin_sessions) { check_str_equals(idpLoginContext->assertionArtifact, artifact); lasso_profile_set_artifact_message(&idpLoginContext->parent, artifact_message); } rc = lasso_profile_set_session_from_dump(LASSO_PROFILE(idpLoginContext), idpSessionContextDump); - fail_unless(rc == 0, "lasso_login_set_assertion_from_dump failed"); + ck_assert_msg(rc == 0, "lasso_login_set_assertion_from_dump failed"); rc = lasso_login_build_response_msg(idpLoginContext, serviceProviderId); - fail_unless(rc == 0, "lasso_login_build_response_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_response_msg failed"); soapResponseMsg = LASSO_PROFILE(idpLoginContext)->msg_body; - fail_unless(soapResponseMsg != NULL, "soapResponseMsg must not be NULL"); + ck_assert_msg(soapResponseMsg != NULL, "soapResponseMsg must not be NULL"); /* Service provider assertion consumer (step 2: process SOAP response) */ rc = lasso_login_process_response_msg(spLoginContext, soapResponseMsg); - fail_unless(rc == 0, "lasso_login_process_response_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_process_response_msg failed"); rc = lasso_login_accept_sso(spLoginContext); - fail_unless(rc == 0, "lasso_login_accept_sso failed"); - fail_unless(LASSO_PROFILE(spLoginContext)->identity != NULL, + ck_assert_msg(rc == 0, "lasso_login_accept_sso failed"); + ck_assert_msg(LASSO_PROFILE(spLoginContext)->identity != NULL, "spLoginContext has no identity"); spIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(spLoginContext)->identity); - fail_unless(spIdentityContextDump != NULL, "lasso_identity_dump failed"); + ck_assert_msg(spIdentityContextDump != NULL, "lasso_identity_dump failed"); spSessionDump = lasso_session_dump(LASSO_PROFILE(spLoginContext)->session); g_free(serviceProviderId); @@ -484,35 +484,35 @@ START_TEST(test04_multiple_dump_cycle) serviceProviderContextDump = generateServiceProviderContextDump(); spContext = lasso_server_new_from_dump(serviceProviderContextDump); spLoginContext = lasso_login_new(spContext); - fail_unless(spLoginContext != NULL, + ck_assert_msg(spLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_init_authn_request(spLoginContext, "https://idp1/metadata", LASSO_HTTP_METHOD_REDIRECT); - fail_unless(rc == 0, "lasso_login_init_authn_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed"); request = LASSO_LIB_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request); - fail_unless(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request"); + ck_assert_msg(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request"); request->IsPassive = 0; request->NameIDPolicy = g_strdup(LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED); request->consent = g_strdup(LASSO_LIB_CONSENT_OBTAINED); relayState = "fake"; request->RelayState = g_strdup(relayState); rc = lasso_login_build_authn_request_msg(spLoginContext); - fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed"); authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url; - fail_unless(authnRequestUrl != NULL, + ck_assert_msg(authnRequestUrl != NULL, "authnRequestUrl shouldn't be NULL"); authnRequestQuery = strchr(authnRequestUrl, '?')+1; - fail_unless(strlen(authnRequestQuery) > 0, + ck_assert_msg(strlen(authnRequestQuery) > 0, "authnRequestRequest shouldn't be an empty string"); /* Identity provider singleSignOn, for a user having no federation. */ identityProviderContextDump = generateIdentityProviderContextDumpMemory(); idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new(idpContext); - fail_unless(idpLoginContext != NULL, + ck_assert_msg(idpLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery); - fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed"); idpLoginContextDump = lasso_login_dump(idpLoginContext); check_not_null(idpLoginContextDump); g_object_unref(idpLoginContext); diff --git a/tests/login_tests_saml2.c b/tests/login_tests_saml2.c index e1d78b5b..9b4caa5a 100644 --- a/tests/login_tests_saml2.c +++ b/tests/login_tests_saml2.c @@ -125,11 +125,11 @@ START_TEST(test01_saml2_generateServersContextDumps) char *serviceProviderContextDump; identityProviderContextDump = generateIdentityProviderContextDump(); - fail_unless(identityProviderContextDump != NULL, + ck_assert_msg(identityProviderContextDump != NULL, "generateIdentityProviderContextDump should not return NULL"); g_free(identityProviderContextDump); serviceProviderContextDump = generateServiceProviderContextDump(); - fail_unless(serviceProviderContextDump != NULL, + ck_assert_msg(serviceProviderContextDump != NULL, "generateServiceProviderContextDump should not return NULL"); g_free(serviceProviderContextDump); } @@ -159,37 +159,37 @@ START_TEST(test02_saml2_serviceProviderLogin) serviceProviderContextDump = generateServiceProviderContextDump(); spContext = lasso_server_new_from_dump(serviceProviderContextDump); spLoginContext = lasso_login_new(spContext); - fail_unless(spLoginContext != NULL, + ck_assert_msg(spLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_init_authn_request(spLoginContext, "http://idp5/metadata", LASSO_HTTP_METHOD_REDIRECT); - fail_unless(rc == 0, "lasso_login_init_authn_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed"); request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request); - fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); + ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); request->IsPassive = 0; lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT); request->NameIDPolicy->AllowCreate = 1; relayState = "fake[]"; lasso_assign_string(LASSO_PROFILE(spLoginContext)->msg_relayState, relayState); rc = lasso_login_build_authn_request_msg(spLoginContext); - fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed"); authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url; - fail_unless(authnRequestUrl != NULL, + ck_assert_msg(authnRequestUrl != NULL, "authnRequestUrl shouldn't be NULL"); authnRequestQuery = strchr(authnRequestUrl, '?')+1; - fail_unless(strlen(authnRequestQuery) > 0, + ck_assert_msg(strlen(authnRequestQuery) > 0, "authnRequestQuery shouldn't be an empty string"); spLoginDump = lasso_node_dump(LASSO_NODE(spLoginContext)); - fail_unless(strstr(authnRequestQuery, "RelayState") != NULL, + ck_assert_msg(strstr(authnRequestQuery, "RelayState") != NULL, "authnRequestQuery should contain a RelayState parameter"); - fail_unless(strstr(authnRequestQuery, "fake%5B%5D") != NULL, + ck_assert_msg(strstr(authnRequestQuery, "fake%5B%5D") != NULL, "authnRequestQuery RelayState parameter should be encoded"); /* Identity provider singleSignOn, for a user having no federation. */ identityProviderContextDump = generateIdentityProviderContextDump(); idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new(idpContext); - fail_unless(idpLoginContext != NULL, + ck_assert_msg(idpLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); check_good_rc(lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery)); check_true(lasso_login_must_authenticate(idpLoginContext)); @@ -221,7 +221,7 @@ START_TEST(test02_saml2_serviceProviderLogin) responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url; check_not_null(responseUrl); responseQuery = strchr(responseUrl, '?')+1; - fail_unless(strlen(responseQuery) > 0, + ck_assert_msg(strlen(responseQuery) > 0, "responseQuery shouldn't be an empty string"); check_not_null(strstr(responseQuery, "RelayState")); check_not_null(strstr(responseQuery, "fake%5B%5D")); @@ -358,40 +358,40 @@ START_TEST(test03_saml2_serviceProviderLogin) serviceProviderContextDump = generateServiceProviderContextDump(); spContext = lasso_server_new_from_dump(serviceProviderContextDump); spLoginContext = lasso_login_new(spContext); - fail_unless(spLoginContext != NULL, + ck_assert_msg(spLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_init_authn_request(spLoginContext, "http://idp5/metadata", LASSO_HTTP_METHOD_REDIRECT); - fail_unless(rc == 0, "lasso_login_init_authn_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed"); request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request); - fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); + ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); request->IsPassive = 0; lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT); request->NameIDPolicy->AllowCreate = 1; relayState = "fake"; lasso_assign_string(LASSO_PROFILE(spLoginContext)->msg_relayState, relayState); rc = lasso_login_build_authn_request_msg(spLoginContext); - fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed"); authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url; - fail_unless(authnRequestUrl != NULL, + ck_assert_msg(authnRequestUrl != NULL, "authnRequestUrl shouldn't be NULL"); authnRequestQuery = strchr(authnRequestUrl, '?')+1; - fail_unless(strlen(authnRequestQuery) > 0, + ck_assert_msg(strlen(authnRequestQuery) > 0, "authnRequestRequest shouldn't be an empty string"); /* Identity provider singleSignOn, for a user having no federation. */ identityProviderContextDump = generateIdentityProviderContextDumpMemory(); idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new(idpContext); - fail_unless(idpLoginContext != NULL, + ck_assert_msg(idpLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery); - fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed"); - fail_unless(lasso_login_must_authenticate(idpLoginContext), + ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed"); + ck_assert_msg(lasso_login_must_authenticate(idpLoginContext), "lasso_login_must_authenticate() should be TRUE"); - fail_unless(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART, + ck_assert_msg(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART, "protocoleProfile should be ProfileBrwsArt"); - fail_unless(! lasso_login_must_ask_for_consent(idpLoginContext), + ck_assert_msg(! lasso_login_must_ask_for_consent(idpLoginContext), "lasso_login_must_ask_for_consent() should be FALSE"); rc = lasso_login_validate_request_msg(idpLoginContext, 1, /* authentication_result */ @@ -405,21 +405,21 @@ START_TEST(test03_saml2_serviceProviderLogin) "FIXME: notBefore", "FIXME: notOnOrAfter"); rc = lasso_login_build_artifact_msg(idpLoginContext, LASSO_HTTP_METHOD_ARTIFACT_GET); - fail_unless(rc == 0, "lasso_login_build_artifact_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_artifact_msg failed"); idpIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(idpLoginContext)->identity); - fail_unless(idpIdentityContextDump != NULL, + ck_assert_msg(idpIdentityContextDump != NULL, "lasso_identity_dump shouldn't return NULL"); idpSessionContextDump = lasso_session_dump(LASSO_PROFILE(idpLoginContext)->session); - fail_unless(idpSessionContextDump != NULL, + ck_assert_msg(idpSessionContextDump != NULL, "lasso_session_dump shouldn't return NULL"); responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url; - fail_unless(responseUrl != NULL, "responseUrl shouldn't be NULL"); + ck_assert_msg(responseUrl != NULL, "responseUrl shouldn't be NULL"); responseQuery = strchr(responseUrl, '?')+1; - fail_unless(strlen(responseQuery) > 0, + ck_assert_msg(strlen(responseQuery) > 0, "responseQuery shouldn't be an empty string"); lasso_assign_string(serviceProviderId, LASSO_PROFILE(idpLoginContext)->remote_providerID); - fail_unless(serviceProviderId != NULL, + ck_assert_msg(serviceProviderId != NULL, "lasso_profile_get_remote_providerID shouldn't return NULL"); /* Service provider assertion consumer */ @@ -431,11 +431,11 @@ START_TEST(test03_saml2_serviceProviderLogin) rc = lasso_login_init_request(spLoginContext, responseQuery, LASSO_HTTP_METHOD_ARTIFACT_GET); - fail_unless(rc == 0, "lasso_login_init_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_request failed"); rc = lasso_login_build_request_msg(spLoginContext); - fail_unless(rc == 0, "lasso_login_build_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_request_msg failed"); soapRequestMsg = LASSO_PROFILE(spLoginContext)->msg_body; - fail_unless(soapRequestMsg != NULL, "soapRequestMsg must not be NULL"); + ck_assert_msg(soapRequestMsg != NULL, "soapRequestMsg must not be NULL"); /* Identity provider SOAP endpoint */ lasso_server_destroy(idpContext); @@ -445,25 +445,25 @@ START_TEST(test03_saml2_serviceProviderLogin) idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new_from_dump(idpContext, idpLoginDump); rc = lasso_login_process_request_msg(idpLoginContext, soapRequestMsg); - fail_unless(rc == 0, "lasso_login_process_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_process_request_msg failed"); rc = lasso_profile_set_session_from_dump(LASSO_PROFILE(idpLoginContext), idpSessionContextDump); - fail_unless(rc == 0, "lasso_login_set_assertion_from_dump failed"); + ck_assert_msg(rc == 0, "lasso_login_set_assertion_from_dump failed"); rc = lasso_login_build_response_msg(idpLoginContext, serviceProviderId); - fail_unless(rc == 0, "lasso_login_build_response_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_response_msg failed"); soapResponseMsg = LASSO_PROFILE(idpLoginContext)->msg_body; - fail_unless(soapResponseMsg != NULL, "soapResponseMsg must not be NULL"); + ck_assert_msg(soapResponseMsg != NULL, "soapResponseMsg must not be NULL"); /* Service provider assertion consumer (step 2: process SOAP response) */ rc = lasso_login_process_response_msg(spLoginContext, soapResponseMsg); - fail_unless(rc == 0, "lasso_login_process_response_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_process_response_msg failed"); rc = lasso_login_accept_sso(spLoginContext); - fail_unless(rc == 0, "lasso_login_accept_sso failed"); - fail_unless(LASSO_PROFILE(spLoginContext)->identity != NULL, + ck_assert_msg(rc == 0, "lasso_login_accept_sso failed"); + ck_assert_msg(LASSO_PROFILE(spLoginContext)->identity != NULL, "spLoginContext has no identity"); spIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(spLoginContext)->identity); - fail_unless(spIdentityContextDump != NULL, "lasso_identity_dump failed"); + ck_assert_msg(spIdentityContextDump != NULL, "lasso_identity_dump failed"); spSessionDump = lasso_session_dump(LASSO_PROFILE(spLoginContext)->session); g_free(idpLoginDump); @@ -505,37 +505,37 @@ START_TEST(test04_sso_then_slo_soap) serviceProviderContextDump = generateServiceProviderContextDump(); spContext = lasso_server_new_from_dump(serviceProviderContextDump); spLoginContext = lasso_login_new(spContext); - fail_unless(spLoginContext != NULL, + ck_assert_msg(spLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); rc = lasso_login_init_authn_request(spLoginContext, "http://idp5/metadata", LASSO_HTTP_METHOD_REDIRECT); - fail_unless(rc == 0, "lasso_login_init_authn_request failed"); + ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed"); request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request); - fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); + ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); request->IsPassive = 0; lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT); request->NameIDPolicy->AllowCreate = 1; relayState = "fake[]"; lasso_assign_string(LASSO_PROFILE(spLoginContext)->msg_relayState, relayState); rc = lasso_login_build_authn_request_msg(spLoginContext); - fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed"); + ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed"); authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url; - fail_unless(authnRequestUrl != NULL, + ck_assert_msg(authnRequestUrl != NULL, "authnRequestUrl shouldn't be NULL"); authnRequestQuery = strchr(authnRequestUrl, '?')+1; - fail_unless(strlen(authnRequestQuery) > 0, + ck_assert_msg(strlen(authnRequestQuery) > 0, "authnRequestQuery shouldn't be an empty string"); spLoginDump = lasso_node_dump(LASSO_NODE(spLoginContext)); - fail_unless(strstr(authnRequestQuery, "RelayState") != NULL, + ck_assert_msg(strstr(authnRequestQuery, "RelayState") != NULL, "authnRequestQuery should contain a RelayState parameter"); - fail_unless(strstr(authnRequestQuery, "fake%5B%5D") != NULL, + ck_assert_msg(strstr(authnRequestQuery, "fake%5B%5D") != NULL, "authnRequestQuery RelayState parameter should be encoded"); /* Identity provider singleSignOn, for a user having no federation. */ identityProviderContextDump = generateIdentityProviderContextDump(); idpContext = lasso_server_new_from_dump(identityProviderContextDump); idpLoginContext = lasso_login_new(idpContext); - fail_unless(idpLoginContext != NULL, + ck_assert_msg(idpLoginContext != NULL, "lasso_login_new() shouldn't have returned NULL"); check_good_rc(lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery)); check_true(lasso_login_must_authenticate(idpLoginContext)); @@ -567,7 +567,7 @@ START_TEST(test04_sso_then_slo_soap) responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url; check_not_null(responseUrl); responseQuery = strchr(responseUrl, '?')+1; - fail_unless(strlen(responseQuery) > 0, + ck_assert_msg(strlen(responseQuery) > 0, "responseQuery shouldn't be an empty string"); check_not_null(strstr(responseQuery, "RelayState")); check_not_null(strstr(responseQuery, "fake%5B%5D")); @@ -696,7 +696,7 @@ START_TEST(test05_sso_idp_with_key_rollover) TESTSDATADIR "idp11-multikey-saml2/private-key-1.pem", NULL, /* Secret key to unlock private key */ TESTSDATADIR "idp11-multikey-saml2/certificate-1.pem"); - check_not_null(idpContext1) + check_not_null(idpContext1); check_good_rc(lasso_server_add_provider( idpContext1, LASSO_PROVIDER_ROLE_SP, @@ -709,7 +709,7 @@ START_TEST(test05_sso_idp_with_key_rollover) TESTSDATADIR "idp11-multikey-saml2/private-key-2.pem", NULL, /* Secret key to unlock private key */ TESTSDATADIR "idp11-multikey-saml2/certificate-2.pem"); - check_not_null(idpContext2) + check_not_null(idpContext2); check_good_rc(lasso_server_add_provider( idpContext2, LASSO_PROVIDER_ROLE_SP, @@ -722,7 +722,7 @@ START_TEST(test05_sso_idp_with_key_rollover) TESTSDATADIR "/sp6-saml2/private-key.pem", NULL, /* Secret key to unlock private key */ NULL); - check_not_null(spContext) + check_not_null(spContext); check_good_rc(lasso_server_add_provider( spContext, LASSO_PROVIDER_ROLE_IDP, @@ -827,7 +827,7 @@ sso_sp_with_key_rollover(LassoServer *idp_context, LassoServer *sp_context) LassoLogin *sp_login_context; check_not_null(idp_login_context = lasso_login_new(idp_context)); - check_not_null(sp_login_context = lasso_login_new(sp_context)) + check_not_null(sp_login_context = lasso_login_new(sp_context)); /* Create response */ check_good_rc(lasso_login_init_idp_initiated_authn_request(idp_login_context, @@ -935,7 +935,7 @@ sso_initiated_by_sp(LassoServer *idp_context, LassoServer *sp_context, SsoCallba char *authn_request_query; check_not_null(idp_login_context = lasso_login_new(idp_context)); - check_not_null(sp_login_context = lasso_login_new(sp_context)) + check_not_null(sp_login_context = lasso_login_new(sp_context)); /* Create response */ check_good_rc(lasso_login_init_authn_request(sp_login_context, NULL, LASSO_HTTP_METHOD_REDIRECT)); @@ -1026,7 +1026,7 @@ sso_initiated_by_sp2(LassoServer *idp_context, LassoServer *sp_context, SsoSetti char *authn_request_query; check_not_null(idp_login_context = lasso_login_new(idp_context)); - check_not_null(sp_login_context = lasso_login_new(sp_context)) + check_not_null(sp_login_context = lasso_login_new(sp_context)); /* Create response */ check_good_rc(lasso_login_init_authn_request(sp_login_context, NULL, LASSO_HTTP_METHOD_REDIRECT)); @@ -1332,7 +1332,7 @@ void test_ecp(EcpIdpListVariant ecpIDPListVariant, /* Set PAOS authn request parameters */ request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request); - fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); + ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request"); request->IsPassive = is_passive; lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT); diff --git a/tests/metadata_tests.c b/tests/metadata_tests.c index 7ed6b0f6..0fe8871d 100644 --- a/tests/metadata_tests.c +++ b/tests/metadata_tests.c @@ -43,7 +43,7 @@ START_TEST(test01_metadata_load_der_certificate_from_x509_cert) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSMETADATADIR "/metadata_01.xml", NULL, NULL); - fail_unless(provider != NULL, "Can't load DER certificate from "); + ck_assert_msg(provider != NULL, "Can't load DER certificate from "); g_object_unref(provider); } END_TEST @@ -52,7 +52,7 @@ START_TEST(test02_metadata_load_pem_certificate_from_x509_cert) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSMETADATADIR "/metadata_02.xml", NULL, NULL); - fail_unless(provider != NULL, "Can't load PEM certificate from "); + ck_assert_msg(provider != NULL, "Can't load PEM certificate from "); g_object_unref(provider); } END_TEST @@ -61,7 +61,7 @@ START_TEST(test03_metadata_load_der_public_key_from_keyvalue) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSMETADATADIR "/metadata_03.xml", NULL, NULL); - fail_unless(provider != NULL, "Can't load DER public key from "); + ck_assert_msg(provider != NULL, "Can't load DER public key from "); g_object_unref(provider); } END_TEST @@ -70,7 +70,7 @@ START_TEST(test04_metadata_load_pem_public_key_from_keyvalue) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSMETADATADIR "/metadata_04.xml", NULL, NULL); - fail_unless(provider != NULL, "Can't load PEM public key from "); + ck_assert_msg(provider != NULL, "Can't load PEM public key from "); g_object_unref(provider); } END_TEST @@ -79,7 +79,7 @@ START_TEST(test05_metadata_load_public_key_from_x509_cert) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSMETADATADIR "/metadata_05.xml", NULL, NULL); - fail_unless(provider != NULL, "Can't load DER public key from "); + ck_assert_msg(provider != NULL, "Can't load DER public key from "); g_object_unref(provider); } END_TEST @@ -88,7 +88,7 @@ START_TEST(test06_metadata_load_public_key_from_rsa_keyvalue) { LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSMETADATADIR "/metadata_06.xml", NULL, NULL); - fail_unless(provider != NULL, "Can't load RSAKeyValue node"); + ck_assert_msg(provider != NULL, "Can't load RSAKeyValue node"); g_object_unref(provider); } END_TEST @@ -116,7 +116,7 @@ START_TEST(test07_metadata_role_descriptors) LASSO_SAML2_METADATA_ATTRIBUTE_WANT_AUTHN_REQUEST_SIGNED); check_not_null(l); check_null(l->next); - check_str_equals(l->data, "true"); + check_str_equals((char*)l->data, "true"); lasso_release_gobject(provider); } END_TEST diff --git a/tests/random_tests.c b/tests/random_tests.c index cf112c7e..ff60e73b 100644 --- a/tests/random_tests.c +++ b/tests/random_tests.c @@ -46,10 +46,10 @@ START_TEST(test01_provider_new) TESTSDATADIR "/sp1-la/metadata.xml", TESTSDATADIR "/sp1-la/public-key.pem", TESTSDATADIR "/ca1-la/certificate.pem"); - fail_unless(LASSO_IS_PROVIDER(provider)); + ck_assert(LASSO_IS_PROVIDER(provider)); dump = lasso_node_dump(LASSO_NODE(provider)); - fail_unless(dump != NULL); + ck_assert(dump != NULL); g_object_unref(provider); lasso_release_string(dump); } @@ -64,15 +64,15 @@ START_TEST(test02_provider_new_from_dump) TESTSDATADIR "/sp1-la/metadata.xml", TESTSDATADIR "/sp1-la/public-key.pem", TESTSDATADIR "/ca1-la/certificate.pem"); - fail_unless(LASSO_IS_PROVIDER(provider1)); + ck_assert(LASSO_IS_PROVIDER(provider1)); dump = lasso_node_dump(LASSO_NODE(provider1)); - fail_unless(dump != NULL); + ck_assert(dump != NULL); provider2 = lasso_provider_new_from_dump(dump); - fail_unless(LASSO_IS_PROVIDER(provider2)); + ck_assert(LASSO_IS_PROVIDER(provider2)); lasso_release_string(dump); dump = lasso_node_dump(LASSO_NODE(provider2)); - fail_unless(dump != NULL); + ck_assert(dump != NULL); g_object_unref(provider1); g_object_unref(provider2); lasso_release_string(dump); @@ -92,37 +92,37 @@ START_TEST(test01_server_new) TESTSDATADIR "/idp1-la/private-key-raw.pem", NULL, /* Secret key to unlock private key */ TESTSDATADIR "/idp1-la/certificate.pem"); - fail_unless(LASSO_IS_SERVER(server)); + ck_assert(LASSO_IS_SERVER(server)); provider = LASSO_PROVIDER(server); - fail_unless(server->private_key != NULL); - fail_unless(server->private_key_password == NULL); - fail_unless(server->certificate != NULL); - fail_unless(server->signature_method == lasso_get_default_signature_method()); - fail_unless(provider->ProviderID != NULL); - fail_unless(provider->role == 0); - fail_unless(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL)); - fail_unless(strcmp(provider->metadata_filename, content) == 0); + ck_assert(server->private_key != NULL); + ck_assert(server->private_key_password == NULL); + ck_assert(server->certificate != NULL); + ck_assert(server->signature_method == lasso_get_default_signature_method()); + ck_assert(provider->ProviderID != NULL); + ck_assert(provider->role == 0); + ck_assert(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL)); + ck_assert(strcmp(provider->metadata_filename, content) == 0); g_free(content); - fail_unless(provider->public_key == NULL); - fail_unless(provider->ca_cert_chain == NULL); + ck_assert(provider->public_key == NULL); + ck_assert(provider->ca_cert_chain == NULL); dump = lasso_node_dump(LASSO_NODE(server)); - fail_unless(dump != NULL); + ck_assert(dump != NULL); g_object_unref(server); server = lasso_server_new_from_dump(dump); - fail_unless(LASSO_IS_SERVER(server)); + ck_assert(LASSO_IS_SERVER(server)); provider = LASSO_PROVIDER(server); - fail_unless(server->private_key != NULL); - fail_unless(server->private_key_password == NULL); - fail_unless(server->certificate != NULL); - fail_unless(server->signature_method == lasso_get_default_signature_method()); - fail_unless(server->providers != NULL); - fail_unless(provider->ProviderID != NULL); - fail_unless(provider->role == 0, "provider->role != 0 => provider := %d", provider->role); - fail_unless(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL)); - fail_unless(strcmp(provider->metadata_filename, content) == 0); - fail_unless(provider->public_key == NULL); - fail_unless(provider->ca_cert_chain == NULL); + ck_assert(server->private_key != NULL); + ck_assert(server->private_key_password == NULL); + ck_assert(server->certificate != NULL); + ck_assert(server->signature_method == lasso_get_default_signature_method()); + ck_assert(server->providers != NULL); + ck_assert(provider->ProviderID != NULL); + ck_assert_msg(provider->role == 0, "provider->role != 0 => provider := %d", provider->role); + ck_assert(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL)); + ck_assert(strcmp(provider->metadata_filename, content) == 0); + ck_assert(provider->public_key == NULL); + ck_assert(provider->ca_cert_chain == NULL); g_object_unref(server); lasso_release_string(dump); lasso_release_string(content); @@ -139,19 +139,19 @@ START_TEST(test02_server_add_provider) TESTSDATADIR "/idp1-la/private-key-raw.pem", NULL, /* Secret key to unlock private key */ TESTSDATADIR "/idp1-la/certificate.pem"); - fail_unless(LASSO_IS_SERVER(server)); - fail_unless(server->private_key != NULL); - fail_unless(! server->private_key_password); - fail_unless(server->certificate != NULL); - fail_unless(server->signature_method == lasso_get_default_signature_method()); - fail_unless(server->providers != NULL); + ck_assert(LASSO_IS_SERVER(server)); + ck_assert(server->private_key != NULL); + ck_assert(! server->private_key_password); + ck_assert(server->certificate != NULL); + ck_assert(server->signature_method == lasso_get_default_signature_method()); + ck_assert(server->providers != NULL); lasso_server_add_provider( server, LASSO_PROVIDER_ROLE_SP, TESTSDATADIR "/sp1-la/metadata.xml", TESTSDATADIR "/sp1-la/public-key.pem", TESTSDATADIR "/ca1-la/certificate.pem"); - fail_unless(g_hash_table_size(server->providers) == 1); + ck_assert(g_hash_table_size(server->providers) == 1); dump = lasso_node_dump(LASSO_NODE(server)); @@ -206,9 +206,9 @@ START_TEST(test04_node_new_from_dump) char *dump; node = lasso_node_new_from_dump(msg); - fail_unless(node != NULL, "new_from_dump failed"); + ck_assert_msg(node != NULL, "new_from_dump failed"); dump = lasso_node_dump(node); - fail_unless(dump != NULL, "node_dump failed"); + ck_assert_msg(dump != NULL, "node_dump failed"); g_object_unref(node); g_free(dump); } @@ -241,11 +241,11 @@ START_TEST(test05_xsi_type) stmt->AuthnContext->AuthnContextClassRef = g_strdup("urn:toto"); dump = lasso_node_dump(LASSO_NODE(assertion)); - fail_unless(strstr(dump, "xsi:type=\"lib:AuthnContextType\"") == NULL, + ck_assert_msg(strstr(dump, "xsi:type=\"lib:AuthnContextType\"") == NULL, "AuthnContext got a xsi:type"); g_free(dump); dump = lasso_node_dump(LASSO_NODE(assertion)); - fail_unless(strstr(dump, "xsi:type=\"lib:AuthenticationStatementType\"") != NULL, + ck_assert_msg(strstr(dump, "xsi:type=\"lib:AuthenticationStatementType\"") != NULL, "AuthenticationStatement didn't get a xsi:type"); g_free(dump); g_object_unref(assertion); @@ -262,7 +262,7 @@ START_TEST(test06_lib_statuscode) lasso_assign_string(response->Status->StatusCode->Value, LASSO_SAML_STATUS_CODE_SUCCESS); dump = lasso_node_dump(LASSO_NODE(response)); - fail_unless(strstr(dump, "xmlns:lib=") == NULL, + ck_assert_msg(strstr(dump, "xmlns:lib=") == NULL, "liberty namespace should not be defined"); lasso_release_string(dump); @@ -271,7 +271,7 @@ START_TEST(test06_lib_statuscode) response->Status->StatusCode->StatusCode->Value = g_strdup( LASSO_LIB_STATUS_CODE_UNKNOWN_PRINCIPAL); dump = lasso_node_dump(LASSO_NODE(response)); - fail_unless(strstr(dump, "xmlns:lib=") != NULL, + ck_assert_msg(strstr(dump, "xmlns:lib=") != NULL, "liberty namespace should be defined"); lasso_release_string(dump); g_object_unref(response); @@ -319,11 +319,11 @@ LlTxKnCrWAXftSm1rNtewTsF\n\ xmlSecKeyPtr key = lasso_xmlsec_load_private_key_from_buffer(pkey, sizeof(pkey)-1, NULL, LASSO_SIGNATURE_METHOD_RSA_SHA256, NULL); - fail_unless(key != NULL, "Cannot load public key"); - fail_unless(lasso_saml2_query_verify_signature(query1, key) == 0, "Signature was not validated"); + ck_assert_msg(key != NULL, "Cannot load public key"); + ck_assert_msg(lasso_saml2_query_verify_signature(query1, key) == 0, "Signature was not validated"); /* test reordering and semi-colon separator support */ - fail_unless(lasso_saml2_query_verify_signature(query2, key) == 0, "Disordered signature was not validated"); - fail_unless(lasso_saml2_query_verify_signature(query3, key) != 0, "Altered signature was validated"); + ck_assert_msg(lasso_saml2_query_verify_signature(query2, key) == 0, "Disordered signature was not validated"); + ck_assert_msg(lasso_saml2_query_verify_signature(query3, key) != 0, "Altered signature was validated"); xmlSecKeyDestroy(key); } END_TEST @@ -405,21 +405,21 @@ AQAB\n\ xmlDoc *doc; doc = xmlParseDoc(BAD_CAST message); - fail_unless(key != NULL, "Cannot load public key"); - fail_unless(lasso_key_query_verify(key, query1) == 0, "Signature was not validated"); + ck_assert_msg(key != NULL, "Cannot load public key"); + ck_assert_msg(lasso_key_query_verify(key, query1) == 0, "Signature was not validated"); /* test reordering and semi-colon separator support */ - fail_unless(lasso_key_query_verify(key, query2) == 0, "Disordered signature was not validated"); - fail_unless(lasso_key_query_verify(key, query3) != 0, "Altered signature was validated"); - fail_unless(lasso_key_saml2_xml_verify(key, + ck_assert_msg(lasso_key_query_verify(key, query2) == 0, "Disordered signature was not validated"); + ck_assert_msg(lasso_key_query_verify(key, query3) != 0, "Altered signature was validated"); + ck_assert_msg(lasso_key_saml2_xml_verify(key, "_5E4DB038BC15C020CE085F743D485443", xmlDocGetRootElement(doc)) == 0, "XML Signature is not validated"); g_object_unref(key); - fail_unless(key2 != NULL, "Cannot load public key2"); - fail_unless(lasso_key_query_verify(key2, query1) == 0, "Signature was not validated"); + ck_assert_msg(key2 != NULL, "Cannot load public key2"); + ck_assert_msg(lasso_key_query_verify(key2, query1) == 0, "Signature was not validated"); /* test reordering and semi-colon separator support */ - fail_unless(lasso_key_query_verify(key2, query2) == 0, "Disordered signature was not validated"); - fail_unless(lasso_key_query_verify(key2, query3) != 0, "Altered signature was validated"); - fail_unless(lasso_key_saml2_xml_verify(key2, + ck_assert_msg(lasso_key_query_verify(key2, query2) == 0, "Disordered signature was not validated"); + ck_assert_msg(lasso_key_query_verify(key2, query3) != 0, "Altered signature was validated"); + ck_assert_msg(lasso_key_saml2_xml_verify(key2, "_5E4DB038BC15C020CE085F743D485443", xmlDocGetRootElement(doc)) == 0, "XML Signature is not validated"); g_object_unref(key2); diff --git a/tests/tests.c b/tests/tests.c index 6fd0ebfc..52c6af32 100644 --- a/tests/tests.c +++ b/tests/tests.c @@ -66,7 +66,7 @@ void set_mute_logger() { g_log_set_default_handler(mute_logger, NULL); if (log_failed) { log_failed = 0; - fail("There were logs, there should not"); + ck_assert_msg(0, "There were logs, there should not"); } } @@ -102,7 +102,7 @@ fail_logger(const gchar *log_domain G_GNUC_UNUSED, GLogLevelFlags log_level, g_assert_not_reached(); } if (! dontfork) { - fail("No logging output expected: message «%s» was emitted for domain «%s» at the level «%s»", message, log_domain, level_name); + ck_assert_msg(0, "No logging output expected: message «%s» was emitted for domain «%s» at the level «%s»", message, log_domain, level_name); } printf("No logging output expected: message «%s» was emitted for domain «%s» at the level «%s»", message, log_domain, level_name); log_failed = 1; @@ -119,7 +119,7 @@ my_malloc(size_t size) { void *ptr = malloc_func(size); if (! ptr) { - fail("xmlMalloc failed"); + ck_assert_msg(0, "xmlMalloc failed"); } return ptr; } @@ -129,7 +129,7 @@ my_realloc(void *mem, size_t size) { void *ptr = realloc_func(mem, size); if (! ptr) { - fail("xmlRealloc failed"); + ck_assert_msg(0, "xmlRealloc failed"); } return ptr; } diff --git a/tests/tests.h b/tests/tests.h index bb4bb839..256b75ba 100644 --- a/tests/tests.h +++ b/tests/tests.h @@ -25,46 +25,41 @@ #include "../lasso/lasso_config.h" #define check_not_null(what) \ - fail_unless((what) != NULL, "%s:%i: " #what " returned NULL", __func__, __LINE__); + ck_assert((what) != NULL) #define check_null(what) \ - fail_unless((what) == NULL, "%s:%i: "#what " returned NULL", __func__, __LINE__); + ck_assert((what) == NULL) -#define check_true(what) \ - fail_unless((what), "%s:%i: " #what " is not TRUE", __func__, __LINE__); +#define check_true(what) ck_assert(what) -#define check_false(what) \ - fail_unless(! (what), "%s:%i: " #what " is not FALSE", __func__, __LINE__); +#define check_false(what) ck_assert(! (what)) -#define check_good_rc(what) \ -{ int __rc = (what); \ - fail_unless(__rc == 0, "%s:%i: " #what " failed, rc = %s(%i)", __func__, __LINE__, lasso_strerror(__rc), __rc); \ -} +#define check_good_rc(what) do { int __rc = (what); ck_assert_msg(__rc == 0, "rc = %s(%i)", lasso_strerror(__rc), __rc); } while(0) #define check_bad_rc(what, how) \ { int __rc = (what); \ - fail_unless(__rc == how, "%s:%i: " #what " is not %s(%i), rc = %s(%i)", __func__, __LINE__, lasso_strerror(how), how, lasso_strerror(__rc), __rc); \ + ck_assert_msg(__rc == how, #what " is not %s(%i), rc = %s(%i)", lasso_strerror(how), how, lasso_strerror(__rc), __rc); \ } #define check_equals(what,to) \ { typeof(what) __tmp1, __tmp2; \ __tmp1 = (what); \ __tmp2 = (to); \ - fail_unless(__tmp1 == __tmp2, "%s:%i: " #what " is not equal to " #to "(%llu) but to %llu", __func__, __LINE__, (long long int)__tmp2, (long long int)__tmp1); \ + ck_assert_msg(__tmp1 == __tmp2, #what " is not equal to " #to "(%llu) but to %llu", (long long int)__tmp2, (long long int)__tmp1); \ } #define check_not_equals(what,to) \ { typeof(what) __tmp1, __tmp2; \ __tmp1 = (what); \ __tmp2 = (to); \ - fail_unless(__tmp1 != __tmp2, "%s:%i: " #what " is equal to " #to "(%llu)", __func__, __LINE__, (long long int)__tmp2); \ + ck_assert_msg(__tmp1 != __tmp2, #what " is equal to " #to "(%llu)", (long long int)__tmp2); \ } #define check_str_equals(what, to) \ { typeof(what) __tmp; \ __tmp = (what); \ - fail_unless(g_strcmp0(__tmp, to) == 0, "%s:%i: " #what " (%s) is not equal to %s", __func__, __LINE__, __tmp, to); \ + ck_assert_msg(g_strcmp0(__tmp, to) == 0, #what " (%s) is not equal to %s", __tmp, to); \ } #define check_str_not_equals(what, to) \ @@ -151,7 +146,7 @@ static inline void begin_check_do_log(char *domain, GLogLevelFlags level, const static inline void end_check_do_log(const char *domain) { g_log_remove_handler(domain ? domain : LASSO_LOG_DOMAIN, checking_log_handler); checking_log_handler = 0; - fail_unless(checking_log_handler_flag, "Logging failure: expected log level %d and message «%s», got %d and «%s»", + ck_assert_msg(checking_log_handler_flag, "Logging failure: expected log level %d and message «%s», got %d and «%s»", checking_logger_user_data.log_levels[0], checking_logger_user_data.messages[0], checking_logger_user_data.log_level_found, -- 2.37.2