[svn-r69] Added basic H5P test code, which seems to be working correctly.

4 files changed, 119 insertions, 3 deletions

diff --git a/test/Makefile.in b/test/Makefile.in
index cec4a0a..7b47bb7 100644
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -14,7 +14,7 @@ PROGS=testhdf5
 TESTS=$(PROGS)
 
 # Source and object files for programs...
-PROG_SRC=testhdf5.c tfile.c theap.c tmeta.c tohdr.c tstab.c th5t.c
+PROG_SRC=testhdf5.c tfile.c theap.c tmeta.c tohdr.c tstab.c th5t.c th5p.c
 PROG_OBJ=$(PROG_SRC:.c=.o)
 
 # Private header files (not to be installed)...
diff --git a/test/testhdf5.c b/test/testhdf5.c
index d7f4aea..3af58e1 100644
--- a/test/testhdf5.c
+++ b/test/testhdf5.c
@@ -158,9 +158,7 @@ int main(int argc, char *argv[])
     InitTest("ohdr", test_ohdr, "Object Headers");
     InitTest("stab", test_stab, "Symbol Tables");
     InitTest("h5t", test_h5t, "Datatypes");
-#ifdef QAK
     InitTest("h5p", test_h5p, "Dataspaces");
-#endif /* QAK */
 
     Verbosity = 4;  /* Default Verbosity is Low */
     H5version(&major, &minor, &release, &patch);
diff --git a/test/testhdf5.h b/test/testhdf5.h
index 37321ec..406491e 100644
--- a/test/testhdf5.h
+++ b/test/testhdf5.h
@@ -104,6 +104,7 @@ void test_heap (void);
 void test_ohdr (void);
 void test_stab (void);
 void test_h5t (void);
+void test_h5p (void);
 
 #endif /* HDF5TEST_H */
 
diff --git a/test/th5p.c b/test/th5p.c
new file mode 100644
index 0000000..0238776
--- /dev/null
+++ b/test/th5p.c
@@ -0,0 +1,117 @@
+/****************************************************************************
+ * NCSA HDF                                                                 *
+ * Software Development Group                                               *
+ * National Center for Supercomputing Applications                          *
+ * University of Illinois at Urbana-Champaign                               *
+ * 605 E. Springfield, Champaign IL 61820                                   *
+ *                                                                          *
+ * For conditions of distribution and use, see the accompanying             *
+ * hdf/COPYING file.                                                        *
+ *                                                                          *
+ ****************************************************************************/
+
+#ifdef RCSID
+static char RcsId[] = "$Revision$";
+#endif
+
+/* $Id$ */
+
+/***********************************************************
+*
+* Test program:  th5p
+*
+* Test the dataspace functionality
+*
+*************************************************************/
+
+#include <testhdf5.h>
+
+#include <H5private.h>
+#include <H5Bprivate.h>
+#include <H5Mprivate.h>
+#include <H5Pprivate.h>
+
+#define FILE   "th5p1.h5"
+
+/* 3-D dataset with fixed dimensions */
+#define SPACE1_NAME  "Space1"
+#define SPACE1_RANK     3
+#define SPACE1_DIM1     3
+#define SPACE1_DIM2     15
+#define SPACE1_DIM3     13
+
+/* 4-D dataset with one unlimited dimension */
+#define SPACE2_NAME  "Space2"
+#define SPACE2_RANK     4
+#define SPACE2_DIM1     0
+#define SPACE2_DIM2     15
+#define SPACE2_DIM3     13
+#define SPACE2_DIM4     23
+
+/****************************************************************
+**
+**  test_h5p_basic(): Test basic H5P (dataspace) code.
+** 
+****************************************************************/
+static void test_h5p_basic(void)
+{
+    hatom_t fid1;   /* HDF5 File IDs */
+    hatom_t sid1,sid2;   /* Dataspace ID */
+    uint32 rank1, rank2;    /* Dataspace ranks */
+    uint32 dims1[]={SPACE1_DIM1,SPACE1_DIM2,SPACE1_DIM3},   /* dataspace dim sizes */
+        dims2[]={SPACE2_DIM1,SPACE2_DIM2,SPACE2_DIM3,SPACE2_DIM4};
+    uintn n;            /* number of dataspace elements */
+    herr_t ret;         /* Generic return value */
+
+    /* Output message about test being performed */
+    MESSAGE(5, ("Testing Datatype Manipulation\n"));
+
+    /* Create file */
+    fid1=H5Fcreate(FILE,H5ACC_OVERWRITE,0,0);
+    CHECK(fid1,FAIL,"H5Fcreate");
+
+    sid1=H5Mcreate(fid1,H5_DATASPACE,SPACE1_NAME);
+    CHECK(sid1,FAIL,"H5Mcreate");
+
+    ret=H5Pset_space(sid1,SPACE1_RANK,dims1);
+    CHECK(ret,FAIL,"H5Pset_space");
+    
+    n=H5Pnelem(sid1);
+    CHECK(n,UFAIL,"H5Pnelem");
+    VERIFY(n,SPACE1_DIM1*SPACE1_DIM2*SPACE1_DIM3,"H5Pnelem");
+    
+    sid2=H5Mcreate(fid1,H5_DATASPACE,SPACE2_NAME);
+    CHECK(sid2,FAIL,"H5Mcreate");
+
+    ret=H5Pset_space(sid2,SPACE2_RANK,dims2);
+    CHECK(ret,FAIL,"H5Pset_space");
+    
+    n=H5Pnelem(sid2);
+    CHECK(n,UFAIL,"H5Pnelem");
+    VERIFY(n,SPACE2_DIM1*SPACE2_DIM2*SPACE2_DIM3*SPACE2_DIM4,"H5Pnelem");
+    
+    ret=H5Mrelease(sid1);
+    CHECK(ret,FAIL,"H5Mrelease");
+    
+    ret=H5Mrelease(sid2);
+    CHECK(ret,FAIL,"H5Mrelease");
+    
+    /* Close first file */
+    ret=H5Fclose(fid1);
+    CHECK(ret,FAIL,"H5Fclose");
+}   /* test_h5p_basic() */
+
+
+/****************************************************************
+**
+**  test_h5p(): Main H5P (dataspace) testing routine.
+** 
+****************************************************************/
+void test_h5p(void)
+{
+    /* Output message about test being performed */
+    MESSAGE(5, ("Testing Dataspaces\n"));
+
+    test_h5p_basic();       /* Test basic H5P code */
+}   /* test_h5p() */
+