[svn-r13113] Refactoring. Cleaned up code, added a few sanity checks.

Extracted duplicated code into functions.

Tested on Windows, juniper, and kagiso.  Will test on copper next. 

5 files changed, 3 insertions, 15 deletions

diff --git a/test/tattr.c b/test/tattr.c
index c5f0dcc..92f0c56 100644
--- a/test/tattr.c
+++ b/test/tattr.c
@@ -20,9 +20,6 @@
 *
 *************************************************************/
 
-/* JAMES: try writing a second value to an existing shared attribute.
- * Does modifying attributes work? */
-
 #include "testhdf5.h"
 #include "h5test.h"
 #include "hdf5.h"
diff --git a/test/tfile.c b/test/tfile.c
index 1269ec3..834e261 100644
--- a/test/tfile.c
+++ b/test/tfile.c
@@ -1245,13 +1245,11 @@ test_file_freespace(void)
     /* Check that there is the right amount of free space in the file */
     free_space = H5Fget_freespace(file);
     CHECK(free_space, FAIL, "H5Fget_freespace");
-#ifdef JAMES
 #ifdef H5_HAVE_LARGE_HSIZET
     VERIFY(free_space, 2368, "H5Fget_freespace");
 #else /* H5_HAVE_LARGE_HSIZET */
     VERIFY(free_space, 588, "H5Fget_freespace");        /* XXX: fix me */
 #endif /* H5_HAVE_LARGE_HSIZET */
-#endif /* JAMES */
     /* Delete datasets in file */
     for(u = 0; u < 10; u++) {
         sprintf(name, "Dataset %u", u);
@@ -1262,13 +1260,11 @@ test_file_freespace(void)
     /* Check that there is the right amount of free space in the file */
     free_space = H5Fget_freespace(file);
     CHECK(free_space, FAIL, "H5Fget_freespace");
-#ifdef JAMES
 #ifdef H5_HAVE_LARGE_HSIZET
     VERIFY(free_space, 5512, "H5Fget_freespace");
 #else /* H5_HAVE_LARGE_HSIZET */
     VERIFY(free_space, 4592, "H5Fget_freespace");       /* XXX: fix me */
 #endif /* H5_HAVE_LARGE_HSIZET */
-#endif /* JAMES */
 
     /* Close file */
     ret = H5Fclose(file);
diff --git a/test/th5s.c b/test/th5s.c
index 0c97a3f..359f023 100644
--- a/test/th5s.c
+++ b/test/th5s.c
@@ -954,10 +954,6 @@ test_h5s_compound_scalar_read(void)
     ret = H5Sclose(sid1);
     CHECK(ret, FAIL, "H5Sclose");
 
-    /* Close datatype JAMES
-    ret = H5Tclose(type);
-    CHECK(ret, FAIL, "H5Tclose");
-*/
     /* Close file */
     ret = H5Fclose(fid1);
     CHECK(ret, FAIL, "H5Fclose");
diff --git a/test/tmisc.c b/test/tmisc.c
index 0f71f8d..a4d54ae 100644
--- a/test/tmisc.c
+++ b/test/tmisc.c
@@ -1787,7 +1787,6 @@ test_misc11(void)
     unsigned stab;              /* Symbol table entry version # */
     unsigned shhdr;             /* Shared object header version # */
     unsigned nindexes;          /* Shared message number of indexes */
-/* JAMES: add more SOHM properties here */
     herr_t      ret;            /* Generic return value */
 
     /* Output message about test being performed */
diff --git a/test/tsohm.c b/test/tsohm.c
index a6e38ad..3bdb340 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -30,7 +30,6 @@ const unsigned def_minsizes[H5SM_MAX_NINDEXES] = {250,250,250,250,250,250};
 #define DEF_B2L 40
 
 /* Non-default SOHM values for testing */
-/* JAMES: make these defined in function */
 #define TEST_NUM_INDEXES 4
 const unsigned test_type_flags[H5SM_MAX_NINDEXES] =
                 {H5O_MESG_FILL_FLAG,
@@ -909,7 +908,8 @@ static void test_sohm_size1(void)
     /* Both sohm files should be bigger than a normal file when empty.
      * It's hard to say whether a B-tree with no nodes allocated should be
      * smaller than a list with SOHM_HELPER_NUM_DTYPES elements.
-     * JAMES: The sizes here shouldn't really be 1
+     * The sizes here shouldn't really be 1; it's just used to ensure that the
+     * error code triggers.
      */
     if(sohm_empty_filesize <= norm_empty_filesize)
         VERIFY(sohm_empty_filesize, 1, "H5Fclose");
@@ -1330,7 +1330,6 @@ size2_helper(hid_t fcpl_id, int test_file_closing)
     char fill2[DTYPE2_SIZE];
 
     /* Create a file and get its size */
-    /* JAMES: is fixname needed at all? */
     file_id = H5Fcreate(FILENAME, H5F_ACC_TRUNC, fcpl_id, H5P_DEFAULT);
     CHECK_I(file_id, "H5Fcreate");
 
@@ -3068,6 +3067,7 @@ test_sohm(void)
     test_sohm_delete_revert();  /* Test that a file with SOHMs becomes an
                                  * empty file again when they are deleted. */
     test_sohm_extlink();        /* Test SOHMs when external links are used */
+    /* JAMES: try extending dataspaces, overwriting attributes */
 
 } /* test_sohm() */