Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

1 files changed, 28 insertions, 30 deletions

diff --git a/java/test/TestH5Lbasic.java b/java/test/TestH5Lbasic.java
index 0a836c1..a28fc3d 100644
--- a/java/test/TestH5Lbasic.java
+++ b/java/test/TestH5Lbasic.java
@@ -1,12 +1,11 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * Copyright by The HDF Group.                                               *
- * Copyright by the Board of Trustees of the University of Illinois.         *
  * All rights reserved.                                                      *
  *                                                                           *
  * This file is part of HDF5.  The full HDF5 copyright notice, including     *
  * terms governing use, modification, and redistribution, is contained in    *
  * the COPYING file, which can be found at the root of the source code       *
- * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * distribution tree, or in https://www.hdfgroup.org/licenses.               *
  * If you do not have access to either file, you may request a copy from     *
  * help@hdfgroup.org.                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
@@ -21,8 +20,8 @@ import java.util.ArrayList;
 
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
-import hdf.hdf5lib.callbacks.H5L_iterate_cb;
 import hdf.hdf5lib.callbacks.H5L_iterate_t;
+import hdf.hdf5lib.callbacks.H5L_iterate_opdata_t;
 import hdf.hdf5lib.exceptions.HDF5LibraryException;
 import hdf.hdf5lib.structs.H5L_info_t;
 
@@ -35,7 +34,7 @@ import org.junit.rules.TestName;
 public class TestH5Lbasic {
     @Rule public TestName testname = new TestName();
     private static final String H5_FILE = "h5ex_g_iterateL1.hdf";
-    long H5fid = -1;
+    long H5fid = HDF5Constants.H5I_INVALID_HID;
 
     @Before
     public void openH5file()
@@ -119,9 +118,8 @@ public class TestH5Lbasic {
             err.printStackTrace();
             fail("H5.H5Lget_info: " + err);
         }
-        assertFalse("H5Lget_info ",link_info==null);
+        assertFalse("H5Lget_info",link_info==null);
         assertTrue("H5Lget_info link type",link_info.type==HDF5Constants.H5L_TYPE_HARD);
-        assertTrue("Link Address ",link_info.address_val_size>0);
     }
 
     @Test(expected = HDF5LibraryException.class)
@@ -155,7 +153,7 @@ public class TestH5Lbasic {
             err.printStackTrace();
             fail("H5.H5Lget_info_by_idx: " + err);
         }
-        assertFalse("H5Lget_info_by_idx ",link_info==null);
+        assertFalse("H5Lget_info_by_idx",link_info==null);
         assertTrue("H5Lget_info_by_idx link type",link_info.type==HDF5Constants.H5L_TYPE_HARD);
         try {
             link_info2 = H5.H5Lget_info(H5fid, "DS1", HDF5Constants.H5P_DEFAULT);
@@ -164,7 +162,7 @@ public class TestH5Lbasic {
             err.printStackTrace();
             fail("H5.H5Lget_info: " + err);
         }
-        assertTrue("Link Address ",link_info.address_val_size==link_info2.address_val_size);
+        assertTrue("Link Value Size", link_info.val_size == link_info2.val_size);
     }
 
     @Test
@@ -178,7 +176,7 @@ public class TestH5Lbasic {
             err.printStackTrace();
             fail("H5.H5Lget_info_by_idx: " + err);
         }
-        assertFalse("H5Lget_info_by_idx ",link_info==null);
+        assertFalse("H5Lget_info_by_idx",link_info==null);
         assertTrue("H5Lget_info_by_idx link type",link_info.type==HDF5Constants.H5L_TYPE_HARD);
         try {
             link_info2 = H5.H5Lget_info(H5fid, "L1", HDF5Constants.H5P_DEFAULT);
@@ -187,7 +185,7 @@ public class TestH5Lbasic {
             err.printStackTrace();
             fail("H5.H5Lget_info: " + err);
         }
-        assertTrue("Link Address ",link_info.address_val_size==link_info2.address_val_size);
+        assertTrue("Link Value Size", link_info.val_size == link_info2.val_size);
     }
 
     @Test(expected = HDF5LibraryException.class)
@@ -233,18 +231,18 @@ public class TestH5Lbasic {
                 this.link_type = type;
             }
         }
