Changeset 3952
- Timestamp:
- May 16, 2005, 12:19:49 PM (21 years ago)
- Location:
- trunk/psLib/test/collections
- Files:
-
- 2 added
- 3 edited
-
test4.config (added)
-
test5.config (added)
-
tst_psMetadataIO.c (modified) (7 diffs)
-
verified/tst_psMetadataIO.stderr (modified) (1 diff)
-
verified/tst_psMetadataIO.stdout (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/test/collections/tst_psMetadataIO.c
r3945 r3952 13 13 * @author Eric Van Alst, MHPCC 14 14 * 15 * @version $Revision: 1.1 5$ $Name: not supported by cvs2svn $16 * @date $Date: 2005-05-16 19:41:40$15 * @version $Revision: 1.16 $ $Name: not supported by cvs2svn $ 16 * @date $Date: 2005-05-16 22:19:15 $ 17 17 * 18 18 * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii … … 27 27 static psS32 testMetadataParseConfig1(void); 28 28 static psS32 testMetadataParseConfig2(void); 29 static psS32 testMetadataParseConfig3(void); 30 static psS32 testMetadataParseConfig4(void); 29 31 30 32 testDescription tests[] = { … … 32 34 {testMetadataParseConfig1,000,"psMetadataParseConfig",0,false}, 33 35 {testMetadataParseConfig2,000,"psMetadataParseConfig",0,false}, 36 {testMetadataParseConfig3,000,"psMetadataParseConfig",0,false}, 37 {testMetadataParseConfig4,000,"psMetadataParseConfig",0,false}, 34 38 {NULL} 35 39 }; … … 46 50 47 51 #define ERROR_TOL 0.0001 52 53 const char testConfig5[] = "test5.config"; 54 const psS32 testConfig5Fails = 7; 55 56 const char testConfig4[] = "test4.config"; 57 const psS32 testConfig4Fails = 0; 48 58 49 59 const char testConfig3[] = "test3.config"; … … 378 388 case PS_META_META: 379 389 printf("%s%-25s METADATA\n",indentStr,metadataItem->name); 380 writeMetadata((psMetadata*)metadataItem->data.md," "); 390 char nestedStr[256] = " "; 391 strcat(nestedStr,indentStr); 392 writeMetadata((psMetadata*)metadataItem->data.md,nestedStr); 393 printf("%sEND",indentStr); 381 394 break; 382 395 default: … … 955 968 psS32 failedLines = 0; 956 969 957 // Read config file test 1.config with overwrite set false970 // Read config file test3.config with overwrite set false 958 971 psLogMsg(__func__,PS_LOG_INFO,"Following should generate an error of duplicate key names"); 959 972 metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig3,false); … … 971 984 } 972 985 986 psS32 testMetadataParseConfig3(void) 987 { 988 psMetadata* metadata1 = NULL; 989 psS32 failedLines = 0; 990 991 // Read config file test4.config with overwrite set false 992 metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig4,false); 993 // Verify the expected number of failed lines 994 if(!checkFailedLines(failedLines,testConfig4Fails,(char*)testConfig4)) { 995 return 1; 996 } 997 // Print out metadata items for comparison against STDERR verified file 998 writeMetadata(metadata1,""); 999 1000 psFree(metadata1); 1001 1002 return 0; 1003 } 1004 1005 psS32 testMetadataParseConfig4(void) 1006 { 1007 psMetadata* metadata1 = NULL; 1008 psS32 failedLines = 0; 1009 1010 // Read config file test4.config with overwrite set false 1011 metadata1 = psMetadataParseConfig(metadata1,&failedLines,testConfig5,true); 1012 // Verify the expected number of failed lines 1013 if(!checkFailedLines(failedLines,testConfig5Fails,(char*)testConfig5)) { 1014 return 1; 1015 } 1016 psFree(metadata1); 1017 1018 return 0; 1019 } 1020 -
trunk/psLib/test/collections/verified/tst_psMetadataIO.stderr
r3945 r3952 84 84 ---> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c) 85 85 86 /***************************** TESTPOINT ******************************************\ 87 * TestFile: tst_psMetadataIO.c * 88 * TestPoint: psMetadataParseConfig{psMetadataParseConfig} * 89 * TestType: Positive * 90 \**********************************************************************************/ 91 92 <DATE><TIME>|<HOST>|E|psStringNCopy (FILE:LINENO) 93 Can not copy a negative number of characters (-9). 94 95 ---> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c) 96 97 /***************************** TESTPOINT ******************************************\ 98 * TestFile: tst_psMetadataIO.c * 99 * TestPoint: psMetadataParseConfig{psMetadataParseConfig} * 100 * TestType: Positive * 101 \**********************************************************************************/ 102 103 <DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO) 104 Metadata type 'CELL', found on line 6 of test5.config, is not invalid. 105 <DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO) 106 Metadata type 'CELL2', found on line 12 of test5.config, is not invalid. 107 <DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO) 108 Metadata type 'CELL3', found on line 18 of test5.config, is not invalid. 109 <DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO) 110 Failed to read a metadata CELL.00 on line 22 of test5.config. 111 <DATE><TIME>|<HOST>|E|parseLine (FILE:LINENO) 112 Specified type, CELL5, on line 26 of test5.config is already defined. 113 <DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO) 114 Metadata type 'CELL6', found on line 30 of test5.config, is not invalid. 115 <DATE><TIME>|<HOST>|E|parseMetadataItem (FILE:LINENO) 116 Metadata type 'CELL6', found on line 31 of test5.config, is not invalid. 117 118 ---> TESTPOINT PASSED (psMetadataParseConfig{psMetadataParseConfig} | tst_psMetadataIO.c) 119 -
trunk/psLib/test/collections/verified/tst_psMetadataIO.stdout
r3945 r3952 24 24 BIASSEC STR BSEC-00 25 25 CHIP STR CHIP.00 26 26 END 27 27 CELL.01 METADATA 28 28 EXTNAME STR CCD01 29 29 BIASSEC STR BSEC-01 30 30 CHIP STR CHIP.00 31 31 END 32 32 MYCELL MULTI 33 33 MYCELL METADATA … … 36 36 CHIP STR CHIP.00 37 37 NCELL S32 24 38 38 END 39 39 MYCELL S32 123 # A number 40 40 cell METADATA 41 41 foo METADATA 42 bar STR BAZ43 ping STR PONG44 42 bar STR BAZ 43 ping STR PONG 44 END 45 45 EXTNAME STR CCD00 46 46 BIASSEC STR BSEC-00 47 47 CHIP STR CHIP.00 48 48 NCELL S32 12 49 49 END 50 CELL1 METADATA 51 EXTNAME STR CCD00 52 BIASSEC STR BSEC-00 53 CHIP STR CHIP.00 54 NCELL S32 24 55 END 56 CELL2 METADATA 57 FOO METADATA 58 BAR STR BAZ 59 PING STR PONG 60 END 61 EXTNAME STR CCD00 62 BIASSEC STR BSEC-00 63 CHIP STR CHIP.00 64 NCELL S32 24 65 END 66 FOO1 METADATA 67 FOO2 METADATA 68 FOO3 METADATA 69 FOO4 METADATA 70 FOO5 METADATA 71 FOO6 METADATA 72 BAR STR BAZ 73 PING STR PONG 74 END 75 BAR STR BAZ 76 PING STR PONG 77 END 78 BAR STR BAZ 79 PING STR PONG 80 END 81 BAR STR BAZ 82 PING STR PONG 83 END 84 BAR STR BAZ 85 PING STR PONG 86 END 87 BAR STR BAZ 88 PING STR PONG 89 END 90 FOO2 METADATA 91 BAR STR BAZ 92 PING STR PONG 93 FOO3 METADATA 94 BAR STR BAZ 95 PING STR PONG 96 FOO4 METADATA 97 BAR STR BAZ 98 PING STR PONG 99 FOO5 METADATA 100 BAR STR BAZ 101 PING STR PONG 102 FOO6 METADATA 103 BAR STR BAZ 104 PING STR PONG 105 FOO7 METADATA 106 BAR STR BAZ 107 PING STR PONG 108 END 109 END 110 END 111 END 112 END 113 END 114 FOO3 METADATA 115 BAR STR BAZ 116 FOO4 METADATA 117 BAR STR BAZ 118 FOO5 METADATA 119 BAR STR BAZ 120 FOO6 METADATA 121 BAR STR BAZ 122 FOO7 METADATA 123 BAR STR BAZ 124 FOO8 METADATA 125 BAR STR BAZ 126 PING STR PONG 127 END 128 PING STR PONG 129 END 130 PING STR PONG 131 END 132 PING STR PONG 133 END 134 PING STR PONG 135 END 136 PING STR PONG 137 END 138 FOO4 METADATA 139 FOO5 METADATA 140 BAR STR BAZ 141 PING STR PONG 142 END 143 FOO6 METADATA 144 BAR STR BAZ 145 PING STR PONG 146 END 147 END 148 CELL.00 METADATA 149 EXTNAME STR CCD00 150 BIASSEC STR BSEC-00 151 CHIP STR CHIP.00 152 END 153 CELL.01 METADATA 154 EXTNAME STR CCD01 155 BIASSEC STR BSEC-01 156 CHIP STR CHIP.00 157 END 158 FOO5 METADATA 159 CELL.00 METADATA 160 EXTNAME STR CCD00 161 BIASSEC STR BSEC-00 162 END 163 CELL.01 METADATA 164 EXTNAME STR CCD01 165 BIASSEC STR BSEC-01 166 END 167 FOO6 METADATA 168 CELL.00 METADATA 169 EXTNAME STR CCD00 170 END 171 CELL.01 METADATA 172 EXTNAME STR CCD01 173 END 174 END 175 END 176 foo MULTI 177 foo S32 -1 178 foo STR bar baz 179 foo BOOL 1 180 foo1 MULTI 181 foo1 S32 -1 # bar 182 foo1 STR bar baz # baz 183 foo1 BOOL 1 184 foo2 MULTI 185 foo2 S32 -1 186 foo2 STR bar baz 187 foo2 BOOL 1 188 bar1 METADATA 189 foo MULTI 190 foo S32 -1 191 foo STR bar baz 192 foo BOOL 1 193 END 194 foo3 MULTI 195 foo3 METADATA 196 bar BOOL 1 197 END 198 foo3 METADATA 199 bar BOOL 1 200 END 201 foo4 MULTI 202 foo4 METADATA 203 a STR x 204 b STR y 205 c STR z 206 END 207 foo4 METADATA 208 a STR x 209 b STR y 210 c STR z 211 END 212 foo5 MULTI 213 foo5 METADATA 214 a STR x 215 b STR y 216 c STR z 217 END 218 foo5 METADATA 219 a STR x 220 b STR y 221 c STR z 222 END
Note:
See TracChangeset
for help on using the changeset viewer.
