Index: trunk/psLib/test/collections/tst_psMetadataIO.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadataIO.c (revision 4203) +++ trunk/psLib/test/collections/tst_psMetadataIO.c (revision 4209) @@ -13,6 +13,6 @@ * @author Eric Van Alst, MHPCC * - * @version $Revision: 1.18 $ $Name: not supported by cvs2svn $ - * @date $Date: 2005-06-04 02:59:56 $ + * @version $Revision: 1.19 $ $Name: not supported by cvs2svn $ + * @date $Date: 2005-06-10 18:09:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -31,9 +31,9 @@ testDescription tests[] = { - {testMetadataParseConfig,000,"psMetadataParseConfig",0,false}, - {testMetadataParseConfig1,000,"psMetadataParseConfig",0,false}, - {testMetadataParseConfig2,000,"psMetadataParseConfig",0,false}, - {testMetadataParseConfig3,000,"psMetadataParseConfig",0,false}, - {testMetadataParseConfig4,000,"psMetadataParseConfig",0,false}, + {testMetadataParseConfig,000,"psMetadataConfigParse",0,false}, + {testMetadataParseConfig1,000,"psMetadataConfigParse",0,false}, + {testMetadataParseConfig2,000,"psMetadataConfigParse",0,false}, + {testMetadataParseConfig3,000,"psMetadataConfigParse",0,false}, + {testMetadataParseConfig4,000,"psMetadataConfigParse",0,false}, {NULL} }; @@ -474,5 +474,5 @@ psLogSetLevel(PS_LOG_INFO); - if( !runTestSuite(stderr,"psMetadataParseConfig",tests,argc,argv)) { + if( !runTestSuite(stderr,"psMetadataConfigParse",tests,argc,argv)) { return 1; } @@ -493,5 +493,5 @@ // Read config file test1.config with overwrite set true - metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig1,true); + metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig1,true); // Verify the expected number of failed lines if(!checkFailedLines(failedLines,testConfig1FailsOverwrite,(char*)testConfig1)) { @@ -923,5 +923,5 @@ // This file contains parse errors psLogMsg(__func__,PS_LOG_INFO,"Following should generate parse error message"); - metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig2,true); + metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig2,true); // Verify the expected number of failed lines if(!checkFailedLines(failedLines,testConfig2Fails,(char*)testConfig2)) { @@ -937,5 +937,5 @@ // Attempt parse a non-existant file psLogMsg(__func__,PS_LOG_INFO,"Following should generate error message"); - metadata1 = psMetadataParseConfig(metadata1,&failedLines,"ab.config",true); + metadata1 = psMetadataConfigParse(metadata1,&failedLines,"ab.config",true); if(metadata1 != NULL) { psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for non-existant file"); @@ -945,5 +945,5 @@ // Attempt parse with NULL failed lines ptr psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL failed lines arg"); - metadata1 = psMetadataParseConfig(metadata1,NULL,testConfig2,true); + metadata1 = psMetadataConfigParse(metadata1,NULL,testConfig2,true); if(metadata1 != NULL) { psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for NULL failed lines argument"); @@ -953,5 +953,5 @@ // Attempt parse with NULL file name psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error message for NULL file name arg"); - metadata1 = psMetadataParseConfig(metadata1,&failedLines,NULL,true); + metadata1 = psMetadataConfigParse(metadata1,&failedLines,NULL,true); if(metadata1 != NULL) { psError(PS_ERR_UNKNOWN,true,"Expected a NULL return for NULL filename argument"); @@ -971,5 +971,5 @@ // Read config file test3.config with overwrite set false psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error of duplicate key names"); - metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig3,false); + metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig3,false); // Verify the expected number of failed lines if(!checkFailedLines(failedLines,testConfig3Fails,(char*)testConfig3)) { @@ -991,5 +991,5 @@ // Read config file test4.config with overwrite set false - metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig4,false); + metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig4,false); // Verify the expected number of failed lines if(!checkFailedLines(failedLines,testConfig4Fails,(char*)testConfig4)) { @@ -1010,5 +1010,5 @@ // Read config file test4.config with overwrite set false - metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig5,true); + metadata1 = psMetadataConfigParse(metadata1,&failedLines,testConfig5,true); // Verify the expected number of failed lines if(!checkFailedLines(failedLines,testConfig5Fails,(char*)testConfig5)) { Index: trunk/psLib/test/collections/tst_psMetadata_07.c =================================================================== --- trunk/psLib/test/collections/tst_psMetadata_07.c (revision 4203) +++ trunk/psLib/test/collections/tst_psMetadata_07.c (revision 4209) @@ -9,6 +9,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ -* @date $Date: 2005-04-07 20:27:41 $ +* @version $Revision: 1.11 $ $Name: not supported by cvs2svn $ +* @date $Date: 2005-06-10 18:09:12 $ * * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii @@ -26,7 +26,7 @@ psU32 nFail = 0; psMetadata *md = NULL; - md = psMetadataParseConfigXml(md, &nFail, XML_CONFIG_FILE, true); + md = psMetadataConfigParseXml(md, &nFail, XML_CONFIG_FILE, true); if (nFail != 0) { - printf("psMetadataParseConfigXml returned error %d\n", res); + printf("psMetadataConfigParseXml returned error %d\n", res); } Index: trunk/psLib/test/collections/verified/tst_psMetadataIO.stderr =================================================================== --- trunk/psLib/test/collections/verified/tst_psMetadataIO.stderr (revision 4203) +++ trunk/psLib/test/collections/verified/tst_psMetadataIO.stderr (revision 4209) @@ -1,5 +1,5 @@ /***************************** TESTPOINT ******************************************\ * TestFile: tst_psMetadataIO.c * -* TestPoint: psMetadataParseConfig{psMetadataParseConfig} * +* TestPoint: psMetadataConfigParse{psMetadataConfigParse} * * TestType: Positive * \**********************************************************************************/ @@ -8,9 +8,9 @@ Metadata item Float has been replaced ----> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c) +---> TESTPOINT PASSED (psMetadataConfigParse{psMetadataConfigParse} | tst_psMetadataIO.c) /***************************** TESTPOINT ******************************************\ * TestFile: tst_psMetadataIO.c * -* TestPoint: psMetadataParseConfig{psMetadataParseConfig} * +* TestPoint: psMetadataConfigParse{psMetadataConfigParse} * * TestType: Positive * \**********************************************************************************/ @@ -56,20 +56,20 @@