-        class H5L_iter_data implements H5L_iterate_t {
+        class H5L_iter_data implements H5L_iterate_opdata_t {
             public ArrayList<idata> iterdata = new ArrayList<idata>();
         }
-        H5L_iterate_t iter_data = new H5L_iter_data();
-        class H5L_iter_callback implements H5L_iterate_cb {
-            public int callback(long group, String name, H5L_info_t info, H5L_iterate_t op_data) {
+        H5L_iterate_opdata_t iter_data = new H5L_iter_data();
+        class H5L_iter_callback implements H5L_iterate_t {
+            public int callback(long group, String name, H5L_info_t info, H5L_iterate_opdata_t op_data) {
                 idata id = new idata(name, info.type);
                 ((H5L_iter_data)op_data).iterdata.add(id);
                 return 0;
             }
         }
-        H5L_iterate_cb iter_cb = new H5L_iter_callback();
+        H5L_iterate_t iter_cb = new H5L_iter_callback();
         try {
             H5.H5Lvisit(H5fid, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, iter_cb, iter_data);
         }
@@ -271,18 +269,18 @@ public class TestH5Lbasic {
                 this.link_type = type;
             }
         }
-        class H5L_iter_data implements H5L_iterate_t {
+        class H5L_iter_data implements H5L_iterate_opdata_t {
             public ArrayList<idata> iterdata = new ArrayList<idata>();
         }
-        H5L_iterate_t iter_data = new H5L_iter_data();
-        class H5L_iter_callback implements H5L_iterate_cb {
-            public int callback(long group, String name, H5L_info_t info, H5L_iterate_t op_data) {
+        H5L_iterate_opdata_t iter_data = new H5L_iter_data();
+        class H5L_iter_callback implements H5L_iterate_t {
+            public int callback(long group, String name, H5L_info_t info, H5L_iterate_opdata_t op_data) {
                 idata id = new idata(name, info.type);
                 ((H5L_iter_data)op_data).iterdata.add(id);
                 return 0;
             }
         }
-        H5L_iterate_cb iter_cb = new H5L_iter_callback();
+        H5L_iterate_t iter_cb = new H5L_iter_callback();
         try {
             H5.H5Lvisit_by_name(H5fid, "G1", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, iter_cb, iter_data, HDF5Constants.H5P_DEFAULT);
         }
@@ -305,18 +303,18 @@ public class TestH5Lbasic {
                 this.link_type = type;
             }
         }
-        class H5L_iter_data implements H5L_iterate_t {
+        class H5L_iter_data implements H5L_iterate_opdata_t {
             public ArrayList<idata> iterdata = new ArrayList<idata>();
         }
-        H5L_iterate_t iter_data = new H5L_iter_data();
-        class H5L_iter_callback implements H5L_iterate_cb {
-            public int callback(long group, String name, H5L_info_t info, H5L_iterate_t op_data) {
+        H5L_iterate_opdata_t iter_data = new H5L_iter_data();
+        class H5L_iter_callback implements H5L_iterate_t {
+            public int callback(long group, String name, H5L_info_t info, H5L_iterate_opdata_t op_data) {
                 idata id = new idata(name, info.type);
                 ((H5L_iter_data)op_data).iterdata.add(id);
                 return 0;
             }
         }
-        H5L_iterate_cb iter_cb = new H5L_iter_callback();
+        H5L_iterate_t iter_cb = new H5L_iter_callback();
         try {
             H5.H5Literate(H5fid, HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 0L, iter_cb, iter_data);
         }
@@ -342,18 +340,18 @@ public class TestH5Lbasic {
                 this.link_type = type;
             }
         }
-        class H5L_iter_data implements H5L_iterate_t {
+        class H5L_iter_data implements H5L_iterate_opdata_t {
             public ArrayList<idata> iterdata = new ArrayList<idata>();
         }
-        H5L_iterate_t iter_data = new H5L_iter_data();
-        class H5L_iter_callback implements H5L_iterate_cb {
-            public int callback(long group, String name, H5L_info_t info, H5L_iterate_t op_data) {
+        H5L_iterate_opdata_t iter_data = new H5L_iter_data();
+        class H5L_iter_callback implements H5L_iterate_t {
+            public int callback(long group, String name, H5L_info_t info, H5L_iterate_opdata_t op_data) {
                 idata id = new idata(name, info.type);
                 ((H5L_iter_data)op_data).iterdata.add(id);
                 return 0;
             }
         }
-        H5L_iterate_cb iter_cb = new H5L_iter_callback();
+        H5L_iterate_t iter_cb = new H5L_iter_callback();
         try {
             H5.H5Literate_by_name(H5fid, "G1", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 0L, iter_cb, iter_data, HDF5Constants.H5P_DEFAULT);
         }