Merge pull request #21 in ~VCHOI/my_third_fork from develop to bugfix/HDFFV-10585-investigate-slowness-of-regular

* commit '0ea77179d507bd2c29f3b9b357a0c35d4077b29c': (39 commits)
  Fix the errors when updating the versions in the new 1.13 develop branch.
  add missing version to list
  Add new versioned filename to list
  Update N_FSINFO_VERSION_BOUNDS to H5F_LIBVER_NBOUND.
  Remove file script
  Update versioning to next major version
  Update develop branch version to 1.13.0 after creation of hdf5_1_12 branch.
  Merge Binh-Minh's changes for code improvement to chunk_info.c (PR #1942) to develop branch.
  Update to current external file population.
  Revert else-if to single line.
  Fix missing option and incorrect close
  Revert "Moved NDEBUG guards to H5EA_DEBUG in H5EA package."
  Revert "Fix for H5EA debug package when built in release mode."
  Change print calls to HD-wrapped. Minor formatting tweaks (inc. regressions and in-file style-matching).
  Refactor h5repackgentest to have more modular internals, for easier addition of new tests. Update manifest and test script for new hdf5 external-storage .h5 files.
  Remove obsolete symbol
  small syntax changes
  Renamed get/set_time() calls in the tools library to avoid name clash when building static parallel HDF5 w/ static linking to OpenMPI.
  Change unused variable to generic form
  Whitespace cleanup
  ...

1 files changed, 15 insertions, 16 deletions

diff --git a/java/test/TestH5.java b/java/test/TestH5.java
index d63ef01..2bee075 100644
--- a/java/test/TestH5.java
+++ b/java/test/TestH5.java
@@ -54,8 +54,8 @@ public class TestH5 {
     /**
      * Test method for {@link hdf.hdf5lib.H5#J2C(int)}.
      * NOTE:
-     * H5F_ACC_DEBUG no longer prints any special debug info. The symbol is
-     * being retained and will be listed as deprecated in HDF5 1.10.0.
+     * H5F_ACC_DEBUG no longer prints any special debug info. Even though the symbol is
+     * being retained hdf java does not access the symbol.
      */
     @Test
     public void testJ2C() {
@@ -63,7 +63,6 @@ public class TestH5 {
         int H5F_ACC_RDWR = 0x0001;
         int H5F_ACC_TRUNC = 0x0002;
         int H5F_ACC_EXCL = 0x0004;
-        int H5F_ACC_DEBUG =  0x0000; // HDFFV-1074 was 0x0008;
         int H5F_ACC_CREAT = 0x0010;
         int H5F_OBJ_FILE = 0x0001;
         int H5F_OBJ_DATASET = 0x0002;
@@ -75,13 +74,13 @@ public class TestH5 {
         int H5F_OBJ_LOCAL = 0x0020;
 
         int definedValues[] = { H5F_ACC_RDONLY, H5F_ACC_RDWR, H5F_ACC_TRUNC,
-                H5F_ACC_EXCL, H5F_ACC_DEBUG, H5F_ACC_CREAT, H5F_OBJ_FILE,
+                H5F_ACC_EXCL, H5F_ACC_CREAT, H5F_OBJ_FILE,
                 H5F_OBJ_DATASET, H5F_OBJ_GROUP, H5F_OBJ_DATATYPE, H5F_OBJ_ATTR,
                 H5F_OBJ_ALL, H5F_OBJ_LOCAL };
 
         int j2cValues[] = { HDF5Constants.H5F_ACC_RDONLY,
                 HDF5Constants.H5F_ACC_RDWR, HDF5Constants.H5F_ACC_TRUNC,
-                HDF5Constants.H5F_ACC_EXCL, H5F_ACC_DEBUG,
+                HDF5Constants.H5F_ACC_EXCL,
                 HDF5Constants.H5F_ACC_CREAT, HDF5Constants.H5F_OBJ_FILE,
                 HDF5Constants.H5F_OBJ_DATASET, HDF5Constants.H5F_OBJ_GROUP,
                 HDF5Constants.H5F_OBJ_DATATYPE, HDF5Constants.H5F_OBJ_ATTR,
@@ -162,7 +161,7 @@ public class TestH5 {
      */
     @Test
     public void testH5get_libversion() {
-        int libversion[] = { 1, 11, 6 };
+        int libversion[] = { 1, 13, 0 };
 
         try {
             H5.H5get_libversion(libversion);
@@ -177,7 +176,7 @@ public class TestH5 {
         for (int i = 0; i < 2; i++)
             assertFalse(libversion[i] == 0);
     }
-    
+
     /**
      * Test method for {@link hdf.hdf5lib.H5#H5get_libversion(int[])}
      * to ensure a null libversion parameter causes the function to
@@ -185,14 +184,14 @@ public class TestH5 {
      */
     @Test
     public void testH5get_libversion_null_param() {
-    	try {
-    		H5.H5get_libversion(null);
-    	}
-    	catch (Throwable err) {
-    		return;
-    	}
-    	
-    	fail("H5.H5get_libversion: succeeded with a null libversion parameter!");
+        try {
+            H5.H5get_libversion(null);
+        }
+        catch (Throwable err) {
+            return;
+        }
+
+        fail("H5.H5get_libversion: succeeded with a null libversion parameter!");
     }
 
     /**
@@ -201,7 +200,7 @@ public class TestH5 {
      */
     @Test
     public void testH5check_version() {
-        int majnum = 1, minnum = 11, relnum = 6;
+        int majnum = 1, minnum = 13, relnum = 0;
 
         try {
             H5.H5check_version(majnum, minnum, relnum);