Changeset 2015
- Timestamp:
- Oct 7, 2004, 3:00:54 PM (22 years ago)
- Location:
- trunk/psLib/test
- Files:
-
- 4 edited
-
astronomy/tst_psMetadata_03.c (modified) (9 diffs)
-
astronomy/verified/tst_psMetadata_03.stderr (modified) (1 diff)
-
astronomy/verified/tst_psMetadata_03.stdout (modified) (1 diff)
-
collections/tst_psMetadata_03.c (modified) (9 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/psLib/test/astronomy/tst_psMetadata_03.c
r1843 r2015 14 14 * @author Ross Harman, MHPCC 15 15 * 16 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $17 * @date $Date: 2004- 09-21 23:24:42$16 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 17 * @date $Date: 2004-10-08 01:00:54 $ 18 18 * 19 19 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 66 66 psMetadataItem *item3 = NULL; 67 67 psMetadataItem *item4 = NULL; 68 psMetadataItem *errItem = NULL; 68 69 psMetadata *metadata = NULL; 69 70 psMetadata *errMetadata = NULL; 71 psHash *mdTable = NULL; 72 psList *mdList = NULL; 73 char *errName = NULL; 70 74 71 75 // Test A - Allocate metadata and items … … 76 80 item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); 77 81 item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); 82 errItem = psMetadataItemAlloc("errItem", PS_META_S32, "I am a integer", 99); 78 83 printMetadataItem(item1); 79 84 printMetadataItem(item2); … … 85 90 // Test B - Remove items from metadata by name 86 91 printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name"); 87 psMetadataAddItem(metadata, item1, PS_LIST_HEAD); 88 psMetadataAddItem(metadata, item2, PS_LIST_HEAD); 89 psMetadataRemove(metadata, 0, "myItem1" ); 90 psMetadataRemove(metadata, 0, "myItem2" ); 92 if( ! psMetadataAddItem(metadata, item1, PS_LIST_HEAD) ) { 93 psError(__func__,"psMetadataAddItem did not return true when adding by name."); 94 return 10; 95 } 96 if( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2",PS_META_S32,"I am S32 integer",77) ) { 97 psError(__func__,"psMetadataAddItem did not return true when adding by name."); 98 return 11; 99 } 100 if ( ! psMetadataRemove(metadata, 0, "myItem1" ) ) { 101 psError(__func__,"psMetadataRemove did not return true when removing by name."); 102 return 12; 103 } 104 if ( ! psMetadataRemove(metadata, 0, "myItem2" ) ) { 105 psError(__func__,"psMetadataRemove did not return true when removing by name."); 106 return 13; 107 } 91 108 printFooter(stdout, "psMetadata", "Test B - Remove items from metadata by name", true); 92 109 … … 94 111 // Test C - Remove items from metadata by index 95 112 printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index"); 96 psMetadataAddItem(metadata, item3, PS_LIST_HEAD); 97 psMetadataAddItem(metadata, item4, PS_LIST_HEAD); 98 psMetadataRemove(metadata, 0, NULL); 99 psMetadataRemove(metadata, 0, NULL ); 113 if ( ! psMetadataAddItem(metadata, item3, PS_LIST_HEAD) ) { 114 psError(__func__,"psMetadataAddItem did not return true when adding by index."); 115 return 14; 116 } 117 if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4",PS_META_S32,"I am S32 integer",88) ) { 118 psError(__func__,"psMetadataAddItem did not return true when adding by index."); 119 return 15; 120 } 121 if( ! psMetadataRemove(metadata, 0, NULL) ) { 122 psError(__func__,"psMetadataRemove did not return true when removing by index."); 123 return 16; 124 } 125 if ( ! psMetadataRemove(metadata, 0, NULL ) ) { 126 psError(__func__,"psMetadataRemove did not return true when removing by index."); 127 return 17; 128 } 100 129 printFooter(stdout, "psMetadata", "Test C - Remove items from metadata by index", true); 101 130 … … 104 133 printNegativeTestHeader(stdout,"psMetadata", "Test D - Attempt to use null metadata", 105 134 "Null metadata collection not allowed", 0); 106 psMetadataRemove(NULL, 0, NULL); 135 if ( psMetadataRemove(NULL, 0, NULL) ) { 136 psError(__func__,"psMetadataRemove did not return false when removing from null metadata."); 137 return 18; 138 } 107 139 printFooter(stdout, "psMetadata", "Test D - Attempt to use null metadata", true); 108 140 … … 111 143 printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to remove non-existant metadata item by name", 112 144 "Couldn't find metadata item. Name: AARGH", 0); 113 psMetadataRemove(metadata, 0, "AARGH"); 145 if( psMetadataRemove(metadata, 0, "AARGH") ) { 146 psError(__func__,"psMetadataRemove did not return false when removing non-existant item."); 147 return 19; 148 } 114 149 printFooter(stdout, "psMetadata", "Test E - Attempt to remove non-existant metadata item by name", true); 115 150 … … 118 153 printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to remove non-existant metadata item by index", 119 154 "Couldn't find metadata item in list. Index: 22", 0); 120 psMetadataRemove(metadata, 22, NULL); 155 if( psMetadataRemove(metadata, 22, NULL) ) { 156 psError(__func__,"psMetadataRemove did not return false when removing non-existant item."); 157 return 20; 158 } 121 159 printFooter(stdout, "psMetadata", "Test E - Attempt to remove non-existant metadata item by index", true); 122 160 161 162 // Test H - Attempt to add item to an invalid metadata structure 163 printNegativeTestHeader(stdout,"psMetadata","Test H - Attempt to add item to metadata w/o hash table", 164 "Couldn't add item to invalid metadata structure.",0); 165 errMetadata = psMetadataAlloc(); 166 mdTable = errMetadata->table; 167 errMetadata->table = NULL; 168 if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) { 169 psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); 170 return 21; 171 } 172 errMetadata->table = mdTable; 173 printFooter(stdout,"psMetadata","Test H - Attempt to add item to invalid metadata w/o hash table", true); 174 175 // Test J - Attempt to add item to an invalid metadata structure 176 printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o link list", 177 "Couldn't add item to invalid metadata structure.",0); 178 mdList = errMetadata->list; 179 errMetadata->list = NULL; 180 if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) { 181 psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list."); 182 return 22; 183 } 184 errMetadata->list = mdList; 185 printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o link list", true); 186 187 // Test K - Attempt to add item with a null name 188 printNegativeTestHeader(stdout,"psMetadata","Test K - Attempt to add item with null name", 189 "Couldn't add item with null name.",0); 190 errName = errItem->name; 191 errItem->name = NULL; 192 if ( psMetadataAddItem(errMetadata, errItem, PS_LIST_HEAD) ) { 193 psError(__func__,"psMetadataAddItem did not return false with item with null name."); 194 return 23; 195 } 196 errItem->name = errName; 197 printFooter(stdout,"psMetadata","Test K - Attempt to add item with null name", true); 123 198 124 199 // Test G - Free psMetadata … … 129 204 psFree(item3); 130 205 psFree(item4); 131 psMemCheckLeaks(0, NULL, stdout); 206 psFree(errItem); 207 psFree(errMetadata); 208 if( psMemCheckLeaks(0, NULL, stdout) != 0 ) { 209 psError(__func__,"Memory leaks detected."); 210 return 25; 211 } 132 212 psMemCheckCorruption(0); 133 213 int nBad = psMemCheckCorruption(0); -
trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stderr
r1761 r2015 5 5 <DATE><TIME>|<HOST>|E|psMetadataRemove 6 6 Couldn't find metadata item in list. Index: 22 7 <DATE><TIME>|<HOST>|E|psMetadataAddItem 8 Null metadata table not allowed 9 <DATE><TIME>|<HOST>|E|psMetadataAddItem 10 Null metadata list not allowed 11 <DATE><TIME>|<HOST>|E|psMetadataAddItem 12 Null key item not allowed -
trunk/psLib/test/astronomy/verified/tst_psMetadata_03.stdout
r1418 r2015 65 65 /***************************** TESTPOINT ******************************************\ 66 66 * TestFile: tst_psMetadata_03.c * 67 * TestPoint: psMetadata{Test H - Attempt to add item to metadata w/o hash table} * 68 * TestType: Negative * 69 * ExpectedErrorText: Couldn't add item to invalid metadata structure. * 70 * ExpectedStatusValue: 0 * 71 \**********************************************************************************/ 72 73 74 ---> TESTPOINT PASSED (psMetadata{Test H - Attempt to add item to invalid metadata w/o hash table} | tst_psMetadata_03.c) 75 76 /***************************** TESTPOINT ******************************************\ 77 * TestFile: tst_psMetadata_03.c * 78 * TestPoint: psMetadata{Test J - Attempt to add item to metadata w/o link list} * 79 * TestType: Negative * 80 * ExpectedErrorText: Couldn't add item to invalid metadata structure. * 81 * ExpectedStatusValue: 0 * 82 \**********************************************************************************/ 83 84 85 ---> TESTPOINT PASSED (psMetadata{Test J - Attempt to add item to invalid metadata w/o link list} | tst_psMetadata_03.c) 86 87 /***************************** TESTPOINT ******************************************\ 88 * TestFile: tst_psMetadata_03.c * 89 * TestPoint: psMetadata{Test K - Attempt to add item with null name} * 90 * TestType: Negative * 91 * ExpectedErrorText: Couldn't add item with null name. * 92 * ExpectedStatusValue: 0 * 93 \**********************************************************************************/ 94 95 96 ---> TESTPOINT PASSED (psMetadata{Test K - Attempt to add item with null name} | tst_psMetadata_03.c) 97 98 /***************************** TESTPOINT ******************************************\ 99 * TestFile: tst_psMetadata_03.c * 67 100 * TestPoint: psMetadata{Test G - Free psMetadata} * 68 101 * TestType: Positive * -
trunk/psLib/test/collections/tst_psMetadata_03.c
r1843 r2015 14 14 * @author Ross Harman, MHPCC 15 15 * 16 * @version $Revision: 1. 4$ $Name: not supported by cvs2svn $17 * @date $Date: 2004- 09-21 23:24:42$16 * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ 17 * @date $Date: 2004-10-08 01:00:54 $ 18 18 * 19 19 * Copyright 2004 Maui High Performance Computing Center, University of Hawaii … … 66 66 psMetadataItem *item3 = NULL; 67 67 psMetadataItem *item4 = NULL; 68 psMetadataItem *errItem = NULL; 68 69 psMetadata *metadata = NULL; 69 70 psMetadata *errMetadata = NULL; 71 psHash *mdTable = NULL; 72 psList *mdList = NULL; 73 char *errName = NULL; 70 74 71 75 // Test A - Allocate metadata and items … … 76 80 item3 = psMetadataItemAlloc("myItem3", PS_META_BOOL, "I am a boolean", false); 77 81 item4 = psMetadataItemAlloc("myItem4", PS_META_S32, "I am a integer", 66); 82 errItem = psMetadataItemAlloc("errItem", PS_META_S32, "I am a integer", 99); 78 83 printMetadataItem(item1); 79 84 printMetadataItem(item2); … … 85 90 // Test B - Remove items from metadata by name 86 91 printPositiveTestHeader(stdout, "psMetadata", "Test B - Remove items from metadata by name"); 87 psMetadataAddItem(metadata, item1, PS_LIST_HEAD); 88 psMetadataAddItem(metadata, item2, PS_LIST_HEAD); 89 psMetadataRemove(metadata, 0, "myItem1" ); 90 psMetadataRemove(metadata, 0, "myItem2" ); 92 if( ! psMetadataAddItem(metadata, item1, PS_LIST_HEAD) ) { 93 psError(__func__,"psMetadataAddItem did not return true when adding by name."); 94 return 10; 95 } 96 if( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem2",PS_META_S32,"I am S32 integer",77) ) { 97 psError(__func__,"psMetadataAddItem did not return true when adding by name."); 98 return 11; 99 } 100 if ( ! psMetadataRemove(metadata, 0, "myItem1" ) ) { 101 psError(__func__,"psMetadataRemove did not return true when removing by name."); 102 return 12; 103 } 104 if ( ! psMetadataRemove(metadata, 0, "myItem2" ) ) { 105 psError(__func__,"psMetadataRemove did not return true when removing by name."); 106 return 13; 107 } 91 108 printFooter(stdout, "psMetadata", "Test B - Remove items from metadata by name", true); 92 109 … … 94 111 // Test C - Remove items from metadata by index 95 112 printPositiveTestHeader(stdout, "psMetadata", "Test C - Remove items from metadata by index"); 96 psMetadataAddItem(metadata, item3, PS_LIST_HEAD); 97 psMetadataAddItem(metadata, item4, PS_LIST_HEAD); 98 psMetadataRemove(metadata, 0, NULL); 99 psMetadataRemove(metadata, 0, NULL ); 113 if ( ! psMetadataAddItem(metadata, item3, PS_LIST_HEAD) ) { 114 psError(__func__,"psMetadataAddItem did not return true when adding by index."); 115 return 14; 116 } 117 if ( ! psMetadataAdd(metadata,PS_LIST_HEAD,"myItem4",PS_META_S32,"I am S32 integer",88) ) { 118 psError(__func__,"psMetadataAddItem did not return true when adding by index."); 119 return 15; 120 } 121 if( ! psMetadataRemove(metadata, 0, NULL) ) { 122 psError(__func__,"psMetadataRemove did not return true when removing by index."); 123 return 16; 124 } 125 if ( ! psMetadataRemove(metadata, 0, NULL ) ) { 126 psError(__func__,"psMetadataRemove did not return true when removing by index."); 127 return 17; 128 } 100 129 printFooter(stdout, "psMetadata", "Test C - Remove items from metadata by index", true); 101 130 … … 104 133 printNegativeTestHeader(stdout,"psMetadata", "Test D - Attempt to use null metadata", 105 134 "Null metadata collection not allowed", 0); 106 psMetadataRemove(NULL, 0, NULL); 135 if ( psMetadataRemove(NULL, 0, NULL) ) { 136 psError(__func__,"psMetadataRemove did not return false when removing from null metadata."); 137 return 18; 138 } 107 139 printFooter(stdout, "psMetadata", "Test D - Attempt to use null metadata", true); 108 140 … … 111 143 printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to remove non-existant metadata item by name", 112 144 "Couldn't find metadata item. Name: AARGH", 0); 113 psMetadataRemove(metadata, 0, "AARGH"); 145 if( psMetadataRemove(metadata, 0, "AARGH") ) { 146 psError(__func__,"psMetadataRemove did not return false when removing non-existant item."); 147 return 19; 148 } 114 149 printFooter(stdout, "psMetadata", "Test E - Attempt to remove non-existant metadata item by name", true); 115 150 … … 118 153 printNegativeTestHeader(stdout,"psMetadata", "Test E - Attempt to remove non-existant metadata item by index", 119 154 "Couldn't find metadata item in list. Index: 22", 0); 120 psMetadataRemove(metadata, 22, NULL); 155 if( psMetadataRemove(metadata, 22, NULL) ) { 156 psError(__func__,"psMetadataRemove did not return false when removing non-existant item."); 157 return 20; 158 } 121 159 printFooter(stdout, "psMetadata", "Test E - Attempt to remove non-existant metadata item by index", true); 122 160 161 162 // Test H - Attempt to add item to an invalid metadata structure 163 printNegativeTestHeader(stdout,"psMetadata","Test H - Attempt to add item to metadata w/o hash table", 164 "Couldn't add item to invalid metadata structure.",0); 165 errMetadata = psMetadataAlloc(); 166 mdTable = errMetadata->table; 167 errMetadata->table = NULL; 168 if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) { 169 psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o hash table."); 170 return 21; 171 } 172 errMetadata->table = mdTable; 173 printFooter(stdout,"psMetadata","Test H - Attempt to add item to invalid metadata w/o hash table", true); 174 175 // Test J - Attempt to add item to an invalid metadata structure 176 printNegativeTestHeader(stdout,"psMetadata","Test J - Attempt to add item to metadata w/o link list", 177 "Couldn't add item to invalid metadata structure.",0); 178 mdList = errMetadata->list; 179 errMetadata->list = NULL; 180 if ( psMetadataAddItem(errMetadata, item3, PS_LIST_HEAD) ) { 181 psError(__func__,"psMetadataAddItem did not return false w/ invalid metadata struct w/o link list."); 182 return 22; 183 } 184 errMetadata->list = mdList; 185 printFooter(stdout,"psMetadata","Test J - Attempt to add item to invalid metadata w/o link list", true); 186 187 // Test K - Attempt to add item with a null name 188 printNegativeTestHeader(stdout,"psMetadata","Test K - Attempt to add item with null name", 189 "Couldn't add item with null name.",0); 190 errName = errItem->name; 191 errItem->name = NULL; 192 if ( psMetadataAddItem(errMetadata, errItem, PS_LIST_HEAD) ) { 193 psError(__func__,"psMetadataAddItem did not return false with item with null name."); 194 return 23; 195 } 196 errItem->name = errName; 197 printFooter(stdout,"psMetadata","Test K - Attempt to add item with null name", true); 123 198 124 199 // Test G - Free psMetadata … … 129 204 psFree(item3); 130 205 psFree(item4); 131 psMemCheckLeaks(0, NULL, stdout); 206 psFree(errItem); 207 psFree(errMetadata); 208 if( psMemCheckLeaks(0, NULL, stdout) != 0 ) { 209 psError(__func__,"Memory leaks detected."); 210 return 25; 211 } 132 212 psMemCheckCorruption(0); 133 213 int nBad = psMemCheckCorruption(0);
Note:
See TracChangeset
for help on using the changeset viewer.
