Changeset 2050

Timestamp:

Oct 11, 2004, 3:54:00 PM (22 years ago)

Author:

evanalst

Message:

Add additional test cases for psMetadataAddItem.

Location:

trunk/psLib/test

Files:

• astronomy/tst_psMetadata_06.c (modified) (5 diffs)
• collections/tst_psMetadata_06.c (modified) (5 diffs)

trunk/psLib/test/astronomy/tst_psMetadata_06.c

@@ -13 +13 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-09-21 23:24:42 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-12 01:54:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87 +87 @@
     // Test B - Add leaf node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node");
-    psMetadataAddItem(metadata, item1a, PS_LIST_HEAD);
-    psMetadataAddItem(metadata, item1b, PS_LIST_HEAD);
+    if( ! psMetadataAddItem(metadata, item1a, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a node top.");
+        return 20;
+    }
+    if ( ! psMetadataAddItem(metadata, item1b, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a node top.");
+        return 21;
+    }
+
     printFooter(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node", true);
 
@@ -94 +101 @@
     // Test C - Add leaf node to existing folder node
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node");
-    psMetadataAddItem(metadata, item1c, PS_LIST_HEAD);
+    if ( ! psMetadataAddItem(metadata, item1c, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem return false for adding a not to existing node.");
+        return 22;
+    }
     printFooter(stdout, "psMetadata", "Test C - Add leaf node to existing folder node", true);
 
@@ -100 +110 @@
     // Test D - Add folder node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node");
-    psMetadataAddItem(metadata, item2a, PS_LIST_HEAD);
-    psMetadataAddItem(metadata, item2b, PS_LIST_HEAD);
+    if ( ! psMetadataAddItem(metadata, item2a, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a node to existing leaf node.");
+        return 23;
+    }
+    if ( ! psMetadataAddItem(metadata, item2b, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a nod to existing leaf node.");
+        return 24;
+    }
     printFooter(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node", true);
 
@@ -113 +129 @@
     psFree(item2b);
     psFree(metadata);
-    psMemCheckLeaks(0, NULL, stdout);
+    if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
+        psError(__func__,"Memory leaks detected.");
+        return 25;
+    }
     psMemCheckCorruption(0);
     int nBad = psMemCheckCorruption(0);

trunk/psLib/test/collections/tst_psMetadata_06.c

@@ -13 +13 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.2 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-09-21 23:24:42 $
+*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-10-12 01:54:00 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -87 +87 @@
     // Test B - Add leaf node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node");
-    psMetadataAddItem(metadata, item1a, PS_LIST_HEAD);
-    psMetadataAddItem(metadata, item1b, PS_LIST_HEAD);
+    if( ! psMetadataAddItem(metadata, item1a, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a node top.");
+        return 20;
+    }
+    if ( ! psMetadataAddItem(metadata, item1b, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a node top.");
+        return 21;
+    }
+
     printFooter(stdout, "psMetadata", "Test B - Add leaf node on top of existing leaf node", true);
 
@@ -94 +101 @@
     // Test C - Add leaf node to existing folder node
     printPositiveTestHeader(stdout, "psMetadata", "Test C - Add leaf node to existing folder node");
-    psMetadataAddItem(metadata, item1c, PS_LIST_HEAD);
+    if ( ! psMetadataAddItem(metadata, item1c, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem return false for adding a not to existing node.");
+        return 22;
+    }
     printFooter(stdout, "psMetadata", "Test C - Add leaf node to existing folder node", true);
 
@@ -100 +110 @@
     // Test D - Add folder node on top of existing leaf node
     printPositiveTestHeader(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node");
-    psMetadataAddItem(metadata, item2a, PS_LIST_HEAD);
-    psMetadataAddItem(metadata, item2b, PS_LIST_HEAD);
+    if ( ! psMetadataAddItem(metadata, item2a, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a node to existing leaf node.");
+        return 23;
+    }
+    if ( ! psMetadataAddItem(metadata, item2b, PS_LIST_HEAD) ) {
+        psError(__func__,"psMetadataAddItem returned false for adding a nod to existing leaf node.");
+        return 24;
+    }
     printFooter(stdout, "psMetadata", "Test D - Add folder node on top of existing leaf node", true);
 
@@ -113 +129 @@
     psFree(item2b);
     psFree(metadata);
-    psMemCheckLeaks(0, NULL, stdout);
+    if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) {
+        psError(__func__,"Memory leaks detected.");
+        return 25;
+    }
     psMemCheckCorruption(0);
     int nBad = psMemCheckCorruption(0);