Brings java wrapper updates from develop

The wrappers compile but fail tests due to some missing develop
functionality

1 files changed, 27 insertions, 28 deletions

diff --git a/java/test/TestH5Obasic.java b/java/test/TestH5Obasic.java
index 89474c4..350b7aa 100644
--- a/java/test/TestH5Obasic.java
+++ b/java/test/TestH5Obasic.java
@@ -1,6 +1,5 @@
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  * 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     *
@@ -41,7 +40,7 @@ public class TestH5Obasic {
     private static final String H5_FILE = "h5ex_g_iterateO1.hdf";
     private static H5O_token_t H5la_ds1 = null;
     private static H5O_token_t H5la_l1 = null;
-    long H5fid = -1;
+    long H5fid = HDF5Constants.H5I_INVALID_HID;
 
     @Before
     public void openH5file()
@@ -69,7 +68,7 @@ public class TestH5Obasic {
 
     @Test(expected = HDF5LibraryException.class)
     public void testH5Oopen_not_exists() throws Throwable {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
 
         oid = H5.H5Oopen(H5fid, "Never_created", HDF5Constants.H5P_DEFAULT);
 
@@ -78,7 +77,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_info_dataset() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
 
         try {
@@ -96,7 +95,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_info_hardlink() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             oid = H5.H5Oopen(H5fid, "L1", HDF5Constants.H5P_DEFAULT);
@@ -113,7 +112,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_info_group() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             oid = H5.H5Oopen(H5fid, "G1", HDF5Constants.H5P_DEFAULT);
@@ -130,7 +129,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_info_datatype() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             oid = H5.H5Oopen(H5fid, "DT1", HDF5Constants.H5P_DEFAULT);
@@ -234,7 +233,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_info_by_idx_n0() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             oid = H5.H5Oopen(H5fid, "DS1", HDF5Constants.H5P_DEFAULT);
@@ -260,7 +259,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_info_by_idx_n3() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             oid = H5.H5Oopen(H5fid, "L1", HDF5Constants.H5P_DEFAULT);
@@ -286,7 +285,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_dataset() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_native_info_t native_info = null;
 
         try {
@@ -306,7 +305,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_hardlink() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_native_info_t native_info = null;
 
         try {
@@ -326,7 +325,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_group() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_native_info_t native_info = null;
 
         try {
@@ -346,7 +345,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_datatype() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_native_info_t native_info = null;
 
         try {
@@ -376,10 +375,10 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_by_name_dataset() {
-    	H5O_native_info_t native_info = null;
+        H5O_native_info_t native_info = null;
 
         try {
-        	native_info = H5.H5Oget_native_info_by_name(H5fid, "DS1", HDF5Constants.H5P_DEFAULT);
+            native_info = H5.H5Oget_native_info_by_name(H5fid, "DS1", HDF5Constants.H5P_DEFAULT);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -393,10 +392,10 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_by_name_hardlink() {
-    	H5O_native_info_t native_info = null;
+        H5O_native_info_t native_info = null;
 
         try {
-        	native_info = H5.H5Oget_native_info_by_name(H5fid, "L1", HDF5Constants.H5P_DEFAULT);
+            native_info = H5.H5Oget_native_info_by_name(H5fid, "L1", HDF5Constants.H5P_DEFAULT);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -410,10 +409,10 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_by_name_group() {
-    	H5O_native_info_t native_info = null;
+        H5O_native_info_t native_info = null;
 
         try {
-        	native_info = H5.H5Oget_native_info_by_name(H5fid, "G1", HDF5Constants.H5P_DEFAULT);
+            native_info = H5.H5Oget_native_info_by_name(H5fid, "G1", HDF5Constants.H5P_DEFAULT);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -427,10 +426,10 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_by_name_datatype() {
-    	H5O_native_info_t native_info = null;
+        H5O_native_info_t native_info = null;
 
         try {
-        	native_info = H5.H5Oget_native_info_by_name(H5fid, "DT1", HDF5Constants.H5P_DEFAULT);
+            native_info = H5.H5Oget_native_info_by_name(H5fid, "DT1", HDF5Constants.H5P_DEFAULT);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -464,7 +463,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_by_idx_n0() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_native_info_t native_info = null;
         H5O_hdr_info_t ohdr;
         H5_ih_info_t oinfo;
@@ -486,7 +485,7 @@ public class TestH5Obasic {
         try {H5.H5Oclose(oid);} catch (Exception ex) {}
 
         try {
-        	native_info = H5.H5Oget_native_info_by_idx(H5fid, "/", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 0, HDF5Constants.H5P_DEFAULT);
+            native_info = H5.H5Oget_native_info_by_idx(H5fid, "/", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 0, HDF5Constants.H5P_DEFAULT);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -503,7 +502,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oget_native_info_by_idx_n3() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_native_info_t native_info = null;
         H5O_hdr_info_t ohdr;
         H5_ih_info_t oinfo;
@@ -525,7 +524,7 @@ public class TestH5Obasic {
         try {H5.H5Oclose(oid);} catch (Exception ex) {}
 
         try {
-        	native_info = H5.H5Oget_native_info_by_idx(H5fid, "/", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 3, HDF5Constants.H5P_DEFAULT);
+            native_info = H5.H5Oget_native_info_by_idx(H5fid, "/", HDF5Constants.H5_INDEX_NAME, HDF5Constants.H5_ITER_INC, 3, HDF5Constants.H5P_DEFAULT);
         }
         catch (Throwable err) {
             err.printStackTrace();
@@ -630,7 +629,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oopen_by_token() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             try {
@@ -668,7 +667,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oopen_by_idx_n0() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             try {
@@ -706,7 +705,7 @@ public class TestH5Obasic {
 
     @Test
     public void testH5Oopen_by_idx_n3() {
-        long oid = -1;
+        long oid = HDF5Constants.H5I_INVALID_HID;
         H5O_info_t obj_info = null;
         try {
             try {