From 7837fa967d2332642eb2020d07d56a39afd73dea Mon Sep 17 00:00:00 2001 From: Romain Tartiere Date: Fri, 24 Dec 2010 13:59:28 +0000 Subject: [PATCH] Freshen out cut_assert_success() macro. --- test/test_mifare_desfire.c | 5 ++--- test/test_mifare_desfire_ev1.c | 5 ++--- test/test_mifare_desfire_ev1_3des.c | 5 ++--- test/test_mifare_desfire_ev1_3k3des.c | 5 ++--- test/test_mifare_desfire_ev1_aes.c | 5 ++--- 5 files changed, 10 insertions(+), 15 deletions(-) diff --git a/test/test_mifare_desfire.c b/test/test_mifare_desfire.c index 7d9630a..b865edb 100644 --- a/test/test_mifare_desfire.c +++ b/test/test_mifare_desfire.c @@ -30,9 +30,8 @@ #define cut_assert_success(last_command) \ do { \ - if ((res < 0) || (mifare_desfire_last_picc_error (tag) != OPERATION_OK)) { \ - cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)), strerror (errno)); \ - } \ + cut_assert_equal_int (OPERATION_OK, mifare_desfire_last_picc_error (tag), cut_message ("PICC replied %s", mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)))); \ + cut_assert_not_equal_int (-1, res, cut_message ("Wrong return value")); \ } while (0) void diff --git a/test/test_mifare_desfire_ev1.c b/test/test_mifare_desfire_ev1.c index af0291b..e370081 100644 --- a/test/test_mifare_desfire_ev1.c +++ b/test/test_mifare_desfire_ev1.c @@ -30,9 +30,8 @@ #define cut_assert_success(last_command) \ do { \ - if ((res < 0) || (MIFARE_DESFIRE (tag)->last_picc_error != OPERATION_OK)) { \ - cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, mifare_desfire_error_lookup (MIFARE_DESFIRE (tag)->last_picc_error), strerror (errno)); \ - } \ + cut_assert_equal_int (OPERATION_OK, mifare_desfire_last_picc_error (tag), cut_message ("PICC replied %s", mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)))); \ + cut_assert_not_equal_int (-1, res, cut_message ("Wrong return value")); \ } while (0) void diff --git a/test/test_mifare_desfire_ev1_3des.c b/test/test_mifare_desfire_ev1_3des.c index 62a49cc..b98a880 100644 --- a/test/test_mifare_desfire_ev1_3des.c +++ b/test/test_mifare_desfire_ev1_3des.c @@ -30,9 +30,8 @@ #define cut_assert_success(last_command) \ do { \ - if ((res < 0) || (mifare_desfire_last_picc_error (tag) != OPERATION_OK)) { \ - cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)), strerror (errno)); \ - } \ + cut_assert_equal_int (OPERATION_OK, mifare_desfire_last_picc_error (tag), cut_message ("PICC replied %s", mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)))); \ + cut_assert_not_equal_int (-1, res, cut_message ("Wrong return value")); \ } while (0) void diff --git a/test/test_mifare_desfire_ev1_3k3des.c b/test/test_mifare_desfire_ev1_3k3des.c index 568ebd9..566ca52 100644 --- a/test/test_mifare_desfire_ev1_3k3des.c +++ b/test/test_mifare_desfire_ev1_3k3des.c @@ -30,9 +30,8 @@ #define cut_assert_success(last_command) \ do { \ - if ((res < 0) || (mifare_desfire_last_picc_error (tag) != OPERATION_OK)) { \ - cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)), strerror (errno)); \ - } \ + cut_assert_equal_int (OPERATION_OK, mifare_desfire_last_picc_error (tag), cut_message ("PICC replied %s", mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)))); \ + cut_assert_not_equal_int (-1, res, cut_message ("Wrong return value")); \ } while (0) void diff --git a/test/test_mifare_desfire_ev1_aes.c b/test/test_mifare_desfire_ev1_aes.c index 09ce53b..1435ca5 100644 --- a/test/test_mifare_desfire_ev1_aes.c +++ b/test/test_mifare_desfire_ev1_aes.c @@ -30,9 +30,8 @@ #define cut_assert_success(last_command) \ do { \ - if ((res < 0) || (mifare_desfire_last_picc_error (tag) != OPERATION_OK)) { \ - cut_fail ("%s returned %d, error: %s, errno: %s\n", last_command, res, mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)), strerror (errno)); \ - } \ + cut_assert_equal_int (OPERATION_OK, mifare_desfire_last_picc_error (tag), cut_message ("PICC replied %s", mifare_desfire_error_lookup (mifare_desfire_last_picc_error (tag)))); \ + cut_assert_not_equal_int (-1, res, cut_message ("Wrong return value")); \ } while (0) void