From 99ae986364d6bd4a46c94100c2c33d3bc9ebf3c1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20P=C3=ADsa=C5=99?= Date: Fri, 1 Nov 2013 15:44:14 +0100 Subject: [PATCH] test: Use TEST_TMPTR_DUPLICTY to test birthday structures --- test/offline/isds_DbOwnerInfo_duplicate.c | 20 +------------------- test/offline/isds_DbUserInfo_duplicate.c | 16 +--------------- 2 files changed, 2 insertions(+), 34 deletions(-) diff --git a/test/offline/isds_DbOwnerInfo_duplicate.c b/test/offline/isds_DbOwnerInfo_duplicate.c index 23a024c..6a8a2c1 100644 --- a/test/offline/isds_DbOwnerInfo_duplicate.c +++ b/test/offline/isds_DbOwnerInfo_duplicate.c @@ -36,26 +36,8 @@ static int test_isds_DbOwnerInfo_duplicate(struct isds_DbOwnerInfo *origin) { /* Birth of person */ TEST_POINTER_DUPLICITY(origin->birthInfo, copy->birthInfo); if(origin->birthInfo && copy->birthInfo) { - TEST_POINTER_DUPLICITY(origin->birthInfo->biDate, + TEST_TMPTR_DUPLICITY(origin->birthInfo->biDate, copy->birthInfo->biDate); - if(origin->birthInfo->biDate && copy->birthInfo->biDate) { - if (origin->birthInfo->biDate->tm_year != - copy->birthInfo->biDate->tm_year) - FAIL_TEST("biDate differs in tm_year: expected=%d, got=%d", - origin->birthInfo->biDate->tm_year, - copy->birthInfo->biDate->tm_year); - if (origin->birthInfo->biDate->tm_mon != - copy->birthInfo->biDate->tm_mon) - FAIL_TEST("biDate differs in tm_mon: expected=%d, got=%d", - origin->birthInfo->biDate->tm_mon, - copy->birthInfo->biDate->tm_mon); - if (origin->birthInfo->biDate->tm_mday != - copy->birthInfo->biDate->tm_mday) - FAIL_TEST("biDate differs in tm_mday: expected=%d, got=%d", - origin->birthInfo->biDate->tm_mday, - copy->birthInfo->biDate->tm_mday); - } - TEST_STRING_DUPLICITY(origin->birthInfo->biCity, copy->birthInfo->biCity); TEST_STRING_DUPLICITY(origin->birthInfo->biCounty, diff --git a/test/offline/isds_DbUserInfo_duplicate.c b/test/offline/isds_DbUserInfo_duplicate.c index ada2233..eea26ad 100644 --- a/test/offline/isds_DbUserInfo_duplicate.c +++ b/test/offline/isds_DbUserInfo_duplicate.c @@ -50,21 +50,7 @@ static int test_isds_DbUserInfo_duplicate(struct isds_DbUserInfo *origin) { copy->address->adState); } - /* Date of birth */ - TEST_POINTER_DUPLICITY(origin->biDate, - copy->biDate); - if(origin->biDate && copy->biDate) { - if (origin->biDate->tm_year != copy->biDate->tm_year) - FAIL_TEST("biDate differs in tm_year: expected=%d, got=%d", - origin->biDate->tm_year, copy->biDate->tm_year); - if (origin->biDate->tm_mon != copy->biDate->tm_mon) - FAIL_TEST("biDate differs in tm_mon: expected=%d, got=%d", - origin->biDate->tm_mon, copy->biDate->tm_mon); - if (origin->biDate->tm_mday != copy->biDate->tm_mday) - FAIL_TEST("biDate differs in tm_mday: expected=%d, got=%d", - origin->biDate->tm_mday, copy->biDate->tm_mday); - } - + TEST_TMPTR_DUPLICITY(origin->biDate, copy->biDate); TEST_INTPTR_DUPLICITY(origin->ic, copy->ic); TEST_INTPTR_DUPLICITY(origin->firmName, copy->firmName); TEST_INTPTR_DUPLICITY(origin->caStreet, copy->caStreet); -- 2.11.4.GIT