Index: /trunk/psLib/test/types/Makefile.am =================================================================== --- /trunk/psLib/test/types/Makefile.am (revision 10700) +++ /trunk/psLib/test/types/Makefile.am (revision 10701) @@ -31,5 +31,6 @@ tap_psLookupTable_all \ tap_psMetadataConfigWrite \ - tap_psMetadataConfig_output \ + tap_psMetadataConfigPrint \ + tap_psMetadataConfigFormat \ tap_psMetadataConfig_input \ tap_psHash_845 Index: /trunk/psLib/test/types/tap_psMetadataConfigFormat.c =================================================================== --- /trunk/psLib/test/types/tap_psMetadataConfigFormat.c (revision 10701) +++ /trunk/psLib/test/types/tap_psMetadataConfigFormat.c (revision 10701) @@ -0,0 +1,152 @@ +/** + * C Implementation: tap_psMetadataConfigFormat.c + * + * Description: Tests for psMetadataConfigFormat + * + * Author: dRob , (C) 2006 + * + * Copyright: See COPYING file that comes with this distribution + * + */ + +#include +#include + +#include "tap.h" +#include "pstap.h" + +int main(void) +{ + plan_tests(13); + + psMetadata *md = NULL; + psString out = NULL; + + //psString psMetadataConfigFormat(psMetadata *md); + + //Return NULL for NULL metadata input + { + out = psMetadataConfigFormat(md); + ok( out == NULL, + "psMetadataConfigFormat: return NULL for NULL metadata input."); + } + //Return NULL for empty metadata input + { + md = psMetadataAlloc(); + out = psMetadataConfigFormat(md); + ok( out == NULL, + "psMetadataConfigFormat: return NULL for empty metadata input."); + } + //Return NULL for metadata with missing hash table + { + psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", 0, "", 666); + psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", PS_META_DUPLICATE_OK, "", 665); + psHash *temp = md->hash; + md->hash = NULL; + out = psMetadataConfigFormat(md); + ok( out == NULL, + "psMetadataConfigFormat: return NULL for metadata with missing " + "hash table."); + md->hash = temp; + } + //Return NULL for metadata containing a psList + { + psList *list = psListAlloc(NULL); + psMetadataAddList(md, PS_LIST_HEAD, "new_list", 0, "", list); + out = psMetadataConfigFormat(md); + ok( out == NULL, + "psMetadataConfigFormat: return NULL for metadata containing a psList."); + psFree(list); + psFree(md); + } + //Return NULL for attempting to format vector with type = complex + { + psVector *vec = psVectorAlloc(60, PS_TYPE_C64); + for (int i = 0; i < 5; i++) + { + vec->data.C64[i] = i+1; + } + md = psMetadataAlloc(); + psMetadataAddVector(md, PS_LIST_TAIL, "vectorC64", 0, "", vec); + out = psMetadataConfigFormat(md); + ok( out == NULL, + "psMetadataConfigFormat: return NULL for metadata containing a " + "Complex vector."); + psFree(vec); + } + //Return NULL for attempting to format psTime with type = -1 + { + psFree(md); + md = psMetadataAlloc(); + psTime *time = psTimeAlloc(PS_TIME_TT); + time->type = -1; + psMetadataAddTime(md, PS_LIST_TAIL, "time", 0, "", time); + out = psMetadataConfigFormat(md); + ok( out == NULL, + "psMetadataConfigFormat: return NULL for metadata containing a " + "invalid time type."); + psFree(time); + } + //Return valid metadata for attempting to format NULL psTime metadataItem + { + psFree(md); + md = psMetadataAlloc(); + psTime *time = psTimeAlloc(PS_TIME_TT); + psMetadataAddTime(md, PS_LIST_HEAD, "time", 0, "", time); + psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD); + psFree(item->data.V); + item->data.V = NULL; + out = psMetadataConfigFormat(md); + ok( out != NULL, + "psMetadataConfigFormat: return valid metadata for metadata " + "containing a NULL time."); + char configTest[32]; + strncpy(configTest, "time TAI NULL", 31); + ok_strn(configTest, out, 31, + "psMetadataConfigFormat: return correct output string."); + psFree(time); + psFree(out); + out = NULL; + } + //Return valid metadata for attempting to format NULL psTime metadataItem + { + psFree(md); + md = psMetadataAlloc(); + psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", 0, NULL, 666); + psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", PS_META_DUPLICATE_OK, NULL, 665); + out = psMetadataConfigFormat(md); + ok( out != NULL, + "psMetadataConfigFormat: return valid metadata for metadata " + "containing a NULL time."); + char configTest[62]; + strncpy(configTest, "new_S32 MULTI\nnew_S32 S32 666", 61); + ok_strn(configTest, out, strlen(configTest), + "psMetadataConfigFormat: return correct output string."); + psFree(out); + out = NULL; + } + //Return valid metadata for attempting to format NULL psTime metadataItem + { + psFree(md); + md = psMetadataAlloc(); + psMetadataAddS32(md, PS_LIST_HEAD, "f32", 0, "f32_1", 666); + psMetadataAddS32(md, PS_LIST_TAIL, "f32", PS_META_DUPLICATE_OK, "f32_3", 666); + psMetadataAddS32(md, PS_LIST_TAIL, "f32", PS_META_DUPLICATE_OK, "f32_2", 665); + out = psMetadataConfigFormat(md); + ok( out != NULL, + "psMetadataConfigFormat: return valid metadata for metadata " + "containing a NULL time."); + char configTest[201]; + strncpy(configTest, + "f32 MULTI" + "\nf32 S32 666 # f32_1" + "\nf32 S32 666 # f32_3" + "\nf32 S32 665 # f32_2", 200); + ok_strn(configTest, out, strlen(configTest), + "psMetadataConfigFormat: return correct output string."); + psFree(out); + out = NULL; + } + + done(); +} Index: /trunk/psLib/test/types/tap_psMetadataConfigPrint.c =================================================================== --- /trunk/psLib/test/types/tap_psMetadataConfigPrint.c (revision 10701) +++ /trunk/psLib/test/types/tap_psMetadataConfigPrint.c (revision 10701) @@ -0,0 +1,107 @@ +/** + * C Implementation: tap_psMetadataConfig_output + * + * Description: Tests for psMetadataConfigPrint + * + * Author: dRob , (C) 2006 + * + * Copyright: See COPYING file that comes with this distribution + * + */ + +#include +#include + +#include "tap.h" +#include "pstap.h" + +int main(void) +{ + plan_tests(7); + + //Return false for NULL metadata input + { + FILE *openfile = fopen("mdcfg.prt", "w+"); + + ok(!psMetadataConfigPrint(openfile, NULL), + "return false for NULL metadata input."); + + fclose(openfile); + remove + ("mdcfg.prt"); + } + + //Return false for empty metadata input + { + FILE *openfile = fopen("mdcfg.prt", "w+"); + psMetadata *md = psMetadataAlloc(); + + ok(!psMetadataConfigPrint(openfile, md), + "return false for empty metadata input."); + + psFree(md); + fclose(openfile); + remove + ("mdcfg.prt"); + } + + //Return false for NULL file input + { + psMetadata *md = psMetadataAlloc(); + psMetadataAddS32(md, PS_LIST_HEAD, "new S32", 0, "", 666); + + ok(!psMetadataConfigPrint(NULL, md), + "return false for NULL FILE* input."); + + psFree(md); + } + + // Return false for read-only file input + { + // create an empty file to open read only later + { + FILE *openfile = fopen("mdcfg.prt", "w"); + fclose(openfile); + } + + FILE *openfile = fopen("mdcfg.prt", "r"); + psMetadata *md = psMetadataAlloc(); + psMetadataAddS32(md, PS_LIST_HEAD, "new S32", 0, "", 666); + + ok(!psMetadataConfigPrint(openfile, md), + "return false for read-only FILE* input."); + + psFree(md); + fclose(openfile); + remove + ("mdcfg.prt"); + } + + // Return true for valid inputs + { + FILE *openfile = fopen("mdcfg.prt", "w+"); + psMetadata *md = psMetadataAlloc(); + psMetadataAddS32(md, PS_LIST_HEAD, "new S32", 0, "", 666); + + ok(psMetadataConfigPrint(openfile, md), + "return true for valid inputs."); + + psFree(md); + fclose(openfile); + + char fileStr2[62]; + memset(fileStr2, '\0', 62); + FILE *mdcfg = fopen("mdcfg.prt", "r"); + + fread(fileStr2, 1, 31, mdcfg); + + ok_strn(fileStr2, "\nnew S32 S32 666 ", 30, + "return correct output."); + + fclose(mdcfg); + remove + ("mdcfg.prt"); + } + + done(); +} Index: unk/psLib/test/types/tap_psMetadataConfig_output.c =================================================================== --- /trunk/psLib/test/types/tap_psMetadataConfig_output.c (revision 10700) +++ (revision ) @@ -1,231 +1,0 @@ -/** - * C Implementation: tap_psMetadataConfig_output - * - * Description: Tests for psMetadataConfigPrint & psMetadataConfigFormat - * - * Author: dRob , (C) 2006 - * - * Copyright: See COPYING file that comes with this distribution - * - */ - -#include -#include - -#include "tap.h" -#include "pstap.h" - -static void testMetaConfigPrint(void); -static void testMetaConfigFormat(void); - -int main(void) -{ - plan_tests(19); - - diag("Tests for psMetadataConfig Output Functions"); - - testMetaConfigPrint(); - testMetaConfigFormat(); - - done(); -} - -void testMetaConfigPrint(void) -{ - diag(" >>>Test 2: psMetadataConfigPrint"); - FILE *openfile; - openfile = fopen("mdcfg.prt", "w+"); - FILE *nofile = NULL; - psMetadata *md = NULL; - md = psMetadataAlloc(); - - //Return false for NULL metadata input - { - ok( !psMetadataConfigPrint(openfile, NULL), - "psMetadataConfigPrint: return false for NULL metadata input."); - } - //Return false for empty metadata input - { - ok( !psMetadataConfigPrint(openfile, md), - "psMetadataConfigPrint: return false for empty metadata input."); - } - //Return false for NULL file input - psMetadataAddS32(md, PS_LIST_HEAD, "new S32", 0, "", 666); - { - ok( !psMetadataConfigPrint(nofile, md), - "psMetadataConfigPrint: return false for NULL FILE* input."); - } - //Return false for read-only file input - nofile = fopen("mdcfg.prt", "r"); - { - ok( !psMetadataConfigPrint(nofile, md), - "psMetadataConfigPrint: return false for read-only FILE* input."); - } - fclose(nofile); - //Return true for valid inputs - { - ok( psMetadataConfigPrint(openfile, md), - "psMetadataConfigPrint: return true for valid inputs."); - fclose(openfile); - char configTest[32]; - char fileStr2[62]; - FILE *mdcfg = fopen("mdcfg.prt", "r"); - fgets(fileStr2, 31, mdcfg); - while (strlen(fileStr2) < 10) - { - fgets(fileStr2, 31, mdcfg); - } - strncpy(configTest, - "new S32 S32 666 ", 31); - ok_strn(configTest, fileStr2, 30, - "psMetadataConfigWrite: return correct output."); - fclose(mdcfg); - } - - //Check for Memory leaks - { - psFree(md); - remove - ("mdcfg.prt"); - checkMem(); - } -} - -void testMetaConfigFormat(void) -{ - diag(" >>>Test 3: psMetadataConfigFormat"); - psMetadata *md = NULL; - psString out = NULL; - - //psString psMetadataConfigFormat(psMetadata *md); - - //Return NULL for NULL metadata input - { - out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for NULL metadata input."); - } - //Return NULL for empty metadata input - { - md = psMetadataAlloc(); - out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for empty metadata input."); - } - //Return NULL for metadata with missing hash table - { - psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", 0, "", 666); - psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", PS_META_DUPLICATE_OK, "", 665); - psHash *temp = md->hash; - md->hash = NULL; - out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for metadata with missing " - "hash table."); - md->hash = temp; - } - //Return NULL for metadata containing a psList - { - psList *list = psListAlloc(NULL); - psMetadataAddList(md, PS_LIST_HEAD, "new_list", 0, "", list); - out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for metadata containing a psList."); - psFree(list); - psFree(md); - } - //Return NULL for attempting to format vector with type = complex - { - psVector *vec = psVectorAlloc(60, PS_TYPE_C64); - for (int i = 0; i < 5; i++) - { - vec->data.C64[i] = i+1; - } - md = psMetadataAlloc(); - psMetadataAddVector(md, PS_LIST_TAIL, "vectorC64", 0, "", vec); - out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for metadata containing a " - "Complex vector."); - psFree(vec); - } - //Return NULL for attempting to format psTime with type = -1 - { - psFree(md); - md = psMetadataAlloc(); - psTime *time = psTimeAlloc(PS_TIME_TT); - time->type = -1; - psMetadataAddTime(md, PS_LIST_TAIL, "time", 0, "", time); - out = psMetadataConfigFormat(md); - ok( out == NULL, - "psMetadataConfigFormat: return NULL for metadata containing a " - "invalid time type."); - psFree(time); - } - //Return valid metadata for attempting to format NULL psTime metadataItem - { - psFree(md); - md = psMetadataAlloc(); - psTime *time = psTimeAlloc(PS_TIME_TT); - psMetadataAddTime(md, PS_LIST_HEAD, "time", 0, "", time); - psMetadataItem *item = psMetadataGet(md, PS_LIST_HEAD); - psFree(item->data.V); - item->data.V = NULL; - out = psMetadataConfigFormat(md); - ok( out != NULL, - "psMetadataConfigFormat: return valid metadata for metadata " - "containing a NULL time."); - char configTest[32]; - strncpy(configTest, "time TAI NULL", 31); - ok_strn(configTest, out, 31, - "psMetadataConfigFormat: return correct output string."); - psFree(time); - psFree(out); - out = NULL; - } - //Return valid metadata for attempting to format NULL psTime metadataItem - { - psFree(md); - md = psMetadataAlloc(); - psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", 0, NULL, 666); - psMetadataAddS32(md, PS_LIST_HEAD, "new_S32", PS_META_DUPLICATE_OK, NULL, 665); - out = psMetadataConfigFormat(md); - ok( out != NULL, - "psMetadataConfigFormat: return valid metadata for metadata " - "containing a NULL time."); - char configTest[62]; - strncpy(configTest, "new_S32 MULTI\nnew_S32 S32 666", 61); - ok_strn(configTest, out, strlen(configTest), - "psMetadataConfigFormat: return correct output string."); - psFree(out); - out = NULL; - } - //Return valid metadata for attempting to format NULL psTime metadataItem - { - psFree(md); - md = psMetadataAlloc(); - psMetadataAddS32(md, PS_LIST_HEAD, "f32", 0, "f32_1", 666); - psMetadataAddS32(md, PS_LIST_TAIL, "f32", PS_META_DUPLICATE_OK, "f32_3", 666); - psMetadataAddS32(md, PS_LIST_TAIL, "f32", PS_META_DUPLICATE_OK, "f32_2", 665); - out = psMetadataConfigFormat(md); - ok( out != NULL, - "psMetadataConfigFormat: return valid metadata for metadata " - "containing a NULL time."); - char configTest[201]; - strncpy(configTest, - "f32 MULTI" - "\nf32 S32 666 # f32_1" - "\nf32 S32 666 # f32_3" - "\nf32 S32 665 # f32_2", 200); - ok_strn(configTest, out, strlen(configTest), - "psMetadataConfigFormat: return correct output string."); - psFree(out); - out = NULL; - } - - //Check for Memory leaks - { - psFree(md); - checkMem(); - } -}