Index: /trunk/psLib/test/astronomy/Makefile
===================================================================
--- /trunk/psLib/test/astronomy/Makefile	(revision 1401)
+++ /trunk/psLib/test/astronomy/Makefile	(revision 1402)
@@ -3,6 +3,6 @@
 ##  Makefile:   test/astronomy
 ##
-##  $Revision: 1.4 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-08-02 18:02:46 $
+##  $Revision: 1.5 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-08-06 20:33:08 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -20,5 +20,6 @@
 PSLIB_LIB_DIR = ../../lib
 
-TARGET = tst_psMetadata_01
+TARGET = tst_psMetadata_01 \
+         tst_psMetadata_02
 
 DEPENDENCIES = $(addprefix builddir/,$(addsuffix .d,$(TARGET)))
Index: /trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d
===================================================================
--- /trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d	(revision 1402)
+++ /trunk/psLib/test/astronomy/builddir/tst_psMetadata_02.d	(revision 1402)
@@ -0,0 +1,15 @@
+builddir/tst_psMetadata_02.o: tst_psMetadata_02.c ../../include/pslib.h \
+  ../../include/psMemory.h ../../include/psLogMsg.h \
+  ../../include/psTrace.h ../../include/psAbort.h ../../include/psError.h \
+  ../../include/psString.h ../../include/psType.h ../../include/psList.h \
+  ../../include/psCompare.h ../../include/psArray.h \
+  ../../include/psHash.h ../../include/psScalar.h \
+  ../../include/psVector.h ../../include/psImage.h \
+  ../../include/psImageExtraction.h ../../include/psStats.h \
+  ../../include/psImageManip.h ../../include/psImageIO.h \
+  ../../include/psImageStats.h ../../include/psFunctions.h \
+  ../../include/psBitSet.h ../../include/psMatrix.h \
+  ../../include/psMatrixVectorArithmetic.h ../../include/psFFT.h \
+  ../../include/psMinimize.h ../../include/psCoord.h \
+  ../../include/psTime.h ../../include/psPhotometry.h \
+  ../../include/psMetadata.h ../../include/psTest.h
Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c
===================================================================
--- /trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 1401)
+++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c	(revision 1402)
@@ -15,6 +15,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-05 20:55:34 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-08-06 20:32:58 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -105,5 +105,4 @@
     printMetadata(metadata1);
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
-    printf("\n\n");
 
 
@@ -157,5 +156,4 @@
     printMetadata(metadata2);
     printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
-    printf("\n\n");
 
 
@@ -169,5 +167,4 @@
     printMetadata(metadata3);
     printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
-    printf("\n\n");
 
 
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1401)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_01.stdout	(revision 1402)
@@ -13,6 +13,4 @@
 
 ---> TESTPOINT PASSED (psMetadata{Test A - Read 1st hdr from simple FITS file} | tst_psMetadata_01.c)
-
-
 
 /***************************** TESTPOINT ******************************************\
@@ -39,6 +37,4 @@
 ---> TESTPOINT PASSED (psMetadata{Test B - Read 2nd hdr from complex FITS file} | tst_psMetadata_01.c)
 
-
-
 /***************************** TESTPOINT ******************************************\
 *             TestFile: tst_psMetadata_01.c                                        *
@@ -60,6 +56,4 @@
 
 ---> TESTPOINT PASSED (psMetadata{Test C - Read named hdr from complex FITS file} | tst_psMetadata_01.c)
-
-
 
 /***************************** TESTPOINT ******************************************\
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1402)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stderr	(revision 1402)
@@ -0,0 +1,5 @@
+ <DATE> <TIME> |<HOST>|E|psMetadataItemA|Null value for name not allowed
+ <DATE> <TIME> |<HOST>|E|psMetadataItemA|Invalid psMetadataType: 6
+ <DATE> <TIME> |<HOST>|E|psMetadataAddIt|Null metadata collection not allowed
+ <DATE> <TIME> |<HOST>|E|psMetadataAddIt|Null metadata item not allowed
+ <DATE> <TIME> |<HOST>|E|psMetadataAddIt|Metadata already exists in metadata collection. Item not added. Name: myItem2
Index: /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout
===================================================================
--- /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 1402)
+++ /trunk/psLib/test/astronomy/verified/tst_psMetadata_02.stdout	(revision 1402)
@@ -0,0 +1,87 @@
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test A - Allocate metadata items}               *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+Key Name:  myItem1  Key Type:  1  Key Value:               1  Key Comment: I am a boolean
+Key Name:  myItem2  Key Type:  2  Key Value:             111  Key Comment: I am a signed integer
+Key Name:  myItem3  Key Type:  3  Key Value:         222.222  Key Comment: I am a single precision floating point
+Key Name:  myItem4  Key Type:  4  Key Value:         333.333  Key Comment: I am a double precision floating point
+Key Name:  myItem5  Key Type:  5  Key Value:     HELLO WORLD  Key Comment: I am a string
+
+---> TESTPOINT PASSED (psMetadata{Test A - Allocate metadata items} | tst_psMetadata_02.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test B - Attempt to create metadata item with null name} *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Null value for name not allowed                            *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test B - Attempt to create metadata item with null name} | tst_psMetadata_02.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test C - Attempt to create metadata item with invalid type} *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Invalid psMetadataType: 6                                  *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test C - Attempt to create metadata item with invalid type} | tst_psMetadata_02.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test D - Allocate metadata}                     *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test D - Allocate metadata} | tst_psMetadata_02.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test E - Attempt add metadata item to null metadata} *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Null metadata collection not allowed                       *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test E - Attempt add metadata item to null metadata} | tst_psMetadata_02.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test F - Attempt add null metadata item to metadata} *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Null metadata item not allowed                             *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test F - Attempt add null metadata item to metadata} | tst_psMetadata_02.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test H - Attempt to add folder metadata item that already exists} *
+*             TestType: Negative                                                   *
+*    ExpectedErrorText: Medatdata item exists in metadata collection. Item not added. Name: myItem2 *
+*  ExpectedStatusValue: 0                                                          *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test H - Attempt to add folder metadata item that already exists} | tst_psMetadata_02.c)
+
+/***************************** TESTPOINT ******************************************\
+*             TestFile: tst_psMetadata_02.c                                        *
+*            TestPoint: psMetadata{Test - Free psMetadata}                         *
+*             TestType: Positive                                                   *
+\**********************************************************************************/
+
+
+---> TESTPOINT PASSED (psMetadata{Test - Free psMetadata} | tst_psMetadata_02.c)
+
Index: /trunk/psLib/test/collections/tst_psMetadata_01.c
===================================================================
--- /trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1401)
+++ /trunk/psLib/test/collections/tst_psMetadata_01.c	(revision 1402)
@@ -15,6 +15,6 @@
 *  @author  Ross Harman, MHPCC
 *
-*  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
-*  @date  $Date: 2004-08-05 20:55:34 $
+*  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+*  @date  $Date: 2004-08-06 20:32:58 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -105,5 +105,4 @@
     printMetadata(metadata1);
     printFooter(stdout, "psMetadata", "Test A - Read 1st hdr from simple FITS file", true);
-    printf("\n\n");
 
 
@@ -157,5 +156,4 @@
     printMetadata(metadata2);
     printFooter(stdout, "psMetadata", "Test B - Read 2nd hdr from complex FITS file", true);
-    printf("\n\n");
 
 
@@ -169,5 +167,4 @@
     printMetadata(metadata3);
     printFooter(stdout, "psMetadata", "Test C - Read named hdr from complex FITS file", true);
-    printf("\n\n");