Projet

Général

Profil

0003-Fix-all-warnings-in-tests-71313.patch

Benjamin Dauvergne, 17 novembre 2022 18:53

Télécharger (106 ko)

Voir les différences:

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(-)
tests/Makefile.am
12 12
	-DTESTSMETADATADIR=\"$(srcdir)/data/metadata/\" \
13 13
	$(LASSO_CFLAGS) \
14 14
	$(CHECK_CFLAGS)
15
	-Werror -Wall
15 16

  
16 17

  
17 18
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
tests/basic_tests.c
39 39
{
40 40
	LassoServer *serverContext;
41 41
	serverContext = lasso_server_new_from_dump("");
42
	fail_unless(serverContext == NULL,
42
	ck_assert_msg(serverContext == NULL,
43 43
			"serverContext was created from an empty string dump");
44 44
}
45 45
END_TEST
......
50 50
	begin_check_do_log("libxml2", G_LOG_LEVEL_DEBUG, "libxml2: Start tag expected, '<' not found\n", FALSE);
51 51
	serverContext = lasso_server_new_from_dump("foo");
52 52
	end_check_do_log("libxml2");
53
	fail_unless(serverContext == NULL,
53
	ck_assert_msg(serverContext == NULL,
54 54
			"serverContext was created from a fake dump");
55 55
}
56 56
END_TEST
......
61 61
	begin_check_do_log(NULL, G_LOG_LEVEL_CRITICAL, " Unable to build a LassoNode from a xmlNode", TRUE);
62 62
	serverContext = lasso_server_new_from_dump("<?xml version=\"1.0\"?><foo/>");
63 63
	end_check_do_log(NULL);
64
	fail_unless(serverContext == NULL,
64
	ck_assert_msg(serverContext == NULL,
65 65
			"serverContext was created from fake (but valid XML) dump");
66 66
}
67 67
END_TEST
......
72 72
	LassoIdentity *identity;
73 73

  
74 74
	identity = lasso_identity_new_from_dump(NULL);
75
	fail_unless(identity == NULL, "identity was created from NULL dump");
75
	ck_assert_msg(identity == NULL, "identity was created from NULL dump");
76 76
}
77 77
END_TEST
78 78

  
......
81 81
	LassoIdentity *identity;
82 82

  
83 83
	identity = lasso_identity_new_from_dump("");
84
	fail_unless(identity == NULL, "identity was created from empty dump");
84
	ck_assert_msg(identity == NULL, "identity was created from empty dump");
85 85
}
86 86
END_TEST
87 87

  
......
94 94

  
95 95
	r = lasso_registry_default_add_direct_mapping(LASSO_LIB_HREF, "test", LASSO_LASSO_HREF,
96 96
			"LassoTestClass");
97
	fail_unless(r == 0, "lasso_registry_default_add_direct_mapping should return 0 for new mappings");
97
	ck_assert_msg(r == 0, "lasso_registry_default_add_direct_mapping should return 0 for new mappings");
98 98
	name = lasso_registry_default_get_mapping(LASSO_LIB_HREF, "test", LASSO_LASSO_HREF);
99
	fail_unless(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping");
100
	fail_unless(strcmp(name, "LassoTestClass") == 0, "lasso_registry_default_get_mapping should return LassoTestClass");
99
	ck_assert_msg(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping");
100
	ck_assert_msg(strcmp(name, "LassoTestClass") == 0, "lasso_registry_default_get_mapping should return LassoTestClass");
101 101
	r = lasso_registry_default_add_direct_mapping(LASSO_LIB_HREF, "test", LASSO_LASSO_HREF,
102 102
			"LassoTestClass");
103
	fail_unless(r == LASSO_REGISTRY_ERROR_KEY_EXISTS, "lasso_registry_default_add_direct_mapping should return LASSO_REGISTRY_KEY_EXISTS when done two times");
103
	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");
104 104
}
105 105
END_TEST
106 106

  
......
124 124
	gint r;
125 125

  
126 126
	r = lasso_registry_default_add_functional_mapping("coin", LASSO_LASSO_HREF, trad);
127
	fail_unless(r == 0, "lasso_registry_default_add_functional mapping should return 0 for new mapping");
127
	ck_assert_msg(r == 0, "lasso_registry_default_add_functional mapping should return 0 for new mapping");
128 128
	name = lasso_registry_default_get_mapping("coin", "Assertion", LASSO_LASSO_HREF);
129
	fail_unless(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping");
130
	fail_unless(strcmp(name, "LassoAssertion") == 0, "lasso_registry_default_get_mapping should return LassoAssertion");
129
	ck_assert_msg(name != NULL, "lasso_registry_default_get_mapping should return the recent mapping");
130
	ck_assert_msg(strcmp(name, "LassoAssertion") == 0, "lasso_registry_default_get_mapping should return LassoAssertion");
131 131
	r = lasso_registry_default_add_functional_mapping("coin", LASSO_LASSO_HREF, trad);
132
	fail_unless(r == LASSO_REGISTRY_ERROR_KEY_EXISTS, "lasso_registry_default_add_functional_mapping should return LASSO_REGISTRY_KEY_EXISTS when done two times");
132
	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");
133 133
}
134 134
END_TEST
135 135

  
......
170 170
	g_type_register_static(LASSO_TYPE_NODE,
171 171
			"LassoTest", &this_info, 0);
172 172
	r = lasso_registry_default_add_direct_mapping("http://example.com", "Test1", LASSO_LASSO_HREF, "LassoTest");
173
	fail_unless(r == 0, "no mapping for http://example.com:Test1 should exist");
173
	ck_assert_msg(r == 0, "no mapping for http://example.com:Test1 should exist");
174 174
	begin_check_do_log(NULL, G_LOG_LEVEL_WARNING, "	Class LassoTest has no node_data so no initialization is possible", TRUE);
175 175
	node = lasso_node_new_from_dump("<Test1 xmlns=\"http://example.com\"></Test1>");
176 176
	end_check_do_log(NULL);
177
	fail_unless(node != NULL, "parsing <Test1/> should return an object");
178
	fail_unless(strcmp(G_OBJECT_TYPE_NAME(node), "LassoTest") == 0, "node classname should be LassoTest");
177
	ck_assert_msg(node != NULL, "parsing <Test1/> should return an object");
178
	ck_assert_msg(strcmp(G_OBJECT_TYPE_NAME(node), "LassoTest") == 0, "node classname should be LassoTest");
179 179
	g_object_unref(node);
180 180
}
181 181
END_TEST
......
188 188

  
189 189
	g_file_get_contents(TESTSDATADIR "/response-1", &content, &len, NULL);
190 190

  
191
	fail_unless(content != NULL, "content should be read");
191
	ck_assert_msg(content != NULL, "content should be read");
192 192
	node = lasso_node_new_from_dump(content);
193
	fail_unless(node != NULL, "node should be parsed");
193
	ck_assert_msg(node != NULL, "node should be parsed");
194 194
	g_object_unref(node);
195 195
	g_free(content);
196 196
}
......
204 204

  
205 205
	node = LASSO_NODE(lasso_identity_new());
206 206
	node_dump = lasso_node_dump(node);
207
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_identity_new");
207
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_identity_new");
208 208
	lasso_release_string(node_dump);
209 209
	lasso_release_gobject(node2);
210 210
	lasso_release_gobject(node);
211 211
	node = LASSO_NODE(lasso_session_new());
212 212
	node_dump = lasso_node_dump(node);
213
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_session_new");
213
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_session_new");
214 214
	lasso_release_string(node_dump);
215 215
	lasso_release_gobject(node2);
216 216
	lasso_release_gobject(node);
217 217
	node = LASSO_NODE(lasso_ds_key_info_new());
218 218
	node_dump = lasso_node_dump(node);
219
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_info_new");
219
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_info_new");
220 220
	lasso_release_string(node_dump);
221 221
	lasso_release_gobject(node2);
222 222
	lasso_release_gobject(node);
223 223
	node = LASSO_NODE(lasso_ds_key_value_new());
224 224
	node_dump = lasso_node_dump(node);
225
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_value_new");
225
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_key_value_new");
226 226
	lasso_release_string(node_dump);
227 227
	lasso_release_gobject(node2);
228 228
	lasso_release_gobject(node);
229 229
	node = LASSO_NODE(lasso_ds_rsa_key_value_new());
230 230
	node_dump = lasso_node_dump(node);
231
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_rsa_key_value_new");
231
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_ds_rsa_key_value_new");
232 232
	lasso_release_string(node_dump);
233 233
	lasso_release_gobject(node2);
234 234
	lasso_release_gobject(node);
235 235
	/* ID-FF 1.2 */
236 236
	node = LASSO_NODE(lasso_lib_assertion_new());
237 237
	node_dump = lasso_node_dump(node);
238
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_assertion_new");
238
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_assertion_new");
239 239
	lasso_release_string(node_dump);
240 240
	lasso_release_gobject(node2);
241 241
	lasso_release_gobject(node);
242 242
	node = LASSO_NODE(lasso_lib_authn_context_new());
243 243
	node_dump = lasso_node_dump(node);
244
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_context_new");
244
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_context_new");
245 245
	lasso_release_string(node_dump);
246 246
	lasso_release_gobject(node2);
247 247
	lasso_release_gobject(node);
248 248
	node = LASSO_NODE(lasso_lib_authn_request_new());
249 249
	node_dump = lasso_node_dump(node);
250
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_new");
250
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_new");
251 251
	lasso_release_string(node_dump);
252 252
	lasso_release_gobject(node2);
253 253
	lasso_release_gobject(node);
254 254
	node = LASSO_NODE(lasso_lib_authn_request_envelope_new());
255 255
	node_dump = lasso_node_dump(node);
256
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_envelope_new");
256
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_authn_request_envelope_new");
257 257
	lasso_release_string(node_dump);
258 258
	lasso_release_gobject(node2);
259 259
	lasso_release_gobject(node);
260 260
	node = LASSO_NODE(lasso_lib_federation_termination_notification_new());
261 261
	node_dump = lasso_node_dump(node);
262
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_federation_termination_notification_new");
262
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_federation_termination_notification_new");
263 263
	lasso_release_string(node_dump);
264 264
	lasso_release_gobject(node2);
265 265
	lasso_release_gobject(node);
266 266
	node = LASSO_NODE(lasso_lib_idp_entries_new());
267 267
	node_dump = lasso_node_dump(node);
268
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entries_new");
268
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entries_new");
269 269
	lasso_release_string(node_dump);
270 270
	lasso_release_gobject(node2);
271 271
	lasso_release_gobject(node);
272 272
	node = LASSO_NODE(lasso_lib_idp_entry_new());
273 273
	node_dump = lasso_node_dump(node);
274
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entry_new");
274
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_entry_new");
275 275
	lasso_release_string(node_dump);
276 276
	lasso_release_gobject(node2);
277 277
	lasso_release_gobject(node);
278 278
	node = LASSO_NODE(lasso_lib_idp_list_new());
279 279
	node_dump = lasso_node_dump(node);
280
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_list_new");
280
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_idp_list_new");
281 281
	lasso_release_string(node_dump);
282 282
	lasso_release_gobject(node2);
283 283
	lasso_release_gobject(node);
284 284
	node = LASSO_NODE(lasso_lib_logout_request_new());
285 285
	node_dump = lasso_node_dump(node);
286
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_request_new");
286
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_request_new");
287 287
	lasso_release_string(node_dump);
288 288
	lasso_release_gobject(node2);
289 289
	lasso_release_gobject(node);
290 290
	node = LASSO_NODE(lasso_lib_logout_response_new());
291 291
	node_dump = lasso_node_dump(node);
292
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_response_new");
292
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_logout_response_new");
293 293
	lasso_release_string(node_dump);
294 294
	lasso_release_gobject(node2);
295 295
	lasso_release_gobject(node);
296 296
	node = LASSO_NODE(lasso_lib_name_identifier_mapping_request_new());
297 297
	node_dump = lasso_node_dump(node);
298
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_request_new");
298
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_request_new");
299 299
	lasso_release_string(node_dump);
300 300
	lasso_release_gobject(node2);
301 301
	lasso_release_gobject(node);
302 302
	node = LASSO_NODE(lasso_lib_name_identifier_mapping_response_new());
303 303
	node_dump = lasso_node_dump(node);
304
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_response_new");
304
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_name_identifier_mapping_response_new");
305 305
	lasso_release_string(node_dump);
306 306
	lasso_release_gobject(node2);
307 307
	lasso_release_gobject(node);
308 308
	node = LASSO_NODE(lasso_lib_register_name_identifier_request_new());
309 309
	node_dump = lasso_node_dump(node);
310
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_request_new");
310
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_request_new");
311 311
	lasso_release_string(node_dump);
312 312
	lasso_release_gobject(node2);
313 313
	lasso_release_gobject(node);
314 314
	node = LASSO_NODE(lasso_lib_register_name_identifier_response_new());
315 315
	node_dump = lasso_node_dump(node);
