[cig-commits] commit: Updated XML_IO_Handler to have a NULL check on the rootElement
Mercurial
hg at geodynamics.org
Mon Feb 1 15:32:42 PST 2010
changeset: 723:72d967c58cb4
branch: pcu_rejig
parent: 720:87c8b44767b3
user: JericoRevote
date: Wed Dec 09 21:13:08 2009 +1100
files: Base/IO/src/IO_Handler.h Base/IO/src/Journal.c Base/IO/src/XML_IO_Handler.c Base/IO/src/XML_IO_Handler.h Base/IO/tests/IO_HandlerSuite.c Base/IO/tests/expected/errorMsg-Invalid.txt
description:
Updated XML_IO_Handler to have a NULL check on the rootElement
as this is somehow getting bypassed on optimised mode.
diff -r 87c8b44767b3 -r 72d967c58cb4 Base/IO/src/IO_Handler.h
--- a/Base/IO/src/IO_Handler.h Wed Dec 09 11:51:56 2009 +1100
+++ b/Base/IO/src/IO_Handler.h Wed Dec 09 21:13:08 2009 +1100
@@ -45,8 +45,7 @@
typedef void (IO_Handler_DeleteFunction) (void* io_handler);
typedef void (IO_Handler_PrintFunction) (void* io_handler);
typedef Bool (IO_Handler_ReadAllFromFileFunction) (void* io_handler, const char* filename, Dictionary* dictionary );
- typedef Bool (IO_Handler_ReadAllFromFileForceSourceFunction) (void* io_handler, const char* filename,
- Dictionary* dictionary );
+ typedef Bool (IO_Handler_ReadAllFromFileForceSourceFunction) (void* io_handler, const char* filename, Dictionary* dictionary );
typedef Bool (IO_Handler_ReadAllFromBufferFunction) (void* io_handler, const char* buffer, Dictionary* dictionary );
typedef Bool (IO_Handler_WriteAllToFileFunction) (void* io_handler, const char* filename, Dictionary* dictionary );
typedef Bool (IO_Handler_DictSetAddValueFunction)
@@ -67,17 +66,17 @@
__Stg_Class \
\
/* Virtual info */ \
- IO_Handler_ReadAllFromFileFunction* _readAllFromFile; \
+ IO_Handler_ReadAllFromFileFunction* _readAllFromFile; \
IO_Handler_ReadAllFromFileForceSourceFunction* _readAllFromFileForceSource; \
- IO_Handler_ReadAllFromBufferFunction* _readAllFromBuffer; \
- IO_Handler_WriteAllToFileFunction* _writeAllToFile; \
+ IO_Handler_ReadAllFromBufferFunction* _readAllFromBuffer; \
+ IO_Handler_WriteAllToFileFunction* _writeAllToFile; \
\
/* IO_Handler info */ \
- Dictionary* currDictionary; \
- char* resource; \
- char* currPath; \
- char* schema; \
- int validate;
+ Dictionary* currDictionary; \
+ char* resource; \
+ char* currPath; \
+ char* schema; \
+ int validate;
struct _IO_Handler { __IO_Handler };
/* No "IO_Handler_New" and "IO_Handler_Init" as this is an abstract class */
diff -r 87c8b44767b3 -r 72d967c58cb4 Base/IO/src/Journal.c
--- a/Base/IO/src/Journal.c Wed Dec 09 11:51:56 2009 +1100
+++ b/Base/IO/src/Journal.c Wed Dec 09 21:13:08 2009 +1100
@@ -608,7 +608,9 @@ int Journal_Firewall( int expression, vo
if ( stJournal->firewallProducesAssert == True ) {
/* Use pcu_assert, so that StGermain PCU tests can check that a Firewall
* is correctly produced. */
- pcu_assert( expression );
+ #ifndef NDEBUG
+ pcu_assert( expression );
+ #endif
}
else {
/* TODO: Don't use FAILURE until Pat beef's up the test scripts to do .error checks
diff -r 87c8b44767b3 -r 72d967c58cb4 Base/IO/src/XML_IO_Handler.c
--- a/Base/IO/src/XML_IO_Handler.c Wed Dec 09 11:51:56 2009 +1100
+++ b/Base/IO/src/XML_IO_Handler.c Wed Dec 09 21:13:08 2009 +1100
@@ -525,11 +525,6 @@ void _XML_IO_Handler_AddSearchPath( void
self->searchPaths[ self->searchPathsSize - 1 ] = StG_Strdup( path );
}
-
-
-
-
-
/** Read all parameters from a file implementation. See IO_Handler_ReadAllFromFile(). It will first check if the file
* exists, and contains valid XML. */
Bool _XML_IO_Handler_ReadAllFromFile( void* xml_io_handler, const char* filename, Dictionary* dictionary ) {
@@ -604,8 +599,6 @@ Bool _XML_IO_Handler_ReadAllFromFile( vo
_XML_IO_Handler_AddSearchPath( self, STG_INCLUDE_PATH );
#endif
-
-
/* open the file and check syntax */
if ( !(rootElement = _XML_IO_Handler_OpenCheckFile( self, filename )) ) {
return False;
@@ -618,7 +611,8 @@ Bool _XML_IO_Handler_ReadAllFromFile( vo
_XML_IO_Handler_ParseNodes( self, firstElement, NULL, IO_Handler_DefaultMergeType, NULL );
/* free memory */
- xmlFreeDoc( self->currDoc );
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
xmlCleanupParser();
return True;
@@ -658,7 +652,8 @@ Bool _XML_IO_Handler_ReadAllFromFileForc
_XML_IO_Handler_ParseNodes( self, firstElement, NULL, Dictionary_MergeType_Replace, (char*) rootElement->doc->URL );
/* free memory */
- xmlFreeDoc( self->currDoc );
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
xmlCleanupParser();
return True;
@@ -683,7 +678,8 @@ Bool _XML_IO_Handler_ReadAllFromBuffer(
_XML_IO_Handler_ParseNodes( self, rootElement, NULL, Dictionary_MergeType_Replace, NULL );
/* free memory */
- xmlFreeDoc( self->currDoc );
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
xmlCleanupParser();
return True;
@@ -693,8 +689,9 @@ Bool _XML_IO_Handler_ReadAllFromBuffer(
* \return a pointer to the root node if the file is valid, NULL otherwise. */
static xmlNodePtr _XML_IO_Handler_OpenCheckFile( XML_IO_Handler* self, const char* filename )
{
- xmlChar absolute[1024];
- xmlNodePtr cur = NULL;
+ xmlChar absolute[1024];
+ xmlNodePtr cur = NULL;
+ Bool status = False;
if ( FindFileInPathList(
(char*)absolute,
@@ -711,12 +708,16 @@ static xmlNodePtr _XML_IO_Handler_OpenCh
filename );
cur = xmlDocGetRootElement( self->currDoc );
- Journal_Firewall( _XML_IO_Handler_Check( self, self->currDoc ),
+ status = _XML_IO_Handler_Check( self, self->currDoc );
+ Journal_Firewall( status == True,
Journal_Register( Error_Type, XML_IO_Handler_Type ),
"Error: File %s not valid/readable.\n",
filename );
- return cur;
+ if( status == True )
+ return cur;
+ else
+ return NULL;
}
@@ -854,13 +855,15 @@ Bool _XML_IO_Handler_Check( XML_IO_Handl
Journal_Printf(
Journal_Register( Error_Type, XML_IO_Handler_Type ),
"Error: empty document. Not parsing.\n" );
- xmlFreeDoc( self->currDoc );
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
return False;
}
/* check the namespace */
- if( False == _XML_IO_Handler_CheckNameSpace( self, rootElement ) ) {
- xmlFreeDoc( self->currDoc );
+ if( _XML_IO_Handler_CheckNameSpace( self, rootElement ) == False ) {
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
return False;
}
@@ -872,7 +875,8 @@ Bool _XML_IO_Handler_Check( XML_IO_Handl
self->resource,
(const char*) rootElement->name,
ROOT_NODE_NAME );
- xmlFreeDoc( self->currDoc );
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
return False;
}
@@ -1789,7 +1793,8 @@ Bool _XML_IO_Handler_WriteAllToFile( voi
}
/* Memory_Free memory */
- xmlFreeDoc( self->currDoc );
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
/*xmlCleanupParser(); */
/* TODO if updating, xmlCleanupParser(); */
self->currDoc = NULL;
@@ -1860,16 +1865,16 @@ Bool _XML_IO_Handler_WriteEntryToFile( v
/* write result to file */
if ( 0 < (fileSize = xmlSaveFormatFile( filename, self->currDoc, 1 )) ) {
Journal_Printf( stream, "Writing dictionary entry %s to file %s successfully concluded.\n", name, filename );
- } else
- {
+ }
+ else {
Journal_Printf(
Journal_Register( Error_Type, XML_IO_Handler_Type ),
"Warning: failed to write dictionary entry %s to file %s.\n",
name,
filename );
}
-
- xmlFreeDoc( self->currDoc );
+ if( self->currDoc )
+ xmlFreeDoc( self->currDoc );
/*xmlCleanupParser();*/
/* TODO if updating, xmlCleanupParser(); */
self->currDoc = NULL;
diff -r 87c8b44767b3 -r 72d967c58cb4 Base/IO/src/XML_IO_Handler.h
--- a/Base/IO/src/XML_IO_Handler.h Wed Dec 09 11:51:56 2009 +1100
+++ b/Base/IO/src/XML_IO_Handler.h Wed Dec 09 21:13:08 2009 +1100
@@ -81,26 +81,26 @@
__IO_Handler \
\
/* Virtual info */ \
- XML_IO_Handler_WriteEntryToFileFunction* _writeEntryToFile; \
- XML_IO_Handler_SetListEncodingFunction* _setListEncoding; \
- XML_IO_Handler_SetWritingPrecisionFunction* _setWritingPrecision; \
+ XML_IO_Handler_WriteEntryToFileFunction* _writeEntryToFile; \
+ XML_IO_Handler_SetListEncodingFunction* _setListEncoding; \
+ XML_IO_Handler_SetWritingPrecisionFunction* _setWritingPrecision; \
XML_IO_Handler_SetWriteExplicitTypesFunction* _setWriteExplicitTypes; \
\
/* XML_IO_Handler */ \
- NameSpaceInfo* nameSpacesList; /**< Allows chain of namespaces. */\
- xmlDocPtr currDoc; \
- xmlNsPtr currNameSpace; \
- int tokeniserCalls; \
- ListEncoding listEncoding; \
- Stg_ObjectList* typeKeywords; /**< Maps strings to dictionary types. */\
- char* TYPE_KEYWORDS[Dictionary_Entry_Value_Num_Types + 1]; \
- unsigned int writingPrecision[Dictionary_Entry_Value_Num_Types + 1]; \
- unsigned int writingFieldWidth[Dictionary_Entry_Value_Num_Types + 1]; \
- unsigned int WRITING_FIELD_EXTRAS[Dictionary_Entry_Value_Num_Types + 1]; \
- Bool writeExplicitTypes; \
+ NameSpaceInfo* nameSpacesList; /**< Allows chain of namespaces. */\
+ xmlDocPtr currDoc; \
+ xmlNsPtr currNameSpace; \
+ int tokeniserCalls; \
+ ListEncoding listEncoding; \
+ Stg_ObjectList* typeKeywords; /**< Maps strings to dictionary types. */\
+ char* TYPE_KEYWORDS[Dictionary_Entry_Value_Num_Types + 1]; \
+ unsigned int writingPrecision[Dictionary_Entry_Value_Num_Types + 1]; \
+ unsigned int writingFieldWidth[Dictionary_Entry_Value_Num_Types + 1]; \
+ unsigned int WRITING_FIELD_EXTRAS[Dictionary_Entry_Value_Num_Types + 1]; \
+ Bool writeExplicitTypes; \
\
- unsigned searchPathsSize; \
- char** searchPaths;
+ unsigned searchPathsSize; \
+ char** searchPaths;
struct _XML_IO_Handler { __XML_IO_Handler };
@@ -114,18 +114,18 @@
#endif
#define XML_IO_HANDLER_DEFARGS \
- IO_HANDLER_DEFARGS, \
- XML_IO_Handler_WriteEntryToFileFunction* _writeEntryToFile, \
- XML_IO_Handler_SetListEncodingFunction* _setListEncoding, \
- XML_IO_Handler_SetWritingPrecisionFunction* _setWritingPrecision, \
- XML_IO_Handler_SetWriteExplicitTypesFunction* _setWriteExplicitTypes
+ IO_HANDLER_DEFARGS, \
+ XML_IO_Handler_WriteEntryToFileFunction* _writeEntryToFile, \
+ XML_IO_Handler_SetListEncodingFunction* _setListEncoding, \
+ XML_IO_Handler_SetWritingPrecisionFunction* _setWritingPrecision, \
+ XML_IO_Handler_SetWriteExplicitTypesFunction* _setWriteExplicitTypes
#define XML_IO_HANDLER_PASSARGS \
- IO_HANDLER_PASSARGS, \
- _writeEntryToFile, \
- _setListEncoding, \
- _setWritingPrecision, \
- _setWriteExplicitTypes
+ IO_HANDLER_PASSARGS, \
+ _writeEntryToFile, \
+ _setListEncoding, \
+ _setWritingPrecision, \
+ _setWriteExplicitTypes
XML_IO_Handler* _XML_IO_Handler_New( XML_IO_HANDLER_DEFARGS );
diff -r 87c8b44767b3 -r 72d967c58cb4 Base/IO/tests/IO_HandlerSuite.c
--- a/Base/IO/tests/IO_HandlerSuite.c Wed Dec 09 11:51:56 2009 +1100
+++ b/Base/IO/tests/IO_HandlerSuite.c Wed Dec 09 21:13:08 2009 +1100
@@ -61,18 +61,13 @@ typedef struct {
} IO_HandlerSuiteData;
-void _IO_HandlerSuite_CreateTestXMLFile( const char* testXMLFilename,
- const char* entriesString )
-{
+void _IO_HandlerSuite_CreateTestXMLFile( const char* testXMLFilename, const char* entriesString ) {
FILE* testFile = NULL;
testFile = fopen(testXMLFilename, "w");
- fwrite( IO_HandlerSuite_XMLStartString1, sizeof(char),
- strlen( IO_HandlerSuite_XMLStartString1 ), testFile );
- fwrite( IO_HandlerSuite_XMLStartString2, sizeof(char),
- strlen( IO_HandlerSuite_XMLStartString2 ), testFile );
+ fwrite( IO_HandlerSuite_XMLStartString1, sizeof(char), strlen( IO_HandlerSuite_XMLStartString1 ), testFile );
+ fwrite( IO_HandlerSuite_XMLStartString2, sizeof(char), strlen( IO_HandlerSuite_XMLStartString2 ), testFile );
fwrite( entriesString, sizeof(char), strlen( entriesString ), testFile );
- fwrite( IO_HandlerSuite_XMLEndString, sizeof(char),
- strlen( IO_HandlerSuite_XMLEndString ), testFile );
+ fwrite( IO_HandlerSuite_XMLEndString, sizeof(char), strlen( IO_HandlerSuite_XMLEndString ), testFile );
fclose( testFile );
}
@@ -124,10 +119,8 @@ void IO_HandlerSuite_TestWriteReadNormal
pcu_check_true( data->dict1->count == data->dict2->count );
if ( data->dict1->count == data->dict2->count ) {
for (ii=0; ii<data->dict1->count; ii++) {
- pcu_check_true( Dictionary_Entry_Compare( data->dict1->entryPtr[ii],
- data->dict2->entryPtr[ii]->key) );
- pcu_check_true( Dictionary_Entry_Value_Compare( data->dict1->entryPtr[ii]->value,
- data->dict2->entryPtr[ii]->value) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict1->entryPtr[ii], data->dict2->entryPtr[ii]->key) );
+ pcu_check_true( Dictionary_Entry_Value_Compare( data->dict1->entryPtr[ii]->value, data->dict2->entryPtr[ii]->value) );
}
}
@@ -148,10 +141,7 @@ void IO_HandlerSuite_TestWriteReadNormal
for (ii=0; ii<data->dict1->count; ii++) {
if (data->rank == 0) {
- XML_IO_Handler_WriteEntryToFile( data->io_handler, fileName,
- data->testDD->testKeys[ii],
- data->testDD->testValues[ii],
- NULL );
+ XML_IO_Handler_WriteEntryToFile( data->io_handler, fileName, data->testDD->testKeys[ii], data->testDD->testValues[ii], NULL );
}
for ( rank_I=0; rank_I< data->nProcs; rank_I++ ) {
@@ -163,10 +153,8 @@ void IO_HandlerSuite_TestWriteReadNormal
pcu_check_true( 1 == data->dict2->count );
if ( 1 == data->dict2->count ) {
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- data->testDD->testKeys[ii]) );
- pcu_check_true( Dictionary_Entry_Value_Compare( data->dict2->entryPtr[0]->value,
- data->testDD->testValues[ii] ) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], data->testDD->testKeys[ii]) );
+ pcu_check_true( Dictionary_Entry_Value_Compare( data->dict2->entryPtr[0]->value, data->testDD->testValues[ii] ) );
}
Dictionary_Empty( data->dict2 );
@@ -236,8 +224,7 @@ void IO_HandlerSuite_TestWriteExplicitTy
IO_Handler_WriteAllToFile( data->io_handler, testFilename, data->dict1 );
}
- explicitTypesExpectedFilename = Memory_Alloc_Array_Unnamed( char,
- pcu_filename_expectedLen( "explicitTypesExpected.xml" ));
+ explicitTypesExpectedFilename = Memory_Alloc_Array_Unnamed( char, pcu_filename_expectedLen( "explicitTypesExpected.xml" ));
pcu_filename_expected( "explicitTypesExpected.xml", explicitTypesExpectedFilename );
pcu_check_fileEq( testFilename, explicitTypesExpectedFilename );
@@ -258,8 +245,7 @@ void IO_HandlerSuite_TestReadWhitespaceE
Index rank_I;
if( data->rank==0 ) {
- Stg_asprintf( &whiteSpacesEntry, "<param name=\" %s \"> \t %s \n\t</param>\n",
- testKey, testValString );
+ Stg_asprintf( &whiteSpacesEntry, "<param name=\" %s \"> \t %s \n\t</param>\n", testKey, testValString );
_IO_HandlerSuite_CreateTestXMLFile( testFilename, whiteSpacesEntry );
Memory_Free( whiteSpacesEntry );
}
@@ -274,8 +260,7 @@ void IO_HandlerSuite_TestReadWhitespaceE
pcu_check_true( 1 == data->dict2->count );
if ( 1 == data->dict2->count ) {
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- (Dictionary_Entry_Key)testKey) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], (Dictionary_Entry_Key)testKey) );
pcu_check_streq( Dictionary_Entry_Value_AsString( data->dict2->entryPtr[0]->value ), testValString );
}
@@ -313,13 +298,11 @@ void IO_HandlerSuite_TestReadIncludedFil
char* searchPathLine = NULL;
char* includeLineSP = NULL;
- Stg_asprintf( &xmlEntry, "<param name=\"%s\">%s</param>\n",
- testKey, testValString );
+ Stg_asprintf( &xmlEntry, "<param name=\"%s\">%s</param>\n", testKey, testValString );
Stg_asprintf( &includeLine, "<include>%s</include>\n", testIncludedFilename );
Stg_asprintf( &searchPathLine, "<searchPath>%s</searchPath>\n", testSearchPathSubdir );
Stg_asprintf( &includeLineSP, "<include>%s</include>\n", testIncludedFilenameSP );
- Stg_asprintf( &xmlTestEntries, "%s%s%s%s", xmlEntry, includeLine, searchPathLine,
- includeLineSP );
+ Stg_asprintf( &xmlTestEntries, "%s%s%s%s", xmlEntry, includeLine, searchPathLine, includeLineSP );
_IO_HandlerSuite_CreateTestXMLFile( testFilename, xmlTestEntries );
Memory_Free( xmlEntry );
Memory_Free( includeLine );
@@ -349,14 +332,11 @@ void IO_HandlerSuite_TestReadIncludedFil
pcu_check_true( 3 == data->dict2->count );
if ( 3 == data->dict2->count ) {
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- (Dictionary_Entry_Key)testKey) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], (Dictionary_Entry_Key)testKey) );
pcu_check_streq( Dictionary_Entry_Value_AsString( data->dict2->entryPtr[0]->value ), testValString );
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[1],
- (Dictionary_Entry_Key)testKeyInc) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[1], (Dictionary_Entry_Key)testKeyInc) );
pcu_check_streq( Dictionary_Entry_Value_AsString( data->dict2->entryPtr[1]->value ), testValStringInc );
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[2],
- (Dictionary_Entry_Key)testKeyIncSP) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[2], (Dictionary_Entry_Key)testKeyIncSP) );
pcu_check_streq( Dictionary_Entry_Value_AsString( data->dict2->entryPtr[2]->value ), testValStringIncSP );
}
@@ -405,10 +385,8 @@ void IO_HandlerSuite_TestReadRawDataEntr
Bool boolVal = False;
pcu_check_true( 2 == data->dict2->count );
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- (Dictionary_Entry_Key)list1Name) );
- pcu_check_true( Dictionary_Entry_Value_Type_List ==
- data->dict2->entryPtr[0]->value->type );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], (Dictionary_Entry_Key)list1Name) );
+ pcu_check_true( Dictionary_Entry_Value_Type_List == data->dict2->entryPtr[0]->value->type );
for (ii=0; ii < list1EntryCount; ii++ ) {
dev = Dictionary_Entry_Value_GetElement( data->dict2->entryPtr[0]->value, ii );
intVal = Dictionary_Entry_Value_AsInt( Dictionary_Entry_Value_GetMember( dev, "0" ) );
@@ -493,10 +471,8 @@ void IO_HandlerSuite_TestReadAllFromComm
* separate files. */
pcu_check_true( data->dict1->count == data->dict2->count );
for (ii=0; ii<data->dict1->count; ii++) {
- pcu_check_true( Dictionary_Entry_Compare( data->dict1->entryPtr[ii],
- data->dict2->entryPtr[ii]->key) );
- pcu_check_true( Dictionary_Entry_Value_Compare( data->dict1->entryPtr[ii]->value,
- data->dict2->entryPtr[ii]->value) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict1->entryPtr[ii], data->dict2->entryPtr[ii]->key) );
+ pcu_check_true( Dictionary_Entry_Value_Compare( data->dict1->entryPtr[ii]->value, data->dict2->entryPtr[ii]->value) );
}
@@ -550,14 +526,12 @@ void IO_HandlerSuite_TestReadDuplicateEn
IO_Handler_ReadAllFromFile( data->io_handler, xmlTestFilename1, data->dict2 );
pcu_check_true( 1 == data->dict2->count );
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- (Dictionary_Entry_Key)struct1Name) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], (Dictionary_Entry_Key)struct1Name) );
structDev = data->dict2->entryPtr[0]->value;
pcu_check_true( Dictionary_Entry_Value_Type_Struct == structDev->type );
pcu_check_true( struct1_OrigParamCount == Dictionary_Entry_Value_GetCount( structDev ) );
for (ii=0; ii < struct1_OrigParamCount; ii++ ) {
- elementDev = Dictionary_Entry_Value_GetMember( structDev,
- (Dictionary_Entry_Key)paramNames2[ii] );
+ elementDev = Dictionary_Entry_Value_GetMember( structDev, (Dictionary_Entry_Key)paramNames2[ii] );
pcu_check_true( paramVals2[ii] == Dictionary_Entry_Value_AsUnsignedInt( elementDev ) );
}
Dictionary_Empty( data->dict2 );
@@ -568,25 +542,21 @@ void IO_HandlerSuite_TestReadDuplicateEn
pcu_check_true( 2 == data->dict2->count );
/* First entry should be unchanged */
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- (Dictionary_Entry_Key)struct1Name) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], (Dictionary_Entry_Key)struct1Name) );
structDev = data->dict2->entryPtr[0]->value;
pcu_check_true( Dictionary_Entry_Value_Type_Struct == structDev->type );
pcu_check_true( struct1_OrigParamCount == Dictionary_Entry_Value_GetCount( structDev ) );
for (ii=0; ii < struct1_OrigParamCount; ii++ ) {
- elementDev = Dictionary_Entry_Value_GetMember( structDev,
- (Dictionary_Entry_Key)paramNames[ii] );
+ elementDev = Dictionary_Entry_Value_GetMember( structDev, (Dictionary_Entry_Key)paramNames[ii] );
pcu_check_true( paramVals[ii] == Dictionary_Entry_Value_AsUnsignedInt( elementDev ) );
}
/* Second entry should be struct2 */
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[1],
- (Dictionary_Entry_Key)struct1Name) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[1], (Dictionary_Entry_Key)struct1Name) );
structDev = data->dict2->entryPtr[1]->value;
pcu_check_true( Dictionary_Entry_Value_Type_Struct == structDev->type );
pcu_check_true( struct1_OrigParamCount == Dictionary_Entry_Value_GetCount( structDev ) );
for (ii=0; ii < struct1_OrigParamCount; ii++ ) {
- elementDev = Dictionary_Entry_Value_GetMember( structDev,
- (Dictionary_Entry_Key)paramNames[ii] );
+ elementDev = Dictionary_Entry_Value_GetMember( structDev, (Dictionary_Entry_Key)paramNames[ii] );
pcu_check_true( paramVals2[ii] == Dictionary_Entry_Value_AsUnsignedInt( elementDev ) );
}
Dictionary_Empty( data->dict2 );
@@ -597,8 +567,7 @@ void IO_HandlerSuite_TestReadDuplicateEn
IO_Handler_ReadAllFromFile( data->io_handler, xmlTestFilename3_1, data->dict2 );
pcu_check_true( 1 == data->dict2->count );
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- (Dictionary_Entry_Key)struct1Name) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], (Dictionary_Entry_Key)struct1Name) );
structDev = data->dict2->entryPtr[0]->value;
structDict = structDev->as.typeStruct;
pcu_check_true( Dictionary_Entry_Value_Type_Struct == structDev->type );
@@ -623,8 +592,7 @@ void IO_HandlerSuite_TestReadDuplicateEn
IO_Handler_ReadAllFromFile( data->io_handler, xmlTestFilename3_2, data->dict2 );
pcu_check_true( 1 == data->dict2->count );
- pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0],
- (Dictionary_Entry_Key)struct1Name) );
+ pcu_check_true( Dictionary_Entry_Compare( data->dict2->entryPtr[0], (Dictionary_Entry_Key)struct1Name) );
structDev = data->dict2->entryPtr[0]->value;
structDict = structDev->as.typeStruct;
pcu_check_true( Dictionary_Entry_Value_Type_Struct == structDev->type );
@@ -655,13 +623,12 @@ void IO_HandlerSuite_TestReadNonExistent
Stream_ClearCustomFormatters( Journal_Register( Error_Type, XML_IO_Handler_Type ) );
if (0 == data->rank) {
- pcu_check_assert( IO_Handler_ReadAllFromFile( data->io_handler, notExistFilename, data->dict2 ) );
+ IO_Handler_ReadAllFromFile( data->io_handler, notExistFilename, data->dict2 );
errorFile = fopen( errorFilename, "r" );
pcu_check_true( errorFile );
pcu_check_true( fgets( errorLine, MAXLINE, errorFile ) );
- sprintf( expectedErrorMsg, "Error: File %s doesn't exist, not readable, or not valid.\n",
- notExistFilename );
+ sprintf( expectedErrorMsg, "Error: File %s doesn't exist, not readable, or not valid.\n", notExistFilename );
pcu_check_streq( errorLine, expectedErrorMsg );
remove( errorFilename );
}
@@ -680,7 +647,7 @@ void IO_HandlerSuite_TestReadInvalid( IO
Stream_ClearCustomFormatters( Journal_Register( Error_Type, XML_IO_Handler_Type ) );
if ( 0 == data->rank ) {
- pcu_check_assert( IO_Handler_ReadAllFromFile( data->io_handler, invalidXMLFilename, data->dict2 ) );
+ IO_Handler_ReadAllFromFile( data->io_handler, invalidXMLFilename, data->dict2 );
pcu_check_fileEq( errorFilename, expectedErrorFilename );
remove( errorFilename );
}
@@ -699,7 +666,7 @@ void IO_HandlerSuite_TestReadWrongNS( IO
Stream_ClearCustomFormatters( Journal_Register( Error_Type, XML_IO_Handler_Type ) );
if ( 0 == data->rank ) {
- pcu_check_assert( IO_Handler_ReadAllFromFile( data->io_handler, wrongNS_XMLFilename, data->dict2 ) );
+ IO_Handler_ReadAllFromFile( data->io_handler, wrongNS_XMLFilename, data->dict2 );
pcu_check_fileEq( errorFilename, expectedErrorFilename );
remove( errorFilename );
}
@@ -718,7 +685,7 @@ void IO_HandlerSuite_TestReadWrongRootNo
Stream_ClearCustomFormatters( Journal_Register( Error_Type, XML_IO_Handler_Type ) );
if ( 0 == data->rank ) {
- pcu_check_assert( IO_Handler_ReadAllFromFile( data->io_handler, wrongRootNode_XMLFilename, data->dict2 ) );
+ IO_Handler_ReadAllFromFile( data->io_handler, wrongRootNode_XMLFilename, data->dict2 );
pcu_check_fileEq( errorFilename, expectedErrorFilename );
remove( errorFilename );
}
diff -r 87c8b44767b3 -r 72d967c58cb4 Base/IO/tests/expected/errorMsg-Invalid.txt
--- a/Base/IO/tests/expected/errorMsg-Invalid.txt Wed Dec 09 11:51:56 2009 +1100
+++ b/Base/IO/tests/expected/errorMsg-Invalid.txt Wed Dec 09 21:13:08 2009 +1100
@@ -2,3 +2,5 @@
<invalid></param>
^
Error: File ./StGermain/Base/IO/input/Invalid.xml doesn't exist, not readable, or not valid.
+Error: empty document. Not parsing.
+Error: File ./StGermain/Base/IO/input/Invalid.xml not valid/readable.
More information about the CIG-COMMITS
mailing list