[svn-r29202] Fix for unknown message HDFFV-9697.

Tested on jam, ostrich, platypus, kite, quail, osx1010test, emu, mayll, moohan.

3 files changed, 354 insertions, 178 deletions

diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index e9ce686..fdd8744 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -21,8 +21,8 @@
  *              datasets that have "bogus" messages in their object header.
  */
 
-#include "H5private.h"
 #include "hdf5.h"
+#include "H5private.h"
 #include "H5Oprivate.h"
 
 #ifdef H5O_ENABLE_BOGUS
@@ -36,18 +36,21 @@
 #define FALSE 0
 #endif /* FALSE */
 
-int main(void)
-{
 #ifdef H5O_ENABLE_BOGUS
-    hid_t fid = -1;             /* File ID */
+
+/*
+ * Create datasets in the location (in "/" or "/group") with 
+ *   message id: (a) H5O_BOGUS_VALID_ID or (b)H5O_BOGUS_INVALID_ID
+ *   and various unknown message flags
+ */
+static int
+generate_datasets(hid_t loc_id, unsigned bogus_id) 
+{
     hid_t sid = -1;             /* Dataspace ID */
     hid_t dcpl = -1;            /* Dataset creation property list ID */
     hid_t did = -1;             /* Dataset ID */
     uint8_t bogus_flags = 0;    /* Flags for bogus message */
 
-    /* Create file for test datasets */
-    if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
-
     /* Create dataspace for datasets */
     if((sid = H5Screate(H5S_SCALAR)) < 0) goto error;
 
@@ -57,8 +60,11 @@ int main(void)
     /* Add property for bogus message flags */
     if(H5Pinsert2(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, H5O_BOGUS_MSG_FLAGS_SIZE, &bogus_flags, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error;
 
+    /* Add property for bogus message ID */
+    if(H5Pinsert2(dcpl, H5O_BOGUS_MSG_ID_NAME, H5O_BOGUS_MSG_ID_SIZE, &bogus_id, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error;
+
     /* Create dataset with "bogus" message, but no message flags */
-    if((did = H5Dcreate2(fid, "/Dataset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Set "fail if unknown and open for write" message flag for bogus message */
@@ -66,7 +72,7 @@ int main(void)
     if(H5Pset(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0) goto error;
 
     /* Create second dataset, with "fail if unknown" message flag */
-    if((did = H5Dcreate2(fid, "/Dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset2", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Set "fail if unknown always" message flag for bogus message */
@@ -74,7 +80,7 @@ int main(void)
     if(H5Pset(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0) goto error;
 
     /* Create third dataset, with "fail if unknown always" message flag */
-    if((did = H5Dcreate2(fid, "/Dataset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset3", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Set "mark if unknown" message flag for bogus message */
@@ -82,7 +88,7 @@ int main(void)
     if(H5Pset(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, &bogus_flags) < 0) goto error;
 
     /* Create fourth dataset, with "mark if unknown" message flag */
-    if((did = H5Dcreate2(fid, "/Dataset4", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
+    if((did = H5Dcreate2(loc_id, "Dataset4", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
     if(H5Dclose(did) < 0) goto error;
 
     /* Close dataset creation property list */
@@ -91,9 +97,6 @@ int main(void)
     /* Close dataspace */
     if(H5Sclose(sid) < 0) goto error;
 
-    /* Close file */
-    if(H5Fclose(fid) < 0) goto error;
-
     return 0;
 
 error:
@@ -101,6 +104,43 @@ error:
         H5Dclose(did);
         H5Sclose(sid);
         H5Pclose(dcpl);
+    } H5E_END_TRY;
+
+    return -1;
+} /* generate_datasets() */
+#endif
+
+int main(void)
+{
+#ifdef H5O_ENABLE_BOGUS
+    hid_t fid = -1;             /* File ID */
+    hid_t gid = -1;             /* Group ID */
+
+    /* Create file for test datasets */
+    if((fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) goto error;
+
+    /* Create datasets in "/" group with bogus message H5O_BOGUS_VALID_ID */
+    if(generate_datasets(fid, H5O_BOGUS_VALID_ID) < 0)
+        goto error;
+
+    if((gid = H5Gcreate2(fid, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+        goto error;
+
+    /* Create datasets in "/group" with bogus message H5O_BOGUS_INVALID_ID */
+    if(generate_datasets(gid, H5O_BOGUS_INVALID_ID) < 0)
+        goto error;
+
+    /* Close the group */
+    if(H5Gclose(gid) < 0) goto error;
+
+    /* Close file */
+    if(H5Fclose(fid) < 0) goto error;
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Gclose(gid);
         H5Fclose(fid);
     } H5E_END_TRY;
 #else /* H5O_ENABLE_BOGUS */
diff --git a/test/ohdr.c b/test/ohdr.c
index c0ec3d0..3b11539 100644
--- a/test/ohdr.c
+++ b/test/ohdr.c
@@ -295,6 +295,294 @@ error:
     return -1;
 } /* test_ohdr_cache() */
 
+/*
+ *  To test objects with unknown messages in a file with:
+ *  	a) H5O_BOGUS_VALID_ID:
+ *	   --the bogus_id is within the range of H5O_msg_class_g[]
+ *  	b) H5O_BOGUS_INVALID_ID:
+ *  	   --the bogus_id is outside the range of H5O_msg_class_g[]
+ *
+ *   The test file is FILE_BOGUS: "tbogus.h5" generated with gen_bogus.c
+ *   --objects that have unknown header messages with H5O_BOGUS_VALID_ID in "/"
+ *   --objects that have unknown header messages with H5O_BOGUS_INVALID_ID in "/group"
+ *
+ *   The test also uses the test file FILENAME[0] (ohdr.h5): the parameter "filename"
+ */
+static herr_t
+test_unknown(unsigned bogus_id, char *filename, hid_t fapl)
+{
+    hid_t fid = -1;	/* file ID */
+    hid_t gid = -1;	/* group ID */
+    hid_t did = -1;	/* Dataset ID */
+    hid_t sid = -1;     /* Dataspace ID */
+    hid_t aid = -1;     /* Attribute ID */
+    hid_t loc = -1;	/* location: file or group ID */
+    hid_t fid_bogus = -1;	/* bogus file ID */
+    hid_t gid_bogus = -1;	/* bogus group ID */
+    hid_t loc_bogus = -1;	/* location: bogus file or group ID */
+    const char *testfile = H5_get_srcdir_filename(FILE_BOGUS);
+
+    TESTING("object with unknown header message and no flags set");
+
+    /* Open filename */
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+	TEST_ERROR
+
+    /* Open FILE_BOGUS */
+    if((fid_bogus = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in FILE_BOGUS */
+	if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc_bogus = gid_bogus;
+
+	/* Create "group" in filename */
+	if((gid = H5Gcreate2(fid, "group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	    FAIL_STACK_ERROR
+	loc = gid;
+
+    } else { /* H5O_BOGUS_VALID_ID */
+	loc_bogus = fid_bogus;
+	loc = fid;
+    }
+
+   /* Open the dataset with the unknown header message, but no extra flags */
+    if((did = H5Dopen2(loc_bogus, "Dataset1", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    PASSED();
+
+    TESTING("object in r/o file with unknown header message & 'fail if unknown and open for write' flag set");
+
+    /* Open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
+    if((did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    PASSED();
+
+    TESTING("object in r/o file with unknown header message & 'fail if unknown always' flag set");
+
+    /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
+    H5E_BEGIN_TRY {
+	did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
+    } H5E_END_TRY;
+    if(did >= 0) {
+	H5Dclose(did);
+	TEST_ERROR
+    } /* end if */
+
+    PASSED();
+
+    TESTING("object with unknown header message & 'mark if unknown' flag set");
+
+    /* Copy object with "mark if unknown" flag on message into file (FILENAME[0]) that can be modified */
+    if(H5Ocopy(loc_bogus, "Dataset4", loc, "Dataset4", H5P_DEFAULT, H5P_DEFAULT) < 0)
+	TEST_ERROR
+
+    /* Closing: filename */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    FAIL_STACK_ERROR
+    }
+    if(H5Fclose(fid) < 0)
+       TEST_ERROR
+
+    /* Re-open filename, with read-only permissions */
+    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in filename */
+	if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc = gid;
+    } else
+	loc = fid;
+
+    /* Open the dataset with the "mark if unknown" message */
+    if((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Check that the "unknown" message was _NOT_ marked */
+    if(H5O_check_msg_marked_test(did, FALSE) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    /* Close "group" in filename depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    FAIL_STACK_ERROR
+    }
+
+    /* Close filename (to flush change to object header) */
+    if(H5Fclose(fid) < 0)
+	TEST_ERROR
+
+    /* Re-open filename */
+    if((fid = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in filename */
+	if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc = gid;
+    } else
+	loc = fid;
+
+    /* Open the dataset with the "mark if unknown" message */
+    if((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Create data space */
+    if((sid = H5Screate(H5S_SCALAR)) < 0)
+	FAIL_STACK_ERROR
+
+    /* Create an attribute, to get the object header into write access */
+    if((aid = H5Acreate2(did, "Attr", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close dataspace */
+    if(H5Sclose(sid) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close attribute */
+    if(H5Aclose(aid) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    /* Close "group" in filename depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    FAIL_STACK_ERROR
+    }
+
+    /* Close filename (to flush change to object header) */
+    if(H5Fclose(fid) < 0)
+	TEST_ERROR
+
+    /* Re-open filename */
+    if((fid = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID depending on bogus_id */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in filename */
+	if((gid = H5Gopen2(fid, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc = gid;
+    } else
+	loc = fid;
+
+    /* Re-open the dataset with the "mark if unknown" message */
+    if((did = H5Dopen2(loc, "Dataset4", H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Check that the "unknown" message was marked */
+    if(H5O_check_msg_marked_test(did, TRUE) < 0)
+	FAIL_STACK_ERROR
+
+    /* Close the dataset */
+    if(H5Dclose(did) < 0)
+	TEST_ERROR
+
+    /* Closing: filename */ 
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid) < 0)
+	    TEST_ERROR
+    }
+    if(H5Fclose(fid) < 0)
+	TEST_ERROR
+
+    PASSED();
+
+    /* Closing: FILE_BOGUS */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid_bogus) < 0)
+	    TEST_ERROR
+    }
+    if(H5Fclose(fid_bogus) < 0)
+	TEST_ERROR
+
+    TESTING("object in r/w file with unknown header message & 'fail if unknown and open for write' flag set");
+
+    /* Open FILE_BOGUS with RW intent this time */
+    if((fid_bogus = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
+	TEST_ERROR
+
+    /* Set up location ID */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	/* Open "group" in FILE_BOGUS */
+	if((gid_bogus = H5Gopen2(fid_bogus, "group", H5P_DEFAULT)) < 0) 
+	    FAIL_STACK_ERROR
+	loc_bogus = gid_bogus;
+    } else
+	loc_bogus = fid_bogus;
+
+    /* Attempt to open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
+    H5E_BEGIN_TRY {
+	did = H5Dopen2(loc_bogus, "Dataset2", H5P_DEFAULT);
+    } H5E_END_TRY;
+    if(did >= 0) {
+	H5Dclose(did);
+	TEST_ERROR
+    } /* end if */
+
+    PASSED();
+
+    TESTING("object in r/w file with unknown header message & 'fail if unknown always' flag set");
+
+    /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
+    H5E_BEGIN_TRY {
+	did = H5Dopen2(loc_bogus, "Dataset3", H5P_DEFAULT);
+    } H5E_END_TRY;
+    if(did >= 0) {
+	H5Dclose(did);
+        TEST_ERROR
+    } /* end if */
+
+    /* Closing: FILE_BOGUS */
+    if(bogus_id == H5O_BOGUS_INVALID_ID) {
+	if(H5Gclose(gid_bogus) < 0)
+	    TEST_ERROR
+    }
+    if(H5Fclose(fid_bogus) < 0)
+	TEST_ERROR
+
+
+    PASSED();
+
+    return 0;
+
+error:
+    H5E_BEGIN_TRY {
+        H5Fclose(fid);
+	H5Gclose(gid);
+        H5Fclose(fid_bogus);
+	H5Gclose(gid_bogus);
+	H5Dclose(did);
+	H5Sclose(sid);
+	H5Aclose(aid);
+    } H5E_END_TRY;
+
+    return -1;
+} /* test_unknown() */
+
 
 /*-------------------------------------------------------------------------
  * Function:	main
@@ -664,180 +952,28 @@ main(void)
 
         PASSED();
 
+        /* Close the file we created */
+        if(H5Fclose(file) < 0)
+            TEST_ERROR
 
         /* Test reading datasets with undefined object header messages
          * and the various "fail/mark if unknown" object header message flags
          */
-        HDputs("Accessing objects with unknown header messages:");
+	HDputs("Accessing objects with unknown header messages: H5O_BOGUS_VALID_ID");
         {
-            hid_t file2;                    /* File ID for 'bogus' object file */
-            hid_t sid;                      /* Dataspace ID */
-            hid_t aid;                      /* Attribute ID */
-            const char *testfile = H5_get_srcdir_filename(FILE_BOGUS);
-
-            TESTING("object with unknown header message and no flags set");
-
-            /* Open the file with objects that have unknown header messages (generated with gen_bogus.c) */
-            if((file2 = H5Fopen(testfile, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Open the dataset with the unknown header message, but no extra flags */
-            if((dset = H5Dopen2(file2, "/Dataset1", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            PASSED();
-
-            TESTING("object in r/o file with unknown header message & 'fail if unknown and open for write' flag set");
-
-            /* Open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
-            if((dset = H5Dopen2(file2, "/Dataset2", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            PASSED();
-
-            TESTING("object in r/o file with unknown header message & 'fail if unknown always' flag set");
-
-            /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
-            H5E_BEGIN_TRY {
-                dset = H5Dopen2(file2, "/Dataset3", H5P_DEFAULT);
-            } H5E_END_TRY;
-            if(dset >= 0) {
-                H5Dclose(dset);
-                TEST_ERROR
-            } /* end if */
-
-            PASSED();
-
-            TESTING("object with unknown header message & 'mark if unknown' flag set");
-
-            /* Copy object with "mark if unknown" flag on message into file that can be modified */
-            if(H5Ocopy(file2, "/Dataset4", file, "/Dataset4", H5P_DEFAULT, H5P_DEFAULT) < 0)
-                TEST_ERROR
-
-            /* Close the file we created (to flush changes to file) */
-            if(H5Fclose(file) < 0)
-                TEST_ERROR
-
-            /* Re-open the file created, with read-only permissions */
-            if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-                TEST_ERROR
-
-            /* Open the dataset with the "mark if unknown" message */
-            if((dset = H5Dopen2(file, "/Dataset4", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Check that the "unknown" message was _NOT_ marked */
-            if(H5O_check_msg_marked_test(dset, FALSE) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close the dataset */
-            if(H5Dclose(dset) < 0)
+            if(test_unknown(H5O_BOGUS_VALID_ID, filename, fapl) < 0)
                 TEST_ERROR
+        }
 
-            /* Close the file we created (to flush change to object header) */
-            if(H5Fclose(file) < 0)
-                TEST_ERROR
-
-            /* Re-open the file created */
-            if((file = H5Fopen(filename, H5F_ACC_RDWR, fapl)) < 0)
-                TEST_ERROR
-
-            /* Open the dataset with the "mark if unknown" message */
-            if((dset = H5Dopen2(file, "/Dataset4", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Create data space */
-            if((sid = H5Screate(H5S_SCALAR)) < 0)
-                FAIL_STACK_ERROR
-
-            /* Create an attribute, to get the object header into write access */
-            if((aid = H5Acreate2(dset, "Attr", H5T_NATIVE_INT, sid, H5P_DEFAULT, H5P_DEFAULT)) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close dataspace */
-            if(H5Sclose(sid) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close attribute */
-            if(H5Aclose(aid) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close the dataset */
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            /* Close the file we created (to flush change to object header) */
-            if(H5Fclose(file) < 0)
-                TEST_ERROR
-
-            /* Re-open the file created */
-            if((file = H5Fopen(filename, H5F_ACC_RDONLY, fapl)) < 0)
-                TEST_ERROR
-
-            /* Re-open the dataset with the "mark if unknown" message */
-            if((dset = H5Dopen2(file, "/Dataset4", H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            /* Check that the "unknown" message was marked */
-            if(H5O_check_msg_marked_test(dset, TRUE) < 0)
-                FAIL_STACK_ERROR
-
-            /* Close the dataset */
-            if(H5Dclose(dset) < 0)
-                TEST_ERROR
-
-            /* Close the file with the bogus objects */
-            if(H5Fclose(file2) < 0)
-                TEST_ERROR
-
-            PASSED();
-
-            /* Open the file with objects that have unknown header messages (generated with gen_bogus.c) with RW intent this time */
-            if((file2 = H5Fopen(testfile, H5F_ACC_RDWR, H5P_DEFAULT)) < 0)
-                TEST_ERROR
-
-            TESTING("object in r/w file with unknown header message & 'fail if unknown and open for write' flag set");
-
-            /* Attempt to open the dataset with the unknown header message, and "fail if unknown and open for write" flag */
-            H5E_BEGIN_TRY {
-                dset = H5Dopen2(file2, "/Dataset2", H5P_DEFAULT);
-            } H5E_END_TRY;
-            if(dset >= 0) {
-                H5Dclose(dset);
-                TEST_ERROR
-            } /* end if */
-
-            PASSED();
-
-            TESTING("object in r/w file with unknown header message & 'fail if unknown always' flag set");
-
-            /* Attempt to open the dataset with the unknown header message, and "fail if unknown always" flag */
-            H5E_BEGIN_TRY {
-                dset = H5Dopen2(file2, "/Dataset3", H5P_DEFAULT);
-            } H5E_END_TRY;
-            if(dset >= 0) {
-                H5Dclose(dset);
-                TEST_ERROR
-            } /* end if */
-
-            /* Close the file with the bogus objects */
-            if(H5Fclose(file2) < 0)
+        HDputs("Accessing objects with unknown header messages: H5O_BOGUS_INVALID_ID");
+        {
+            if(test_unknown(H5O_BOGUS_INVALID_ID, filename, fapl) < 0)
                 TEST_ERROR
-
-            PASSED();
         }
 
-        /* Close the file we created */
-        if(H5Fclose(file) < 0)
-            TEST_ERROR
-
-	    /* Test object header creation metadata cache issues */
-	    if(test_ohdr_cache(filename, fapl) < 0)
-            TEST_ERROR
+	/* Test object header creation metadata cache issues */
+	if(test_ohdr_cache(filename, fapl) < 0)
+	    TEST_ERROR
     } /* end for */
 
     /* Verify symbol table messages are cached */
diff --git a/test/tbogus.h5 b/test/tbogus.h5
index 875fbd8..91ab76f 100644
--- a/test/tbogus.h5
+++ b/test/tbogus.h5