316
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_response_new");
316
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_register_name_identifier_response_new");
317 317
	lasso_release_string(node_dump);
318 318
	lasso_release_gobject(node2);
319 319
	lasso_release_gobject(node);
320 320
	node = LASSO_NODE(lasso_lib_request_authn_context_new());
321 321
	node_dump = lasso_node_dump(node);
322
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_request_authn_context_new");
322
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_request_authn_context_new");
323 323
	lasso_release_string(node_dump);
324 324
	lasso_release_gobject(node2);
325 325
	lasso_release_gobject(node);
326 326
	node = LASSO_NODE(lasso_lib_scoping_new());
327 327
	node_dump = lasso_node_dump(node);
328
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_scoping_new");
328
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_scoping_new");
329 329
	lasso_release_string(node_dump);
330 330
	lasso_release_gobject(node2);
331 331
	lasso_release_gobject(node);
332 332
	node = LASSO_NODE(lasso_lib_subject_new());
333 333
	node_dump = lasso_node_dump(node);
334
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_subject_new");
334
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_lib_subject_new");
335 335
	lasso_release_string(node_dump);
336 336
	lasso_release_gobject(node2);
337 337
	lasso_release_gobject(node);
338 338
	node = LASSO_NODE(lasso_misc_text_node_new());
339 339
	node_dump = lasso_node_dump(node);
340
	fail_unless(node_dump && strcmp(node_dump, "<XXX/>") == 0, "LassoMiscTextNode dump failed");
340
	ck_assert_msg(node_dump && strcmp(node_dump, "<XXX/>") == 0, "LassoMiscTextNode dump failed");
341 341
	lasso_release_string(node_dump);
342 342
	lasso_release_gobject(node);
343 343
	/* SAML 2.0 */
344 344
	node = LASSO_NODE(lasso_saml2_action_new());
345 345
	node_dump = lasso_node_dump(node);
346
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_action_new");
346
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_action_new");
347 347
	lasso_release_string(node_dump);
348 348
	lasso_release_gobject(node2);
349 349
	lasso_release_gobject(node);
350 350
	node = LASSO_NODE(lasso_saml2_advice_new());
351 351
	node_dump = lasso_node_dump(node);
352
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_advice_new");
352
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_advice_new");
353 353
	lasso_release_string(node_dump);
354 354
	lasso_release_gobject(node2);
355 355
	lasso_release_gobject(node);
356 356
	node = LASSO_NODE(lasso_saml2_assertion_new());
357 357
	node_dump = lasso_node_dump(node);
358
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_assertion_new");
358
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_assertion_new");
359 359
	lasso_release_string(node_dump);
360 360
	lasso_release_gobject(node2);
361 361
	lasso_release_gobject(node);
362 362
	node = LASSO_NODE(lasso_saml2_attribute_new());
363 363
	node_dump = lasso_node_dump(node);
364
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_new");
364
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_new");
365 365
	lasso_release_string(node_dump);
366 366
	lasso_release_gobject(node2);
367 367
	lasso_release_gobject(node);
368 368
	node = LASSO_NODE(lasso_saml2_attribute_statement_new());
369 369
	node_dump = lasso_node_dump(node);
370
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_statement_new");
370
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_statement_new");
371 371
	lasso_release_string(node_dump);
372 372
	lasso_release_gobject(node2);
373 373
	lasso_release_gobject(node);
374 374
	node = LASSO_NODE(lasso_saml2_attribute_value_new());
375 375
	node_dump = lasso_node_dump(node);
376
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_value_new");
376
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_attribute_value_new");
377 377
	lasso_release_string(node_dump);
378 378
	lasso_release_gobject(node2);
379 379
	lasso_release_gobject(node);
380 380
	node = LASSO_NODE(lasso_saml2_audience_restriction_new());
381 381
	node_dump = lasso_node_dump(node);
382
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_audience_restriction_new");
382
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_audience_restriction_new");
383 383
	lasso_release_string(node_dump);
384 384
	lasso_release_gobject(node2);
385 385
	lasso_release_gobject(node);
386 386
	node = LASSO_NODE(lasso_saml2_authn_context_new());
387 387
	node_dump = lasso_node_dump(node);
388
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_context_new");
388
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_context_new");
389 389
	lasso_release_string(node_dump);
390 390
	lasso_release_gobject(node2);
391 391
	lasso_release_gobject(node);
392 392
	node = LASSO_NODE(lasso_saml2_authn_statement_new());
393 393
	node_dump = lasso_node_dump(node);
394
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_statement_new");
394
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authn_statement_new");
395 395
	lasso_release_string(node_dump);
396 396
	lasso_release_gobject(node2);
397 397
	lasso_release_gobject(node);
398 398
	node = LASSO_NODE(lasso_saml2_authz_decision_statement_new());
399 399
	node_dump = lasso_node_dump(node);
400
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authz_decision_statement_new");
400
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_authz_decision_statement_new");
401 401
	lasso_release_string(node_dump);
402 402
	lasso_release_gobject(node2);
403 403
	lasso_release_gobject(node);
404 404
	node = LASSO_NODE(lasso_saml2_base_idabstract_new());
405 405
	node_dump = lasso_node_dump(node);
406
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_base_idabstract_new");
406
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_base_idabstract_new");
407 407
	lasso_release_string(node_dump);
408 408
	lasso_release_gobject(node2);
409 409
	lasso_release_gobject(node);
410 410
	node = LASSO_NODE(lasso_saml2_condition_abstract_new());
411 411
	node_dump = lasso_node_dump(node);
412
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_condition_abstract_new");
412
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_condition_abstract_new");
413 413
	lasso_release_string(node_dump);
414 414
	lasso_release_gobject(node2);
415 415
	lasso_release_gobject(node);
416 416
	node = LASSO_NODE(lasso_saml2_conditions_new());
417 417
	node_dump = lasso_node_dump(node);
418
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_conditions_new");
418
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_conditions_new");
419 419
	lasso_release_string(node_dump);
420 420
	lasso_release_gobject(node2);
421 421
	lasso_release_gobject(node);
422 422
	node = LASSO_NODE(lasso_saml2_encrypted_element_new());
423 423
	node_dump = lasso_node_dump(node);
424
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_encrypted_element_new");
424
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_encrypted_element_new");
425 425
	lasso_release_string(node_dump);
426 426
	lasso_release_gobject(node2);
427 427
	lasso_release_gobject(node);
428 428
	node = LASSO_NODE(lasso_saml2_evidence_new());
429 429
	node_dump = lasso_node_dump(node);
430
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_evidence_new");
430
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_evidence_new");
431 431
	lasso_release_string(node_dump);
432 432
	lasso_release_gobject(node2);
433 433
	lasso_release_gobject(node);
434 434
	node = LASSO_NODE(lasso_saml2_key_info_confirmation_data_new());
435 435
	node_dump = lasso_node_dump(node);
436
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_key_info_confirmation_data_new");
436
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_key_info_confirmation_data_new");
437 437
	lasso_release_string(node_dump);
438 438
	lasso_release_gobject(node2);
439 439
	lasso_release_gobject(node);
440 440
	node = LASSO_NODE(lasso_saml2_name_id_new());
441 441
	node_dump = lasso_node_dump(node);
442
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_name_id_new");
442
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_name_id_new");
443 443
	lasso_release_string(node_dump);
444 444
	lasso_release_gobject(node2);
445 445
	lasso_release_gobject(node);
446 446
	node = LASSO_NODE(lasso_saml2_one_time_use_new());
447 447
	node_dump = lasso_node_dump(node);
448
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_one_time_use_new");
448
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_one_time_use_new");
449 449
	lasso_release_string(node_dump);
450 450
	lasso_release_gobject(node2);
451 451
	lasso_release_gobject(node);
452 452
	node = LASSO_NODE(lasso_saml2_proxy_restriction_new());
453 453
	node_dump = lasso_node_dump(node);
454
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_proxy_restriction_new");
454
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_proxy_restriction_new");
455 455
	lasso_release_string(node_dump);
456 456
	lasso_release_gobject(node2);
457 457
	lasso_release_gobject(node);
458 458
	node = LASSO_NODE(lasso_saml2_statement_abstract_new());
459 459
	node_dump = lasso_node_dump(node);
460
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_statement_abstract_new");
460
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_statement_abstract_new");
461 461
	lasso_release_string(node_dump);
462 462
	lasso_release_gobject(node2);
463 463
	lasso_release_gobject(node);
464 464
	node = LASSO_NODE(lasso_saml2_subject_new());
465 465
	node_dump = lasso_node_dump(node);
466
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_new");
466
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_new");
467 467
	lasso_release_string(node_dump);
468 468
	lasso_release_gobject(node2);
469 469
	lasso_release_gobject(node);
470 470
	node = LASSO_NODE(lasso_saml2_subject_confirmation_new());
471 471
	node_dump = lasso_node_dump(node);
472
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_new");
472
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_new");
473 473
	lasso_release_string(node_dump);
474 474
	lasso_release_gobject(node2);
475 475
	lasso_release_gobject(node);
476 476
	node = LASSO_NODE(lasso_saml2_subject_confirmation_data_new());
477 477
	node_dump = lasso_node_dump(node);
478
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_data_new");
478
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_confirmation_data_new");
479 479
	lasso_release_string(node_dump);
480 480
	lasso_release_gobject(node2);
481 481
	lasso_release_gobject(node);
482 482
	node = LASSO_NODE(lasso_saml2_subject_locality_new());
483 483
	node_dump = lasso_node_dump(node);
484
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_locality_new");
484
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml2_subject_locality_new");
485 485
	lasso_release_string(node_dump);
486 486
	lasso_release_gobject(node2);
487 487
	lasso_release_gobject(node);
488 488
	node = LASSO_NODE(lasso_samlp2_artifact_resolve_new());
489 489
	node_dump = lasso_node_dump(node);
490
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_resolve_new");
490
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_resolve_new");
491 491
	lasso_release_string(node_dump);
492 492
	lasso_release_gobject(node2);
493 493
	lasso_release_gobject(node);
494 494
	node = LASSO_NODE(lasso_samlp2_artifact_response_new());
495 495
	node_dump = lasso_node_dump(node);
496
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_response_new");
496
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_artifact_response_new");
497 497
	lasso_release_string(node_dump);
498 498
	lasso_release_gobject(node2);
499 499
	lasso_release_gobject(node);
500 500
	node = LASSO_NODE(lasso_samlp2_assertion_id_request_new());
501 501
	node_dump = lasso_node_dump(node);
502
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_assertion_id_request_new");
502
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_assertion_id_request_new");
503 503
	lasso_release_string(node_dump);
504 504
	lasso_release_gobject(node2);
505 505
	lasso_release_gobject(node);
506 506
	node = LASSO_NODE(lasso_samlp2_attribute_query_new());
507 507
	node_dump = lasso_node_dump(node);
508
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_attribute_query_new");
508
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_attribute_query_new");
509 509
	lasso_release_string(node_dump);
510 510
	lasso_release_gobject(node2);
511 511
	lasso_release_gobject(node);
512 512
	node = LASSO_NODE(lasso_samlp2_authn_query_new());
513 513
	node_dump = lasso_node_dump(node);
514
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_query_new");
514
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_query_new");
515 515
	lasso_release_string(node_dump);
516 516
	lasso_release_gobject(node2);
517 517
	lasso_release_gobject(node);
518 518
	node = LASSO_NODE(lasso_samlp2_authn_request_new());
519 519
	node_dump = lasso_node_dump(node);
520
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_request_new");
520
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authn_request_new");
521 521
	lasso_release_string(node_dump);
522 522
	lasso_release_gobject(node2);
523 523
	lasso_release_gobject(node);
524 524
	node = LASSO_NODE(lasso_samlp2_authz_decision_query_new());
525 525
	node_dump = lasso_node_dump(node);
526
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authz_decision_query_new");
526
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_authz_decision_query_new");
527 527
	lasso_release_string(node_dump);
528 528
	lasso_release_gobject(node2);
529 529
	lasso_release_gobject(node);
530 530
	node = LASSO_NODE(lasso_samlp2_extensions_new());
531 531
	node_dump = lasso_node_dump(node);
532
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_extensions_new");
532
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_extensions_new");
533 533
	lasso_release_string(node_dump);
534 534
	lasso_release_gobject(node2);
535 535
	lasso_release_gobject(node);
536 536
	node = LASSO_NODE(lasso_samlp2_idp_entry_new());
537 537
	node_dump = lasso_node_dump(node);
538
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_entry_new");
538
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_entry_new");
539 539
	lasso_release_string(node_dump);
540 540
	lasso_release_gobject(node2);
541 541
	lasso_release_gobject(node);
542 542
	node = LASSO_NODE(lasso_samlp2_idp_list_new());
543 543
	node_dump = lasso_node_dump(node);
544
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_list_new");
544
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_idp_list_new");
545 545
	lasso_release_string(node_dump);
546 546
	lasso_release_gobject(node2);
547 547
	lasso_release_gobject(node);
548 548
/*	node = LASSO_NODE(lasso_samlp2_logout_request_new());
549 549
	node_dump = lasso_node_dump(node);
550
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_request_new");
550
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_request_new");
551 551
	lasso_release_string(node_dump);
552 552
	lasso_release_gobject(node2);
553 553
	lasso_release_gobject(node); */
554 554
	node = LASSO_NODE(lasso_samlp2_logout_response_new());
555 555
	node_dump = lasso_node_dump(node);
556
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_response_new");
556
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_logout_response_new");
557 557
	lasso_release_string(node_dump);
558 558
	lasso_release_gobject(node2);
559 559
	lasso_release_gobject(node);
560 560
/*	node = LASSO_NODE(lasso_samlp2_manage_name_id_request_new());
561 561
	node_dump = lasso_node_dump(node);
562
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_request_new");
562
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_request_new");
563 563
	lasso_release_string(node_dump);
564 564
	lasso_release_gobject(node2);
565 565
	lasso_release_gobject(node); */
566 566
	node = LASSO_NODE(lasso_samlp2_manage_name_id_response_new());
567 567
	node_dump = lasso_node_dump(node);
568
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_response_new");
568
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_manage_name_id_response_new");
569 569
	lasso_release_string(node_dump);
570 570
	lasso_release_gobject(node2);
571 571
	lasso_release_gobject(node);
572 572
	node = LASSO_NODE(lasso_samlp2_name_id_mapping_request_new());
573 573
	node_dump = lasso_node_dump(node);
574
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_request_new");
574
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_request_new");
575 575
	lasso_release_string(node_dump);
576 576
	lasso_release_gobject(node2);
577 577
	lasso_release_gobject(node);
578 578
	node = LASSO_NODE(lasso_samlp2_name_id_mapping_response_new());
579 579
	node_dump = lasso_node_dump(node);
580
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_response_new");
580
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_mapping_response_new");
581 581
	lasso_release_string(node_dump);
582 582
	lasso_release_gobject(node2);
583 583
	lasso_release_gobject(node);
584 584
	node = LASSO_NODE(lasso_samlp2_name_id_policy_new());
585 585
	node_dump = lasso_node_dump(node);
586
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_policy_new");
586
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_name_id_policy_new");
587 587
	lasso_release_string(node_dump);
588 588
	lasso_release_gobject(node2);
589 589
	lasso_release_gobject(node);
590 590
	node = LASSO_NODE(lasso_samlp2_request_abstract_new());
591 591
	node_dump = lasso_node_dump(node);
592
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_request_abstract_new");
592
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_request_abstract_new");
593 593
	lasso_release_string(node_dump);
594 594
	lasso_release_gobject(node2);
595 595
	lasso_release_gobject(node);
596 596
	node = LASSO_NODE(lasso_samlp2_requested_authn_context_new());
597 597
	node_dump = lasso_node_dump(node);
598
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_requested_authn_context_new");
598
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_requested_authn_context_new");
599 599
	lasso_release_string(node_dump);
600 600
	lasso_release_gobject(node2);
601 601
	lasso_release_gobject(node);
602 602
	node = LASSO_NODE(lasso_samlp2_response_new());
603 603
	node_dump = lasso_node_dump(node);
604
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_response_new");
604
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_response_new");
605 605
	lasso_release_string(node_dump);
606 606
	lasso_release_gobject(node2);
607 607
	lasso_release_gobject(node);
608 608
	node = LASSO_NODE(lasso_samlp2_scoping_new());
609 609
	node_dump = lasso_node_dump(node);
610
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_scoping_new");
610
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_scoping_new");
611 611
	lasso_release_string(node_dump);
612 612
	lasso_release_gobject(node2);
613 613
	lasso_release_gobject(node);
614 614
	node = LASSO_NODE(lasso_samlp2_status_new());
615 615
	node_dump = lasso_node_dump(node);
616
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_new");
616
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_new");
617 617
	lasso_release_string(node_dump);
618 618
	lasso_release_gobject(node2);
619 619
	lasso_release_gobject(node);
620 620
	node = LASSO_NODE(lasso_samlp2_status_code_new());
621 621
	node_dump = lasso_node_dump(node);
622
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_code_new");
622
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_code_new");
623 623
	lasso_release_string(node_dump);
624 624
	lasso_release_gobject(node2);
625 625
	lasso_release_gobject(node);
626 626
	node = LASSO_NODE(lasso_samlp2_status_detail_new());
627 627
	node_dump = lasso_node_dump(node);
628
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_detail_new");
628
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_detail_new");
629 629
	lasso_release_string(node_dump);
630 630
	lasso_release_gobject(node2);
631 631
	lasso_release_gobject(node);
632 632
	node = LASSO_NODE(lasso_samlp2_status_response_new());
633 633
	node_dump = lasso_node_dump(node);
634
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_response_new");
634
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_status_response_new");
635 635
	lasso_release_string(node_dump);
636 636
	lasso_release_gobject(node2);
637 637
	lasso_release_gobject(node);
638 638
	node = LASSO_NODE(lasso_samlp2_subject_query_abstract_new());
639 639
	node_dump = lasso_node_dump(node);
640
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_subject_query_abstract_new");
640
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_subject_query_abstract_new");
641 641
	lasso_release_string(node_dump);
642 642
	lasso_release_gobject(node2);
643 643
	lasso_release_gobject(node);
644 644
	node = LASSO_NODE(lasso_samlp2_terminate_new());
645 645
	node_dump = lasso_node_dump(node);
646
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_terminate_new");
646
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp2_terminate_new");
647 647
	lasso_release_string(node_dump);
648 648
	lasso_release_gobject(node2);
649 649
	lasso_release_gobject(node);
650 650
	/* SAML 1.0 */
651 651
	node = LASSO_NODE(lasso_saml_advice_new());
652 652
	node_dump = lasso_node_dump(node);
653
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_advice_new");
653
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_advice_new");
654 654
	lasso_release_string(node_dump);
655 655
	lasso_release_gobject(node2);
656 656
	lasso_release_gobject(node);
657 657
	node = LASSO_NODE(lasso_saml_assertion_new());
658 658
	node_dump = lasso_node_dump(node);
659
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_assertion_new");
659
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_assertion_new");
660 660
	lasso_release_string(node_dump);
661 661
	lasso_release_gobject(node2);
662 662
	lasso_release_gobject(node);
663 663
	node = LASSO_NODE(lasso_saml_attribute_new());
664 664
	node_dump = lasso_node_dump(node);
665
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_new");
665
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_new");
666 666
	lasso_release_string(node_dump);
667 667
	lasso_release_gobject(node2);
668 668
	lasso_release_gobject(node);
669 669
	node = LASSO_NODE(lasso_saml_attribute_designator_new());
670 670
	node_dump = lasso_node_dump(node);
671
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_designator_new");
671
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_designator_new");
672 672
	lasso_release_string(node_dump);
673 673
	lasso_release_gobject(node2);
674 674
	lasso_release_gobject(node);
675 675
	node = LASSO_NODE(lasso_saml_attribute_statement_new());
676 676
	node_dump = lasso_node_dump(node);
677
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_statement_new");
677
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_statement_new");
678 678
	lasso_release_string(node_dump);
679 679
	lasso_release_gobject(node2);
680 680
	lasso_release_gobject(node);
681 681
	node = LASSO_NODE(lasso_saml_attribute_value_new());
682 682
	node_dump = lasso_node_dump(node);
683
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_value_new");
683
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_attribute_value_new");
684 684
	lasso_release_string(node_dump);
685 685
	lasso_release_gobject(node2);
686 686
	lasso_release_gobject(node);
687 687
	node = LASSO_NODE(lasso_saml_audience_restriction_condition_new());
688 688
	node_dump = lasso_node_dump(node);
689
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_audience_restriction_condition_new");
689
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_audience_restriction_condition_new");
690 690
	lasso_release_string(node_dump);
691 691
	lasso_release_gobject(node2);
692 692
	lasso_release_gobject(node);
693 693
	node = LASSO_NODE(lasso_saml_authentication_statement_new());
694 694
	node_dump = lasso_node_dump(node);
695
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authentication_statement_new");
695
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authentication_statement_new");
696 696
	lasso_release_string(node_dump);
697 697
	lasso_release_gobject(node2);
698 698
	lasso_release_gobject(node);
699 699
	node = LASSO_NODE(lasso_saml_authority_binding_new());
700 700
	node_dump = lasso_node_dump(node);
701
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authority_binding_new");
701
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_authority_binding_new");
702 702
	lasso_release_string(node_dump);
703 703
	lasso_release_gobject(node2);
704 704
	lasso_release_gobject(node);
705 705
	node = LASSO_NODE(lasso_saml_conditions_new());
706 706
	node_dump = lasso_node_dump(node);
707
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_conditions_new");
707
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_conditions_new");
708 708
	lasso_release_string(node_dump);
709 709
	lasso_release_gobject(node2);
710 710
	lasso_release_gobject(node);
711 711
	node = LASSO_NODE(lasso_saml_name_identifier_new());
712 712
	node_dump = lasso_node_dump(node);
713
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_name_identifier_new");
713
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_name_identifier_new");
714 714
	lasso_release_string(node_dump);
715 715
	lasso_release_gobject(node2);
716 716
	lasso_release_gobject(node);
717 717
	node = LASSO_NODE(lasso_saml_subject_confirmation_new());
718 718
	node_dump = lasso_node_dump(node);
719
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_confirmation_new");
719
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_confirmation_new");
720 720
	lasso_release_string(node_dump);
721 721
	lasso_release_gobject(node2);
722 722
	lasso_release_gobject(node);
723 723
	node = LASSO_NODE(lasso_saml_subject_statement_new());
724 724
	node_dump = lasso_node_dump(node);
725
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_statement_new");
725
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_saml_subject_statement_new");
726 726
	lasso_release_string(node_dump);
727 727
	lasso_release_gobject(node2);
728 728
	lasso_release_gobject(node);
729 729
	node = LASSO_NODE(lasso_samlp_request_new());
730 730
	node_dump = lasso_node_dump(node);
731
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_request_new");
731
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_request_new");
732 732
	lasso_release_string(node_dump);
733 733
	lasso_release_gobject(node2);
734 734
	lasso_release_gobject(node);
735 735
	node = LASSO_NODE(lasso_samlp_response_new());
736 736
	node_dump = lasso_node_dump(node);
737
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_response_new");
737
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_response_new");
738 738
	lasso_release_string(node_dump);
739 739
	lasso_release_gobject(node2);
740 740
	lasso_release_gobject(node);
741 741
	node = LASSO_NODE(lasso_samlp_status_new());
742 742
	node_dump = lasso_node_dump(node);
743
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_new");
743
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_new");
744 744
	lasso_release_string(node_dump);
745 745
	lasso_release_gobject(node2);
746 746
	lasso_release_gobject(node);
747 747
	node = LASSO_NODE(lasso_samlp_status_code_new());
748 748
	node_dump = lasso_node_dump(node);
749
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_code_new");
749
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_samlp_status_code_new");
750 750
	lasso_release_string(node_dump);
751 751
	lasso_release_gobject(node2);
752 752
	lasso_release_gobject(node);
753 753
	/* SOAP */
754 754
	node = LASSO_NODE(lasso_soap_body_new());
755 755
	node_dump = lasso_node_dump(node);
756
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_body_new");
756
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_body_new");
757 757
	lasso_release_string(node_dump);
758 758
	lasso_release_gobject(node2);
759 759
	lasso_release_gobject(node);
760 760
	node = LASSO_NODE(lasso_soap_detail_new());
761 761
	node_dump = lasso_node_dump(node);
762
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_detail_new");
762
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_detail_new");
763 763
	lasso_release_string(node_dump);
764 764
	lasso_release_gobject(node2);
765 765
	lasso_release_gobject(node);
766 766
	node = LASSO_NODE(lasso_soap_fault_new());
767 767
	node_dump = lasso_node_dump(node);
768
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_fault_new");
768
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_fault_new");
769 769
	lasso_release_string(node_dump);
770 770
	lasso_release_gobject(node2);
771 771
	lasso_release_gobject(node);
772 772
	node = LASSO_NODE(lasso_soap_header_new());
773 773
	node_dump = lasso_node_dump(node);
774
	fail_unless((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_header_new");
774
	ck_assert_msg((node2 = lasso_node_new_from_dump(node_dump)) != NULL, "restoring dump failed after lasso_soap_header_new");
775 775
	lasso_release_string(node_dump);
776 776
	lasso_release_gobject(node2);
777 777
	lasso_release_gobject(node);
......
799 799
		LassoNode *node;
800 800

  
801 801
		xmldoc = xmlParseDoc (BAD_CAST (*iter));
802
		fail_unless(xmldoc != NULL, "Failed to parse %s: no xmldoc", *iter);
803
		fail_unless(xmlDocGetRootElement (xmldoc) != NULL, "Failed to parse %s: no root node element", *iter);
802
		ck_assert_msg(xmldoc != NULL, "Failed to parse %s: no xmldoc", *iter);
803
		ck_assert_msg(xmlDocGetRootElement (xmldoc) != NULL, "Failed to parse %s: no root node element", *iter);
804 804
		node = lasso_node_new_from_xmlNode(xmlDocGetRootElement(xmldoc));
805
		fail_unless (LASSO_IS_SAML2_ENCRYPTED_ELEMENT (node), "Parsing of %s did not return a saml2:EncryptedElement, %s", *iter);
805
		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)));
806 806
		g_object_unref(node);
807 807
		lasso_release_doc(xmldoc);
808 808
		++iter;
......
818 818
	const GList *name_id_formats;
819 819

  
820 820
	provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP, TESTSDATADIR "/sp5-saml2/metadata.xml", NULL, NULL);
821
	fail_unless(provider != NULL, "lasso_provider_new failed on metadata file: %s", TESTSDATADIR "/sp5-saml2/metadata.xml");
821
	ck_assert_msg(provider != NULL, "lasso_provider_new failed on metadata file: %s", TESTSDATADIR "/sp5-saml2/metadata.xml");
822 822
	name_id_format = lasso_provider_get_default_name_id_format(provider);
823
	fail_unless(name_id_format != NULL, "no default name id format found!");
824
	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);
823
	ck_assert_msg(name_id_format != NULL, "no default name id format found!");
824
	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);
825 825
	lasso_release_string(name_id_format);
826 826
	name_id_formats = lasso_provider_get_metadata_list(provider, "NameIDFormat");
827
	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));
828
	fail_unless(name_id_formats->data != NULL, "first name id format is NULL");
829
	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);
827
	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));
828
	ck_assert_msg(name_id_formats->data != NULL, "first name id format is NULL");
829
	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);
830 830
	/* cleanup */
831 831
	lasso_release_gobject(provider);
832 832
}
tests/login_tests.c
122 122
	char *serviceProviderContextDump;
123 123

  
124 124
	identityProviderContextDump = generateIdentityProviderContextDump();
125
	fail_unless(identityProviderContextDump != NULL,
125
	ck_assert_msg(identityProviderContextDump != NULL,
126 126
			"generateIdentityProviderContextDump should not return NULL");
127 127
	g_free(identityProviderContextDump);
128 128
	serviceProviderContextDump = generateServiceProviderContextDump();
129
	fail_unless(serviceProviderContextDump != NULL,
129
	ck_assert_msg(serviceProviderContextDump != NULL,
130 130
			"generateServiceProviderContextDump should not return NULL");
131 131
	g_free(serviceProviderContextDump);
132 132
}
......
155 155
	serviceProviderContextDump = generateServiceProviderContextDump();
156 156
	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
157 157
	spLoginContext = lasso_login_new(spContext);
158
	fail_unless(spLoginContext != NULL,
158
	ck_assert_msg(spLoginContext != NULL,
159 159
			"lasso_login_new() shouldn't have returned NULL");
160 160
	check_good_rc(lasso_login_init_authn_request(spLoginContext, "https://idp1/metadata",
161 161
			LASSO_HTTP_METHOD_REDIRECT));
162 162
	request = LASSO_LIB_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request);
163
	fail_unless(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request");
163
	ck_assert_msg(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request");
164 164
	request->IsPassive = 0;
165 165
	request->NameIDPolicy = g_strdup(LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED);
166 166
	request->consent = g_strdup(LASSO_LIB_CONSENT_OBTAINED);
......
168 168
	request->RelayState = g_strdup(relayState);
169 169
	check_good_rc(lasso_login_build_authn_request_msg(spLoginContext));
170 170
	authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url;
171
	fail_unless(authnRequestUrl != NULL,
171
	ck_assert_msg(authnRequestUrl != NULL,
172 172
			"authnRequestUrl shouldn't be NULL");
173 173
	authnRequestQuery = strchr(authnRequestUrl, '?')+1;
174
	fail_unless(strlen(authnRequestQuery) > 0,
174
	ck_assert_msg(strlen(authnRequestQuery) > 0,
175 175
			"authnRequestQuery shouldn't be an empty string");
176 176
	spLoginDump = lasso_node_dump(LASSO_NODE(spLoginContext));
177
	fail_unless(strstr(authnRequestQuery, "RelayState") != NULL,
177
	ck_assert_msg(strstr(authnRequestQuery, "RelayState") != NULL,
178 178
			"authnRequestQuery should contain a RelayState parameter");
179
	fail_unless(strstr(authnRequestQuery, "fake%5B%5D") != NULL,
179
	ck_assert_msg(strstr(authnRequestQuery, "fake%5B%5D") != NULL,
180 180
			"authnRequestQuery RelayState parameter should be encoded");
181 181

  
182 182
	/* Identity provider singleSignOn, for a user having no federation. */
183 183
	identityProviderContextDump = generateIdentityProviderContextDump();
184 184
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
185 185
	idpLoginContext = lasso_login_new(idpContext);
186
	fail_unless(idpLoginContext != NULL,
186
	ck_assert_msg(idpLoginContext != NULL,
187 187
			"lasso_login_new() shouldn't have returned NULL");
188 188
	check_good_rc(lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery));
189
	fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed");
190
	fail_unless(lasso_login_must_authenticate(idpLoginContext),
189
	ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed");
190
	ck_assert_msg(lasso_login_must_authenticate(idpLoginContext),
191 191
			"lasso_login_must_authenticate() should be TRUE");
192
	fail_unless(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART,
192
	ck_assert_msg(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART,
193 193
			"protocoleProfile should be ProfileBrwsArt");
194
	fail_unless(! lasso_login_must_ask_for_consent(idpLoginContext),
194
	ck_assert_msg(! lasso_login_must_ask_for_consent(idpLoginContext),
195 195
			"lasso_login_must_ask_for_consent() should be FALSE");
196
	fail_unless(idpLoginContext->parent.msg_relayState != NULL,
196
	ck_assert_msg(idpLoginContext->parent.msg_relayState != NULL,
197 197
			"lasso_login_process_authn_request_msg should restore the RelayState parameter");
198
	fail_unless(lasso_strisequal(idpLoginContext->parent.msg_relayState,relayState),
198
	ck_assert_msg(lasso_strisequal(idpLoginContext->parent.msg_relayState,relayState),
199 199
			"lasso_login_process_authn_request_msg should restore the same RelayState thant sent in the request");
200 200
	check_good_rc(lasso_login_validate_request_msg(idpLoginContext,
201 201
			1, /* authentication_result */
......
211 211
	check_good_rc(lasso_login_build_artifact_msg(idpLoginContext, LASSO_HTTP_METHOD_REDIRECT));
212 212

  
213 213
	idpIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(idpLoginContext)->identity);
214
	fail_unless(idpIdentityContextDump != NULL,
214
	ck_assert_msg(idpIdentityContextDump != NULL,
215 215
		    "lasso_identity_dump shouldn't return NULL");
216 216
	idpSessionContextDump = lasso_session_dump(LASSO_PROFILE(idpLoginContext)->session);
217
	fail_unless(idpSessionContextDump != NULL,
217
	ck_assert_msg(idpSessionContextDump != NULL,
218 218
		    "lasso_session_dump shouldn't return NULL");
219 219
	responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url;
220
	fail_unless(responseUrl != NULL, "responseUrl shouldn't be NULL");
220
	ck_assert_msg(responseUrl != NULL, "responseUrl shouldn't be NULL");
221 221
	responseQuery = strchr(responseUrl, '?')+1;
222
	fail_unless(strlen(responseQuery) > 0,
222
	ck_assert_msg(strlen(responseQuery) > 0,
223 223
			"responseQuery shouldn't be an empty string");
224
	fail_unless(strstr(responseQuery, "RelayState") != NULL,
224
	ck_assert_msg(strstr(responseQuery, "RelayState") != NULL,
225 225
			"responseQuery should contain a RelayState parameter");
226
	fail_unless(strstr(responseQuery, "fake%5B%5D") != NULL,
226
	ck_assert_msg(strstr(responseQuery, "fake%5B%5D") != NULL,
227 227
			"responseQuery RelayState parameter should be encoded");
228 228
	serviceProviderId = g_strdup(LASSO_PROFILE(idpLoginContext)->remote_providerID);
229
	fail_unless(serviceProviderId != NULL,
229
	ck_assert_msg(serviceProviderId != NULL,
230 230
		    "lasso_profile_get_remote_providerID shouldn't return NULL");
231 231
	if (lasso_flag_thin_sessions) {
232 232
		/* when using thin sessions, the way artifact message is constructed changes as the
......
246 246
	check_good_rc(lasso_login_init_request(spLoginContext,
247 247
			responseQuery,
248 248
			LASSO_HTTP_METHOD_REDIRECT));
249
	fail_unless(spLoginContext->parent.msg_relayState != NULL,
249
	ck_assert_msg(spLoginContext->parent.msg_relayState != NULL,
250 250
			"lasso_login_init_request should restore the RelayState parameter");
251
	fail_unless(lasso_strisequal(spLoginContext->parent.msg_relayState,relayState),
251
	ck_assert_msg(lasso_strisequal(spLoginContext->parent.msg_relayState,relayState),
252 252
			"lasso_login_init_request should restore the same RelayState thant sent in the request");
253
	fail_unless(rc == 0, "lasso_login_init_request failed");
253
	ck_assert_msg(rc == 0, "lasso_login_init_request failed");
254 254
	check_good_rc(lasso_login_build_request_msg(spLoginContext));
255
	fail_unless(rc == 0, "lasso_login_build_request_msg failed");
255
	ck_assert_msg(rc == 0, "lasso_login_build_request_msg failed");
256 256
	soapRequestMsg = LASSO_PROFILE(spLoginContext)->msg_body;
257
	fail_unless(soapRequestMsg != NULL, "soapRequestMsg must not be NULL");
257
	ck_assert_msg(soapRequestMsg != NULL, "soapRequestMsg must not be NULL");
258 258

  
259 259
	/* Identity provider SOAP endpoint */
260 260
	lasso_server_destroy(idpContext);
261 261
	lasso_login_destroy(idpLoginContext);
262 262
	requestType = lasso_profile_get_request_type_from_soap_msg(soapRequestMsg);
263
	fail_unless(requestType == LASSO_REQUEST_TYPE_LOGIN,
263
	ck_assert_msg(requestType == LASSO_REQUEST_TYPE_LOGIN,
264 264
			"requestType should be LASSO_REQUEST_TYPE_LOGIN");
265 265

  
266 266
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
......
276 276
						 idpSessionContextDump));
277 277
	check_good_rc(lasso_login_build_response_msg(idpLoginContext, serviceProviderId));
278 278
	soapResponseMsg =  LASSO_PROFILE(idpLoginContext)->msg_body;
279
	fail_unless(soapResponseMsg != NULL, "soapResponseMsg must not be NULL");
279
	ck_assert_msg(soapResponseMsg != NULL, "soapResponseMsg must not be NULL");
280 280

  
281 281
	/* Service provider assertion consumer (step 2: process SOAP response) */
282 282
	check_good_rc(lasso_login_process_response_msg(spLoginContext, soapResponseMsg));
283 283
	check_good_rc(lasso_login_accept_sso(spLoginContext));
284
	fail_unless(LASSO_PROFILE(spLoginContext)->identity != NULL,
284
	ck_assert_msg(LASSO_PROFILE(spLoginContext)->identity != NULL,
285 285
			"spLoginContext has no identity");
286 286
	spIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(spLoginContext)->identity);
287 287
	check_not_null(spIdentityContextDump);
......
290 290

  
291 291
	/* Test InResponseTo checking */
292 292
	found = strstr(soapResponseMsg, "Assertion");
293
	fail_unless(found != NULL, "We must find an Assertion");
293
	ck_assert_msg(found != NULL, "We must find an Assertion");
294 294
	found = strstr(found, "InResponseTo=\"");
295
	fail_unless(found != NULL, "We must find an InResponseTo attribute");
295
	ck_assert_msg(found != NULL, "We must find an InResponseTo attribute");
296 296
	found[sizeof("InResponseTo=\"")] = '?';
297 297
	lasso_set_flag("no-verify-signature");
298 298
	begin_check_do_log(NULL, G_LOG_LEVEL_CRITICAL, " If inResponseTo attribute is present, a matching "
......
301 301
	end_check_do_log(NULL);
302 302
	lasso_set_flag("verify-signature");
303 303
	check_good_rc(lasso_login_accept_sso(spLoginContext));
304
	fail_unless(rc == 0, "lasso_login_accept_sso must fail");
304
	ck_assert_msg(rc == 0, "lasso_login_accept_sso must fail");
305 305

  
306 306
	g_free(spLoginDump);
307 307
	g_free(serviceProviderId);
......
339 339
	serviceProviderContextDump = generateServiceProviderContextDump();
340 340
	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
341 341
	spLoginContext = lasso_login_new(spContext);
342
	fail_unless(spLoginContext != NULL,
342
	ck_assert_msg(spLoginContext != NULL,
343 343
			"lasso_login_new() shouldn't have returned NULL");
344 344
	rc = lasso_login_init_authn_request(spLoginContext, "https://idp1/metadata",
345 345
			LASSO_HTTP_METHOD_REDIRECT);
346
	fail_unless(rc == 0, "lasso_login_init_authn_request failed");
346
	ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed");
347 347
	request = LASSO_LIB_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request);
348
	fail_unless(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request");
348
	ck_assert_msg(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request");
349 349
	request->IsPassive = 0;
350 350
	request->NameIDPolicy = g_strdup(LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED);
351 351
	request->consent = g_strdup(LASSO_LIB_CONSENT_OBTAINED);
352 352
	relayState = "fake";
353 353
	request->RelayState = g_strdup(relayState);
354 354
	rc = lasso_login_build_authn_request_msg(spLoginContext);
355
	fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed");
355
	ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed");
356 356
	authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url;
357
	fail_unless(authnRequestUrl != NULL,
357
	ck_assert_msg(authnRequestUrl != NULL,
358 358
			"authnRequestUrl shouldn't be NULL");
359 359
	authnRequestQuery = strchr(authnRequestUrl, '?')+1;
360
	fail_unless(strlen(authnRequestQuery) > 0,
360
	ck_assert_msg(strlen(authnRequestQuery) > 0,
361 361
			"authnRequestRequest shouldn't be an empty string");
362 362

  
363 363
	/* Identity provider singleSignOn, for a user having no federation. */
364 364
	identityProviderContextDump = generateIdentityProviderContextDumpMemory();
365 365
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
366 366
	idpLoginContext = lasso_login_new(idpContext);
367
	fail_unless(idpLoginContext != NULL,
367
	ck_assert_msg(idpLoginContext != NULL,
368 368
			"lasso_login_new() shouldn't have returned NULL");
369 369
	rc = lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery);
370
	fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed");
371
	fail_unless(lasso_login_must_authenticate(idpLoginContext),
370
	ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed");
371
	ck_assert_msg(lasso_login_must_authenticate(idpLoginContext),
372 372
			"lasso_login_must_authenticate() should be TRUE");
373
	fail_unless(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART,
373
	ck_assert_msg(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART,
374 374
			"protocoleProfile should be ProfileBrwsArt");
375
	fail_unless(! lasso_login_must_ask_for_consent(idpLoginContext),
375
	ck_assert_msg(! lasso_login_must_ask_for_consent(idpLoginContext),
376 376
			"lasso_login_must_ask_for_consent() should be FALSE");
377 377
	rc = lasso_login_validate_request_msg(idpLoginContext,
378 378
			1, /* authentication_result */
......
385 385
			"FIXME: notBefore",
386 386
			"FIXME: notOnOrAfter");
387 387
	rc = lasso_login_build_artifact_msg(idpLoginContext, LASSO_HTTP_METHOD_REDIRECT);
388
	fail_unless(rc == 0, "lasso_login_build_artifact_msg failed");
388
	ck_assert_msg(rc == 0, "lasso_login_build_artifact_msg failed");
389 389
	idpIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(idpLoginContext)->identity);
390
	fail_unless(idpIdentityContextDump != NULL,
390
	ck_assert_msg(idpIdentityContextDump != NULL,
391 391
		    "lasso_identity_dump shouldn't return NULL");
392 392
	idpSessionContextDump = lasso_session_dump(LASSO_PROFILE(idpLoginContext)->session);
393
	fail_unless(idpSessionContextDump != NULL,
393
	ck_assert_msg(idpSessionContextDump != NULL,
394 394
		    "lasso_session_dump shouldn't return NULL");
395 395
	responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url;
396
	fail_unless(responseUrl != NULL, "responseUrl shouldn't be NULL");
396
	ck_assert_msg(responseUrl != NULL, "responseUrl shouldn't be NULL");
397 397
	responseQuery = strchr(responseUrl, '?')+1;
398
	fail_unless(strlen(responseQuery) > 0,
398
	ck_assert_msg(strlen(responseQuery) > 0,
399 399
			"responseQuery shouldn't be an empty string");
400 400
	serviceProviderId = g_strdup(LASSO_PROFILE(idpLoginContext)->remote_providerID);
401
	fail_unless(serviceProviderId != NULL,
401
	ck_assert_msg(serviceProviderId != NULL,
402 402
		    "lasso_profile_get_remote_providerID shouldn't return NULL");
403 403
	if (lasso_flag_thin_sessions) {
404 404
		/* when using thin sessions, the way artifact message is constructed changes as the
......
416 416
	rc = lasso_login_init_request(spLoginContext,
417 417
			responseQuery,
418 418
			LASSO_HTTP_METHOD_REDIRECT);
419
	fail_unless(rc == 0, "lasso_login_init_request failed");
419
	ck_assert_msg(rc == 0, "lasso_login_init_request failed");
420 420
	rc = lasso_login_build_request_msg(spLoginContext);
421
	fail_unless(rc == 0, "lasso_login_build_request_msg failed");
421
	ck_assert_msg(rc == 0, "lasso_login_build_request_msg failed");
422 422
	soapRequestMsg = LASSO_PROFILE(spLoginContext)->msg_body;
423
	fail_unless(soapRequestMsg != NULL, "soapRequestMsg must not be NULL");
423
	ck_assert_msg(soapRequestMsg != NULL, "soapRequestMsg must not be NULL");
424 424

  
425 425
	/* Identity provider SOAP endpoint */
426 426
	lasso_server_destroy(idpContext);
427 427
	lasso_login_destroy(idpLoginContext);
428 428
	requestType = lasso_profile_get_request_type_from_soap_msg(soapRequestMsg);
429
	fail_unless(requestType == LASSO_REQUEST_TYPE_LOGIN,
429
	ck_assert_msg(requestType == LASSO_REQUEST_TYPE_LOGIN,
430 430
			"requestType should be LASSO_REQUEST_TYPE_LOGIN");
431 431

  
432 432
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
433 433
	idpLoginContext = lasso_login_new(idpContext);
434 434
	rc = lasso_login_process_request_msg(idpLoginContext, soapRequestMsg);
435
	fail_unless(rc == 0, "lasso_login_process_request_msg failed");
435
	ck_assert_msg(rc == 0, "lasso_login_process_request_msg failed");
436 436
	if (lasso_flag_thin_sessions) {
437 437
		check_str_equals(idpLoginContext->assertionArtifact, artifact);
438 438
		lasso_profile_set_artifact_message(&idpLoginContext->parent, artifact_message);
439 439
	}
440 440
	rc = lasso_profile_set_session_from_dump(LASSO_PROFILE(idpLoginContext),
441 441
						 idpSessionContextDump);
442
	fail_unless(rc == 0, "lasso_login_set_assertion_from_dump failed");
442
	ck_assert_msg(rc == 0, "lasso_login_set_assertion_from_dump failed");
443 443
	rc = lasso_login_build_response_msg(idpLoginContext, serviceProviderId);
444
	fail_unless(rc == 0, "lasso_login_build_response_msg failed");
444
	ck_assert_msg(rc == 0, "lasso_login_build_response_msg failed");
445 445
	soapResponseMsg =  LASSO_PROFILE(idpLoginContext)->msg_body;
446
	fail_unless(soapResponseMsg != NULL, "soapResponseMsg must not be NULL");
446
	ck_assert_msg(soapResponseMsg != NULL, "soapResponseMsg must not be NULL");
447 447

  
448 448
	/* Service provider assertion consumer (step 2: process SOAP response) */
449 449
	rc = lasso_login_process_response_msg(spLoginContext, soapResponseMsg);
450
	fail_unless(rc == 0, "lasso_login_process_response_msg failed");
450
	ck_assert_msg(rc == 0, "lasso_login_process_response_msg failed");
451 451
	rc = lasso_login_accept_sso(spLoginContext);
452
	fail_unless(rc == 0, "lasso_login_accept_sso failed");
453
	fail_unless(LASSO_PROFILE(spLoginContext)->identity != NULL,
452
	ck_assert_msg(rc == 0, "lasso_login_accept_sso failed");
453
	ck_assert_msg(LASSO_PROFILE(spLoginContext)->identity != NULL,
454 454
			"spLoginContext has no identity");
455 455
	spIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(spLoginContext)->identity);
456
	fail_unless(spIdentityContextDump != NULL, "lasso_identity_dump failed");
456
	ck_assert_msg(spIdentityContextDump != NULL, "lasso_identity_dump failed");
457 457
	spSessionDump = lasso_session_dump(LASSO_PROFILE(spLoginContext)->session);
458 458

  
459 459
	g_free(serviceProviderId);
......
484 484
	serviceProviderContextDump = generateServiceProviderContextDump();
485 485
	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
486 486
	spLoginContext = lasso_login_new(spContext);
487
	fail_unless(spLoginContext != NULL,
487
	ck_assert_msg(spLoginContext != NULL,
488 488
			"lasso_login_new() shouldn't have returned NULL");
489 489
	rc = lasso_login_init_authn_request(spLoginContext, "https://idp1/metadata",
490 490
			LASSO_HTTP_METHOD_REDIRECT);
491
	fail_unless(rc == 0, "lasso_login_init_authn_request failed");
491
	ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed");
492 492
	request = LASSO_LIB_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request);
493
	fail_unless(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request");
493
	ck_assert_msg(LASSO_IS_LIB_AUTHN_REQUEST(request), "request should be authn_request");
494 494
	request->IsPassive = 0;
495 495
	request->NameIDPolicy = g_strdup(LASSO_LIB_NAMEID_POLICY_TYPE_FEDERATED);
496 496
	request->consent = g_strdup(LASSO_LIB_CONSENT_OBTAINED);
497 497
	relayState = "fake";
498 498
	request->RelayState = g_strdup(relayState);
499 499
	rc = lasso_login_build_authn_request_msg(spLoginContext);
500
	fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed");
500
	ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed");
501 501
	authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url;
502
	fail_unless(authnRequestUrl != NULL,
502
	ck_assert_msg(authnRequestUrl != NULL,
503 503
			"authnRequestUrl shouldn't be NULL");
504 504
	authnRequestQuery = strchr(authnRequestUrl, '?')+1;
505
	fail_unless(strlen(authnRequestQuery) > 0,
505
	ck_assert_msg(strlen(authnRequestQuery) > 0,
506 506
			"authnRequestRequest shouldn't be an empty string");
507 507

  
508 508
	/* Identity provider singleSignOn, for a user having no federation. */
509 509
	identityProviderContextDump = generateIdentityProviderContextDumpMemory();
510 510
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
511 511
	idpLoginContext = lasso_login_new(idpContext);
512
	fail_unless(idpLoginContext != NULL,
512
	ck_assert_msg(idpLoginContext != NULL,
513 513
			"lasso_login_new() shouldn't have returned NULL");
514 514
	rc = lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery);
515
	fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed");
515
	ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed");
516 516
	idpLoginContextDump = lasso_login_dump(idpLoginContext);
517 517
	check_not_null(idpLoginContextDump);
518 518
	g_object_unref(idpLoginContext);
tests/login_tests_saml2.c
125 125
	char *serviceProviderContextDump;
126 126

  
127 127
	identityProviderContextDump = generateIdentityProviderContextDump();
128
	fail_unless(identityProviderContextDump != NULL,
128
	ck_assert_msg(identityProviderContextDump != NULL,
129 129
			"generateIdentityProviderContextDump should not return NULL");
130 130
	g_free(identityProviderContextDump);
131 131
	serviceProviderContextDump = generateServiceProviderContextDump();
132
	fail_unless(serviceProviderContextDump != NULL,
132
	ck_assert_msg(serviceProviderContextDump != NULL,
133 133
			"generateServiceProviderContextDump should not return NULL");
134 134
	g_free(serviceProviderContextDump);
135 135
}
......
159 159
	serviceProviderContextDump = generateServiceProviderContextDump();
160 160
	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
161 161
	spLoginContext = lasso_login_new(spContext);
162
	fail_unless(spLoginContext != NULL,
162
	ck_assert_msg(spLoginContext != NULL,
163 163
			"lasso_login_new() shouldn't have returned NULL");
164 164
	rc = lasso_login_init_authn_request(spLoginContext, "http://idp5/metadata",
165 165
			LASSO_HTTP_METHOD_REDIRECT);
166
	fail_unless(rc == 0, "lasso_login_init_authn_request failed");
166
	ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed");
167 167
	request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request);
168
	fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
168
	ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
169 169
	request->IsPassive = 0;
170 170
	lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT);
171 171
	request->NameIDPolicy->AllowCreate = 1;
172 172
	relayState = "fake[]";
173 173
	lasso_assign_string(LASSO_PROFILE(spLoginContext)->msg_relayState, relayState);
174 174
	rc = lasso_login_build_authn_request_msg(spLoginContext);
175
	fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed");
175
	ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed");
176 176
	authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url;
177
	fail_unless(authnRequestUrl != NULL,
177
	ck_assert_msg(authnRequestUrl != NULL,
178 178
			"authnRequestUrl shouldn't be NULL");
179 179
	authnRequestQuery = strchr(authnRequestUrl, '?')+1;
180
	fail_unless(strlen(authnRequestQuery) > 0,
180
	ck_assert_msg(strlen(authnRequestQuery) > 0,
181 181
			"authnRequestQuery shouldn't be an empty string");
182 182
	spLoginDump = lasso_node_dump(LASSO_NODE(spLoginContext));
183
	fail_unless(strstr(authnRequestQuery, "RelayState") != NULL,
183
	ck_assert_msg(strstr(authnRequestQuery, "RelayState") != NULL,
184 184
			"authnRequestQuery should contain a RelayState parameter");
185
	fail_unless(strstr(authnRequestQuery, "fake%5B%5D") != NULL,
185
	ck_assert_msg(strstr(authnRequestQuery, "fake%5B%5D") != NULL,
186 186
			"authnRequestQuery RelayState parameter should be encoded");
187 187

  
188 188
	/* Identity provider singleSignOn, for a user having no federation. */
189 189
	identityProviderContextDump = generateIdentityProviderContextDump();
190 190
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
191 191
	idpLoginContext = lasso_login_new(idpContext);
192
	fail_unless(idpLoginContext != NULL,
192
	ck_assert_msg(idpLoginContext != NULL,
193 193
			"lasso_login_new() shouldn't have returned NULL");
194 194
	check_good_rc(lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery));
195 195
	check_true(lasso_login_must_authenticate(idpLoginContext));
......
221 221
	responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url;
222 222
	check_not_null(responseUrl);
223 223
	responseQuery = strchr(responseUrl, '?')+1;
224
	fail_unless(strlen(responseQuery) > 0,
224
	ck_assert_msg(strlen(responseQuery) > 0,
225 225
			"responseQuery shouldn't be an empty string");
226 226
	check_not_null(strstr(responseQuery, "RelayState"));
227 227
	check_not_null(strstr(responseQuery, "fake%5B%5D"));
......
358 358
	serviceProviderContextDump = generateServiceProviderContextDump();
359 359
	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
360 360
	spLoginContext = lasso_login_new(spContext);
361
	fail_unless(spLoginContext != NULL,
361
	ck_assert_msg(spLoginContext != NULL,
362 362
			"lasso_login_new() shouldn't have returned NULL");
363 363
	rc = lasso_login_init_authn_request(spLoginContext, "http://idp5/metadata",
364 364
			LASSO_HTTP_METHOD_REDIRECT);
365
	fail_unless(rc == 0, "lasso_login_init_authn_request failed");
365
	ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed");
366 366
	request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request);
367
	fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
367
	ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
368 368
	request->IsPassive = 0;
369 369
	lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT);
370 370
	request->NameIDPolicy->AllowCreate = 1;
371 371
	relayState = "fake";
372 372
	lasso_assign_string(LASSO_PROFILE(spLoginContext)->msg_relayState, relayState);
373 373
	rc = lasso_login_build_authn_request_msg(spLoginContext);
374
	fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed");
374
	ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed");
375 375
	authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url;
376
	fail_unless(authnRequestUrl != NULL,
376
	ck_assert_msg(authnRequestUrl != NULL,
377 377
			"authnRequestUrl shouldn't be NULL");
378 378
	authnRequestQuery = strchr(authnRequestUrl, '?')+1;
379
	fail_unless(strlen(authnRequestQuery) > 0,
379
	ck_assert_msg(strlen(authnRequestQuery) > 0,
380 380
			"authnRequestRequest shouldn't be an empty string");
381 381

  
382 382
	/* Identity provider singleSignOn, for a user having no federation. */
383 383
	identityProviderContextDump = generateIdentityProviderContextDumpMemory();
384 384
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
385 385
	idpLoginContext = lasso_login_new(idpContext);
386
	fail_unless(idpLoginContext != NULL,
386
	ck_assert_msg(idpLoginContext != NULL,
387 387
			"lasso_login_new() shouldn't have returned NULL");
388 388
	rc = lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery);
389
	fail_unless(rc == 0, "lasso_login_process_authn_request_msg failed");
390
	fail_unless(lasso_login_must_authenticate(idpLoginContext),
389
	ck_assert_msg(rc == 0, "lasso_login_process_authn_request_msg failed");
390
	ck_assert_msg(lasso_login_must_authenticate(idpLoginContext),
391 391
			"lasso_login_must_authenticate() should be TRUE");
392
	fail_unless(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART,
392
	ck_assert_msg(idpLoginContext->protocolProfile == LASSO_LOGIN_PROTOCOL_PROFILE_BRWS_ART,
393 393
			"protocoleProfile should be ProfileBrwsArt");
394
	fail_unless(! lasso_login_must_ask_for_consent(idpLoginContext),
394
	ck_assert_msg(! lasso_login_must_ask_for_consent(idpLoginContext),
395 395
			"lasso_login_must_ask_for_consent() should be FALSE");
396 396
	rc = lasso_login_validate_request_msg(idpLoginContext,
397 397
			1, /* authentication_result */
......
405 405
			"FIXME: notBefore",
406 406
			"FIXME: notOnOrAfter");
407 407
	rc = lasso_login_build_artifact_msg(idpLoginContext, LASSO_HTTP_METHOD_ARTIFACT_GET);
408
	fail_unless(rc == 0, "lasso_login_build_artifact_msg failed");
408
	ck_assert_msg(rc == 0, "lasso_login_build_artifact_msg failed");
409 409

  
410 410
	idpIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(idpLoginContext)->identity);
411
	fail_unless(idpIdentityContextDump != NULL,
411
	ck_assert_msg(idpIdentityContextDump != NULL,
412 412
		    "lasso_identity_dump shouldn't return NULL");
413 413
	idpSessionContextDump = lasso_session_dump(LASSO_PROFILE(idpLoginContext)->session);
414
	fail_unless(idpSessionContextDump != NULL,
414
	ck_assert_msg(idpSessionContextDump != NULL,
415 415
		    "lasso_session_dump shouldn't return NULL");
416 416
	responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url;
417
	fail_unless(responseUrl != NULL, "responseUrl shouldn't be NULL");
417
	ck_assert_msg(responseUrl != NULL, "responseUrl shouldn't be NULL");
418 418
	responseQuery = strchr(responseUrl, '?')+1;
419
	fail_unless(strlen(responseQuery) > 0,
419
	ck_assert_msg(strlen(responseQuery) > 0,
420 420
			"responseQuery shouldn't be an empty string");
421 421
	lasso_assign_string(serviceProviderId, LASSO_PROFILE(idpLoginContext)->remote_providerID);
422
	fail_unless(serviceProviderId != NULL,
422
	ck_assert_msg(serviceProviderId != NULL,
423 423
		    "lasso_profile_get_remote_providerID shouldn't return NULL");
424 424

  
425 425
	/* Service provider assertion consumer */
......
431 431
	rc = lasso_login_init_request(spLoginContext,
432 432
			responseQuery,
433 433
			LASSO_HTTP_METHOD_ARTIFACT_GET);
434
	fail_unless(rc == 0, "lasso_login_init_request failed");
434
	ck_assert_msg(rc == 0, "lasso_login_init_request failed");
435 435
	rc = lasso_login_build_request_msg(spLoginContext);
436
	fail_unless(rc == 0, "lasso_login_build_request_msg failed");
436
	ck_assert_msg(rc == 0, "lasso_login_build_request_msg failed");
437 437
	soapRequestMsg = LASSO_PROFILE(spLoginContext)->msg_body;
438
	fail_unless(soapRequestMsg != NULL, "soapRequestMsg must not be NULL");
438
	ck_assert_msg(soapRequestMsg != NULL, "soapRequestMsg must not be NULL");
439 439

  
440 440
	/* Identity provider SOAP endpoint */
441 441
	lasso_server_destroy(idpContext);
......
445 445
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
446 446
	idpLoginContext = lasso_login_new_from_dump(idpContext, idpLoginDump);
447 447
	rc = lasso_login_process_request_msg(idpLoginContext, soapRequestMsg);
448
	fail_unless(rc == 0, "lasso_login_process_request_msg failed");
448
	ck_assert_msg(rc == 0, "lasso_login_process_request_msg failed");
449 449

  
450 450
	rc = lasso_profile_set_session_from_dump(LASSO_PROFILE(idpLoginContext),
451 451
						 idpSessionContextDump);
452
	fail_unless(rc == 0, "lasso_login_set_assertion_from_dump failed");
452
	ck_assert_msg(rc == 0, "lasso_login_set_assertion_from_dump failed");
453 453
	rc = lasso_login_build_response_msg(idpLoginContext, serviceProviderId);
454
	fail_unless(rc == 0, "lasso_login_build_response_msg failed");
454
	ck_assert_msg(rc == 0, "lasso_login_build_response_msg failed");
455 455
	soapResponseMsg =  LASSO_PROFILE(idpLoginContext)->msg_body;
456
	fail_unless(soapResponseMsg != NULL, "soapResponseMsg must not be NULL");
456
	ck_assert_msg(soapResponseMsg != NULL, "soapResponseMsg must not be NULL");
457 457

  
458 458
	/* Service provider assertion consumer (step 2: process SOAP response) */
459 459
	rc = lasso_login_process_response_msg(spLoginContext, soapResponseMsg);
460
	fail_unless(rc == 0, "lasso_login_process_response_msg failed");
460
	ck_assert_msg(rc == 0, "lasso_login_process_response_msg failed");
461 461
	rc = lasso_login_accept_sso(spLoginContext);
462
	fail_unless(rc == 0, "lasso_login_accept_sso failed");
463
	fail_unless(LASSO_PROFILE(spLoginContext)->identity != NULL,
462
	ck_assert_msg(rc == 0, "lasso_login_accept_sso failed");
463
	ck_assert_msg(LASSO_PROFILE(spLoginContext)->identity != NULL,
464 464
			"spLoginContext has no identity");
465 465
	spIdentityContextDump = lasso_identity_dump(LASSO_PROFILE(spLoginContext)->identity);
466
	fail_unless(spIdentityContextDump != NULL, "lasso_identity_dump failed");
466
	ck_assert_msg(spIdentityContextDump != NULL, "lasso_identity_dump failed");
467 467
	spSessionDump = lasso_session_dump(LASSO_PROFILE(spLoginContext)->session);
468 468

  
469 469
	g_free(idpLoginDump);
......
505 505
	serviceProviderContextDump = generateServiceProviderContextDump();
506 506
	spContext = lasso_server_new_from_dump(serviceProviderContextDump);
507 507
	spLoginContext = lasso_login_new(spContext);
508
	fail_unless(spLoginContext != NULL,
508
	ck_assert_msg(spLoginContext != NULL,
509 509
			"lasso_login_new() shouldn't have returned NULL");
510 510
	rc = lasso_login_init_authn_request(spLoginContext, "http://idp5/metadata",
511 511
			LASSO_HTTP_METHOD_REDIRECT);
512
	fail_unless(rc == 0, "lasso_login_init_authn_request failed");
512
	ck_assert_msg(rc == 0, "lasso_login_init_authn_request failed");
513 513
	request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request);
514
	fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
514
	ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
515 515
	request->IsPassive = 0;
516 516
	lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT);
517 517
	request->NameIDPolicy->AllowCreate = 1;
518 518
	relayState = "fake[]";
519 519
	lasso_assign_string(LASSO_PROFILE(spLoginContext)->msg_relayState, relayState);
520 520
	rc = lasso_login_build_authn_request_msg(spLoginContext);
521
	fail_unless(rc == 0, "lasso_login_build_authn_request_msg failed");
521
	ck_assert_msg(rc == 0, "lasso_login_build_authn_request_msg failed");
522 522
	authnRequestUrl = LASSO_PROFILE(spLoginContext)->msg_url;
523
	fail_unless(authnRequestUrl != NULL,
523
	ck_assert_msg(authnRequestUrl != NULL,
524 524
			"authnRequestUrl shouldn't be NULL");
525 525
	authnRequestQuery = strchr(authnRequestUrl, '?')+1;
526
	fail_unless(strlen(authnRequestQuery) > 0,
526
	ck_assert_msg(strlen(authnRequestQuery) > 0,
527 527
			"authnRequestQuery shouldn't be an empty string");
528 528
	spLoginDump = lasso_node_dump(LASSO_NODE(spLoginContext));
529
	fail_unless(strstr(authnRequestQuery, "RelayState") != NULL,
529
	ck_assert_msg(strstr(authnRequestQuery, "RelayState") != NULL,
530 530
			"authnRequestQuery should contain a RelayState parameter");
531
	fail_unless(strstr(authnRequestQuery, "fake%5B%5D") != NULL,
531
	ck_assert_msg(strstr(authnRequestQuery, "fake%5B%5D") != NULL,
532 532
			"authnRequestQuery RelayState parameter should be encoded");
533 533

  
534 534
	/* Identity provider singleSignOn, for a user having no federation. */
535 535
	identityProviderContextDump = generateIdentityProviderContextDump();
536 536
	idpContext = lasso_server_new_from_dump(identityProviderContextDump);
537 537
	idpLoginContext = lasso_login_new(idpContext);
538
	fail_unless(idpLoginContext != NULL,
538
	ck_assert_msg(idpLoginContext != NULL,
539 539
			"lasso_login_new() shouldn't have returned NULL");
540 540
	check_good_rc(lasso_login_process_authn_request_msg(idpLoginContext, authnRequestQuery));
541 541
	check_true(lasso_login_must_authenticate(idpLoginContext));
......
567 567
	responseUrl = LASSO_PROFILE(idpLoginContext)->msg_url;
568 568
	check_not_null(responseUrl);
569 569
	responseQuery = strchr(responseUrl, '?')+1;
570
	fail_unless(strlen(responseQuery) > 0,
570
	ck_assert_msg(strlen(responseQuery) > 0,
571 571
			"responseQuery shouldn't be an empty string");
572 572
	check_not_null(strstr(responseQuery, "RelayState"));
573 573
	check_not_null(strstr(responseQuery, "fake%5B%5D"));
......
696 696
			TESTSDATADIR "idp11-multikey-saml2/private-key-1.pem",
697 697
			NULL, /* Secret key to unlock private key */
698 698
			TESTSDATADIR "idp11-multikey-saml2/certificate-1.pem");
699
	check_not_null(idpContext1)
699
	check_not_null(idpContext1);
700 700
	check_good_rc(lasso_server_add_provider(
701 701
			idpContext1,
702 702
			LASSO_PROVIDER_ROLE_SP,
......
709 709
			TESTSDATADIR "idp11-multikey-saml2/private-key-2.pem",
710 710
			NULL, /* Secret key to unlock private key */
711 711
			TESTSDATADIR "idp11-multikey-saml2/certificate-2.pem");
712
	check_not_null(idpContext2)
712
	check_not_null(idpContext2);
713 713
	check_good_rc(lasso_server_add_provider(
714 714
			idpContext2,
715 715
			LASSO_PROVIDER_ROLE_SP,
......
722 722
			TESTSDATADIR "/sp6-saml2/private-key.pem",
723 723
			NULL, /* Secret key to unlock private key */
724 724
			NULL);
725
	check_not_null(spContext)
725
	check_not_null(spContext);
726 726
	check_good_rc(lasso_server_add_provider(
727 727
			spContext,
728 728
			LASSO_PROVIDER_ROLE_IDP,
......
827 827
	LassoLogin *sp_login_context;
828 828

  
829 829
	check_not_null(idp_login_context = lasso_login_new(idp_context));
830
	check_not_null(sp_login_context = lasso_login_new(sp_context))
830
	check_not_null(sp_login_context = lasso_login_new(sp_context));
831 831

  
832 832
	/* Create response */
833 833
	check_good_rc(lasso_login_init_idp_initiated_authn_request(idp_login_context,
......
935 935
	char *authn_request_query;
936 936

  
937 937
	check_not_null(idp_login_context = lasso_login_new(idp_context));
938
	check_not_null(sp_login_context = lasso_login_new(sp_context))
938
	check_not_null(sp_login_context = lasso_login_new(sp_context));
939 939

  
940 940
	/* Create response */
941 941
	check_good_rc(lasso_login_init_authn_request(sp_login_context, NULL, LASSO_HTTP_METHOD_REDIRECT));
......
1026 1026
	char *authn_request_query;
1027 1027

  
1028 1028
	check_not_null(idp_login_context = lasso_login_new(idp_context));
1029
	check_not_null(sp_login_context = lasso_login_new(sp_context))
1029
	check_not_null(sp_login_context = lasso_login_new(sp_context));
1030 1030

  
1031 1031
	/* Create response */
1032 1032
	check_good_rc(lasso_login_init_authn_request(sp_login_context, NULL, LASSO_HTTP_METHOD_REDIRECT));
......
1332 1332

  
1333 1333
	/* Set PAOS authn request parameters */
1334 1334
	request = LASSO_SAMLP2_AUTHN_REQUEST(LASSO_PROFILE(spLoginContext)->request);
1335
	fail_unless(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
1335
	ck_assert_msg(LASSO_IS_SAMLP2_AUTHN_REQUEST(request), "request should be authn_request");
1336 1336
	request->IsPassive = is_passive;
1337 1337

  
1338 1338
	lasso_assign_string(request->NameIDPolicy->Format, LASSO_SAML2_NAME_IDENTIFIER_FORMAT_PERSISTENT);
tests/metadata_tests.c
43 43
{
44 44
	LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP,
45 45
			TESTSMETADATADIR "/metadata_01.xml", NULL, NULL);
46
	fail_unless(provider != NULL, "Can't load DER certificate from <ds:X509Certificate>");
46
	ck_assert_msg(provider != NULL, "Can't load DER certificate from <ds:X509Certificate>");
47 47
	g_object_unref(provider);
48 48
}
49 49
END_TEST
......
52 52
{
53 53
	LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP,
54 54
			TESTSMETADATADIR "/metadata_02.xml", NULL, NULL);
55
	fail_unless(provider != NULL, "Can't load PEM certificate from <ds:X509Certificate>");
55
	ck_assert_msg(provider != NULL, "Can't load PEM certificate from <ds:X509Certificate>");
56 56
	g_object_unref(provider);
57 57
}
58 58
END_TEST
......
61 61
{
62 62
	LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP,
63 63
			TESTSMETADATADIR "/metadata_03.xml", NULL, NULL);
64
	fail_unless(provider != NULL, "Can't load DER public key from <ds:KeyValue>");
64
	ck_assert_msg(provider != NULL, "Can't load DER public key from <ds:KeyValue>");
65 65
	g_object_unref(provider);
66 66
}
67 67
END_TEST
......
70 70
{
71 71
	LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP,
72 72
			TESTSMETADATADIR "/metadata_04.xml", NULL, NULL);
73
	fail_unless(provider != NULL, "Can't load PEM public key from <ds:KeyValue>");
73
	ck_assert_msg(provider != NULL, "Can't load PEM public key from <ds:KeyValue>");
74 74
	g_object_unref(provider);
75 75
}
76 76
END_TEST
......
79 79
{
80 80
	LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP,
81 81
			TESTSMETADATADIR "/metadata_05.xml", NULL, NULL);
82
	fail_unless(provider != NULL, "Can't load DER public key from <ds:X509Certificate>");
82
	ck_assert_msg(provider != NULL, "Can't load DER public key from <ds:X509Certificate>");
83 83
	g_object_unref(provider);
84 84
}
85 85
END_TEST
......
88 88
{
89 89
	LassoProvider *provider = lasso_provider_new(LASSO_PROVIDER_ROLE_SP,
90 90
			TESTSMETADATADIR "/metadata_06.xml", NULL, NULL);
91
	fail_unless(provider != NULL, "Can't load RSAKeyValue node");
91
	ck_assert_msg(provider != NULL, "Can't load RSAKeyValue node");
92 92
	g_object_unref(provider);
93 93
}
94 94
END_TEST
......
116 116
			LASSO_SAML2_METADATA_ATTRIBUTE_WANT_AUTHN_REQUEST_SIGNED);
117 117
	check_not_null(l);
118 118
	check_null(l->next);
119
	check_str_equals(l->data, "true");
119
	check_str_equals((char*)l->data, "true");
120 120
	lasso_release_gobject(provider);
121 121
}
122 122
END_TEST
tests/random_tests.c
46 46
			TESTSDATADIR "/sp1-la/metadata.xml",
47 47
			TESTSDATADIR "/sp1-la/public-key.pem",
48 48
			TESTSDATADIR "/ca1-la/certificate.pem");
49
	fail_unless(LASSO_IS_PROVIDER(provider));
49
	ck_assert(LASSO_IS_PROVIDER(provider));
50 50

  
51 51
	dump = lasso_node_dump(LASSO_NODE(provider));
52
	fail_unless(dump != NULL);
52
	ck_assert(dump != NULL);
53 53
	g_object_unref(provider);
54 54
	lasso_release_string(dump);
55 55
}
......
64 64
			TESTSDATADIR "/sp1-la/metadata.xml",
65 65
			TESTSDATADIR "/sp1-la/public-key.pem",
66 66
			TESTSDATADIR "/ca1-la/certificate.pem");
67
	fail_unless(LASSO_IS_PROVIDER(provider1));
67
	ck_assert(LASSO_IS_PROVIDER(provider1));
68 68

  
69 69
	dump = lasso_node_dump(LASSO_NODE(provider1));
70
	fail_unless(dump != NULL);
70
	ck_assert(dump != NULL);
71 71
	provider2 = lasso_provider_new_from_dump(dump);
72
	fail_unless(LASSO_IS_PROVIDER(provider2));
72
	ck_assert(LASSO_IS_PROVIDER(provider2));
73 73
	lasso_release_string(dump);
74 74
	dump = lasso_node_dump(LASSO_NODE(provider2));
75
	fail_unless(dump != NULL);
75
	ck_assert(dump != NULL);
76 76
	g_object_unref(provider1);
77 77
	g_object_unref(provider2);
78 78
	lasso_release_string(dump);
......
92 92
			TESTSDATADIR "/idp1-la/private-key-raw.pem",
93 93
			NULL, /* Secret key to unlock private key */
94 94
			TESTSDATADIR "/idp1-la/certificate.pem");
95
	fail_unless(LASSO_IS_SERVER(server));
95
	ck_assert(LASSO_IS_SERVER(server));
96 96
	provider = LASSO_PROVIDER(server);
97
	fail_unless(server->private_key != NULL);
98
	fail_unless(server->private_key_password == NULL);
99
	fail_unless(server->certificate != NULL);
100
	fail_unless(server->signature_method == lasso_get_default_signature_method());
101
	fail_unless(provider->ProviderID != NULL);
102
	fail_unless(provider->role == 0);
103
	fail_unless(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL));
104
	fail_unless(strcmp(provider->metadata_filename, content) == 0);
97
	ck_assert(server->private_key != NULL);
98
	ck_assert(server->private_key_password == NULL);
99
	ck_assert(server->certificate != NULL);
100
	ck_assert(server->signature_method == lasso_get_default_signature_method());
101
	ck_assert(provider->ProviderID != NULL);
102
	ck_assert(provider->role == 0);
103
	ck_assert(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL));
104
	ck_assert(strcmp(provider->metadata_filename, content) == 0);
105 105
	g_free(content);
106
	fail_unless(provider->public_key == NULL);
107
	fail_unless(provider->ca_cert_chain == NULL);
106
	ck_assert(provider->public_key == NULL);
107
	ck_assert(provider->ca_cert_chain == NULL);
108 108

  
109 109
	dump = lasso_node_dump(LASSO_NODE(server));
110
	fail_unless(dump != NULL);
110
	ck_assert(dump != NULL);
111 111
	g_object_unref(server);
112 112
	server = lasso_server_new_from_dump(dump);
113
	fail_unless(LASSO_IS_SERVER(server));
113
	ck_assert(LASSO_IS_SERVER(server));
114 114
	provider = LASSO_PROVIDER(server);
115
	fail_unless(server->private_key != NULL);
116
	fail_unless(server->private_key_password == NULL);
117
	fail_unless(server->certificate != NULL);
118
	fail_unless(server->signature_method == lasso_get_default_signature_method());
119
	fail_unless(server->providers != NULL);
120
	fail_unless(provider->ProviderID != NULL);
121
	fail_unless(provider->role == 0, "provider->role != 0 => provider :=  %d", provider->role);
122
	fail_unless(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL));
123
	fail_unless(strcmp(provider->metadata_filename, content) == 0);
124
	fail_unless(provider->public_key == NULL);
125
	fail_unless(provider->ca_cert_chain == NULL);
115
	ck_assert(server->private_key != NULL);
116
	ck_assert(server->private_key_password == NULL);
117
	ck_assert(server->certificate != NULL);
118
	ck_assert(server->signature_method == lasso_get_default_signature_method());
119
	ck_assert(server->providers != NULL);
120
	ck_assert(provider->ProviderID != NULL);
121
	ck_assert_msg(provider->role == 0, "provider->role != 0 => provider :=  %d", provider->role);
122
	ck_assert(g_file_get_contents(TESTSDATADIR "/idp1-la/metadata.xml", &content, &len, NULL));
123
	ck_assert(strcmp(provider->metadata_filename, content) == 0);
124
	ck_assert(provider->public_key == NULL);
125
	ck_assert(provider->ca_cert_chain == NULL);
126 126
	g_object_unref(server);
127 127
	lasso_release_string(dump);
128 128
	lasso_release_string(content);
......
139 139
			TESTSDATADIR "/idp1-la/private-key-raw.pem",
140 140
			NULL, /* Secret key to unlock private key */
141 141
			TESTSDATADIR "/idp1-la/certificate.pem");
142
	fail_unless(LASSO_IS_SERVER(server));
143
	fail_unless(server->private_key != NULL);
144
	fail_unless(! server->private_key_password);
145
	fail_unless(server->certificate != NULL);
146
	fail_unless(server->signature_method == lasso_get_default_signature_method());
147
	fail_unless(server->providers != NULL);
142
	ck_assert(LASSO_IS_SERVER(server));
143
	ck_assert(server->private_key != NULL);
144
	ck_assert(! server->private_key_password);
145
	ck_assert(server->certificate != NULL);
146
	ck_assert(server->signature_method == lasso_get_default_signature_method());
147
	ck_assert(server->providers != NULL);
148 148
	lasso_server_add_provider(
149 149
			server,
150 150
			LASSO_PROVIDER_ROLE_SP,
151 151
			TESTSDATADIR "/sp1-la/metadata.xml",
152 152
			TESTSDATADIR "/sp1-la/public-key.pem",
153 153
			TESTSDATADIR "/ca1-la/certificate.pem");
154
	fail_unless(g_hash_table_size(server->providers) == 1);
154
	ck_assert(g_hash_table_size(server->providers) == 1);
155 155

  
156 156

  
157 157
	dump = lasso_node_dump(LASSO_NODE(server));
......
206 206
	char *dump;
207 207

  
208 208
	node = lasso_node_new_from_dump(msg);
209
	fail_unless(node != NULL, "new_from_dump failed");
209
	ck_assert_msg(node != NULL, "new_from_dump failed");
210 210
	dump = lasso_node_dump(node);
211
	fail_unless(dump != NULL, "node_dump failed");
211
	ck_assert_msg(dump != NULL, "node_dump failed");
212 212
	g_object_unref(node);
213 213
	g_free(dump);
214 214
}
......
241 241
	stmt->AuthnContext->AuthnContextClassRef = g_strdup("urn:toto");
242 242

  
243 243
	dump = lasso_node_dump(LASSO_NODE(assertion));
244
	fail_unless(strstr(dump, "xsi:type=\"lib:AuthnContextType\"") == NULL,
244
	ck_assert_msg(strstr(dump, "xsi:type=\"lib:AuthnContextType\"") == NULL,
245 245
			"AuthnContext got a xsi:type");
246 246
	g_free(dump);
247 247
	dump = lasso_node_dump(LASSO_NODE(assertion));
248
	fail_unless(strstr(dump, "xsi:type=\"lib:AuthenticationStatementType\"") != NULL,
248
	ck_assert_msg(strstr(dump, "xsi:type=\"lib:AuthenticationStatementType\"") != NULL,
249 249
			"AuthenticationStatement didn't get a xsi:type");
250 250
	g_free(dump);
251 251
	g_object_unref(assertion);
......
262 262

  
263 263
	lasso_assign_string(response->Status->StatusCode->Value, LASSO_SAML_STATUS_CODE_SUCCESS);
264 264
	dump = lasso_node_dump(LASSO_NODE(response));
265
	fail_unless(strstr(dump, "xmlns:lib=") == NULL,
265
	ck_assert_msg(strstr(dump, "xmlns:lib=") == NULL,
266 266
			"liberty namespace should not be defined");
267 267
	lasso_release_string(dump);
268 268

  
......
271 271
	response->Status->StatusCode->StatusCode->Value = g_strdup(
272 272
			LASSO_LIB_STATUS_CODE_UNKNOWN_PRINCIPAL);
273 273
	dump = lasso_node_dump(LASSO_NODE(response));
274
	fail_unless(strstr(dump, "xmlns:lib=") != NULL,
274
	ck_assert_msg(strstr(dump, "xmlns:lib=") != NULL,
275 275
			"liberty namespace should be defined");
276 276
	lasso_release_string(dump);
277 277
	g_object_unref(response);
......
319 319
	xmlSecKeyPtr key = lasso_xmlsec_load_private_key_from_buffer(pkey, sizeof(pkey)-1, NULL,
320 320
			LASSO_SIGNATURE_METHOD_RSA_SHA256, NULL);
321 321

  
322
	fail_unless(key != NULL, "Cannot load public key");
323
	fail_unless(lasso_saml2_query_verify_signature(query1, key) == 0, "Signature was not validated");
322
	ck_assert_msg(key != NULL, "Cannot load public key");
323
	ck_assert_msg(lasso_saml2_query_verify_signature(query1, key) == 0, "Signature was not validated");
324 324
	/* test reordering and semi-colon separator support */
325
	fail_unless(lasso_saml2_query_verify_signature(query2, key) == 0, "Disordered signature was not validated");
326
	fail_unless(lasso_saml2_query_verify_signature(query3, key) != 0, "Altered signature was validated");
325
	ck_assert_msg(lasso_saml2_query_verify_signature(query2, key) == 0, "Disordered signature was not validated");
326
	ck_assert_msg(lasso_saml2_query_verify_signature(query3, key) != 0, "Altered signature was validated");
327 327
	xmlSecKeyDestroy(key);
328 328
}
329 329
END_TEST
......
405 405
	xmlDoc *doc;
406 406

  
407 407
	doc = xmlParseDoc(BAD_CAST message);
408
	fail_unless(key != NULL, "Cannot load public key");
409
	fail_unless(lasso_key_query_verify(key, query1) == 0, "Signature was not validated");
408
	ck_assert_msg(key != NULL, "Cannot load public key");
409
	ck_assert_msg(lasso_key_query_verify(key, query1) == 0, "Signature was not validated");
410 410
	/* test reordering and semi-colon separator support */
411
	fail_unless(lasso_key_query_verify(key, query2) == 0, "Disordered signature was not validated");
412
	fail_unless(lasso_key_query_verify(key, query3) != 0, "Altered signature was validated");
413
	fail_unless(lasso_key_saml2_xml_verify(key,
411
	ck_assert_msg(lasso_key_query_verify(key, query2) == 0, "Disordered signature was not validated");
412
	ck_assert_msg(lasso_key_query_verify(key, query3) != 0, "Altered signature was validated");
413
	ck_assert_msg(lasso_key_saml2_xml_verify(key,
414 414
		"_5E4DB038BC15C020CE085F743D485443", xmlDocGetRootElement(doc)) == 0,
415 415
		"XML Signature is not validated");
416 416
	g_object_unref(key);
417
	fail_unless(key2 != NULL, "Cannot load public key2");
418
	fail_unless(lasso_key_query_verify(key2, query1) == 0, "Signature was not validated");
417
	ck_assert_msg(key2 != NULL, "Cannot load public key2");
418
	ck_assert_msg(lasso_key_query_verify(key2, query1) == 0, "Signature was not validated");
419 419
	/* test reordering and semi-colon separator support */
420
	fail_unless(lasso_key_query_verify(key2, query2) == 0, "Disordered signature was not validated");
421
	fail_unless(lasso_key_query_verify(key2, query3) != 0, "Altered signature was validated");
422
	fail_unless(lasso_key_saml2_xml_verify(key2,
420
	ck_assert_msg(lasso_key_query_verify(key2, query2) == 0, "Disordered signature was not validated");
421
	ck_assert_msg(lasso_key_query_verify(key2, query3) != 0, "Altered signature was validated");
422
	ck_assert_msg(lasso_key_saml2_xml_verify(key2,
423 423
		"_5E4DB038BC15C020CE085F743D485443", xmlDocGetRootElement(doc)) == 0,
424 424
		"XML Signature is not validated");
425 425
	g_object_unref(key2);
tests/tests.c
66 66
     g_log_set_default_handler(mute_logger, NULL);
67 67
     if (log_failed) {
68 68
         log_failed = 0;
69
         fail("There were logs, there should not");
69
         ck_assert_msg(0, "There were logs, there should not");
70 70
     }
71 71
}
72 72

  
......
102 102
			g_assert_not_reached();
103 103
	}
104 104
        if (! dontfork) {
105
		fail("No logging output expected: message «%s» was emitted for domain «%s» at the level «%s»", message, log_domain, level_name);
105
		ck_assert_msg(0, "No logging output expected: message «%s» was emitted for domain «%s» at the level «%s»", message, log_domain, level_name);
106 106
	}
107 107
	printf("No logging output expected: message «%s» was emitted for domain «%s» at the level «%s»", message, log_domain, level_name);
108 108
        log_failed = 1;
......
119 119
{
120 120
	void *ptr = malloc_func(size);
121 121
	if (! ptr) {
122
		fail("xmlMalloc failed");
122
		ck_assert_msg(0, "xmlMalloc failed");
123 123
	}
124 124
	return ptr;
125 125
}
......
129 129
{
130 130
	void *ptr = realloc_func(mem, size);
131 131
	if (! ptr) {
132
		fail("xmlRealloc failed");
132
		ck_assert_msg(0, "xmlRealloc failed");
133 133
	}
134 134
	return ptr;
135 135
}
tests/tests.h
25 25
#include "../lasso/lasso_config.h"
26 26

  
27 27
#define check_not_null(what) \
28
	fail_unless((what) != NULL, "%s:%i: " #what " returned NULL", __func__, __LINE__);
28
	ck_assert((what) != NULL)
29 29

  
30 30
#define check_null(what) \
31
	fail_unless((what) == NULL, "%s:%i: "#what " returned NULL", __func__, __LINE__);
31
	ck_assert((what) == NULL)
32 32

  
33
#define check_true(what) \
34
	fail_unless((what), "%s:%i: " #what " is not TRUE", __func__, __LINE__);
33
#define check_true(what) ck_assert(what)
35 34

  
36
#define check_false(what) \
37
	fail_unless(! (what), "%s:%i: " #what " is not FALSE", __func__, __LINE__);
35
#define check_false(what) ck_assert(! (what))
38 36

  
39 37

  
40
#define check_good_rc(what) \
41
{ 	int __rc = (what); \
42
	fail_unless(__rc == 0, "%s:%i: " #what " failed, rc = %s(%i)", __func__, __LINE__, lasso_strerror(__rc), __rc); \
43
}
38
#define check_good_rc(what) do { int __rc = (what); ck_assert_msg(__rc == 0, "rc = %s(%i)", lasso_strerror(__rc), __rc); } while(0)
44 39

  
45 40
#define check_bad_rc(what, how) \
46 41
{ 	int __rc = (what); \
47
	fail_unless(__rc == how, "%s:%i: " #what " is not %s(%i), rc = %s(%i)", __func__, __LINE__, lasso_strerror(how), how, lasso_strerror(__rc), __rc); \
42
	ck_assert_msg(__rc == how, #what " is not %s(%i), rc = %s(%i)", lasso_strerror(how), how, lasso_strerror(__rc), __rc); \
48 43
}
49 44

  
50 45
#define check_equals(what,to) \
51 46
{	typeof(what) __tmp1, __tmp2; \
52 47
	__tmp1 = (what); \
53 48
	__tmp2 = (to); \
54
	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); \
49
	ck_assert_msg(__tmp1 == __tmp2, #what " is not equal to " #to "(%llu) but to %llu", (long long int)__tmp2, (long long int)__tmp1); \
55 50
}
56 51

  
57 52
#define check_not_equals(what,to) \
58 53
{	typeof(what) __tmp1, __tmp2; \
59 54
	__tmp1 = (what); \
60 55
	__tmp2 = (to); \
61
	fail_unless(__tmp1 != __tmp2, "%s:%i: " #what " is equal to " #to "(%llu)", __func__, __LINE__, (long long int)__tmp2); \
56
	ck_assert_msg(__tmp1 != __tmp2, #what " is equal to " #to "(%llu)", (long long int)__tmp2); \
62 57
}
63 58

  
64 59
#define check_str_equals(what, to) \
65 60
{	typeof(what) __tmp; \
66 61
	__tmp = (what); \
67
	fail_unless(g_strcmp0(__tmp, to) == 0, "%s:%i: " #what " (%s) is not equal to %s", __func__, __LINE__, __tmp, to); \
62
	ck_assert_msg(g_strcmp0(__tmp, to) == 0, #what " (%s) is not equal to %s", __tmp, to); \
68 63
}
69 64

  
70 65
#define check_str_not_equals(what, to) \
......
151 146
static inline void end_check_do_log(const char *domain) {
152 147
	g_log_remove_handler(domain ? domain : LASSO_LOG_DOMAIN, checking_log_handler);
153 148
	checking_log_handler = 0;
154
	fail_unless(checking_log_handler_flag, "Logging failure: expected log level %d and message «%s», got %d and «%s»",
149
	ck_assert_msg(checking_log_handler_flag, "Logging failure: expected log level %d and message «%s», got %d and «%s»",
155 150
			checking_logger_user_data.log_levels[0],
156 151
			checking_logger_user_data.messages[0],
157 152
			checking_logger_user_data.log_level_found,
158
-