merge and fix conflict

1 files changed, 44 insertions, 4 deletions

diff --git a/java/test/TestH5VL.java b/java/test/TestH5VL.java
index 0397be1..d774dbb 100644
--- a/java/test/TestH5VL.java
+++ b/java/test/TestH5VL.java
@@ -69,14 +69,46 @@ public class TestH5VL {
 
     @Test
     public void testH5VLget_connector_id() {
+    	String H5_FILE = "testFvl.h5";
+
+        long H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC,
+                HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
+
+    	try {
+    		long native_id = H5.H5VLget_connector_id(H5fid);
+    		assertTrue("H5.H5VLget_connector_id", native_id >= 0);
+
+    		/*
+    		 * If HDF5_VOL_CONNECTOR is set, this might not be the
+    		 * native connector. Only check for the native connector
+    		 * if this isn't set.
+    		 */
+    		String connector = System.getenv("HDF5_VOL_CONNECTOR");
+    		if (connector == null)
+    			assertEquals(HDF5Constants.H5VL_NATIVE, native_id);
+    	}
+    	catch (Throwable err) {
+    		err.printStackTrace();
+    		fail("H5.H5VLget_connector_id " + err);
+    	}
+        finally {
+            if (H5fid > 0) {
+                try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
+            }
+            _deleteFile(H5_FILE);
+        }
+    }
+
+    @Test
+    public void testH5VLget_connector_id_by_name() {
         try {
-            long native_id = H5.H5VLget_connector_id(HDF5Constants.H5VL_NATIVE_NAME);
-            assertTrue("H5.H5VLget_connector_id H5VL_NATIVE_NAME", native_id >= 0);
+            long native_id = H5.H5VLget_connector_id_by_name(HDF5Constants.H5VL_NATIVE_NAME);
+            assertTrue("H5.H5VLget_connector_id_by_name H5VL_NATIVE_NAME", native_id >= 0);
             assertEquals(HDF5Constants.H5VL_NATIVE, native_id);
         }
         catch (Throwable err) {
             err.printStackTrace();
-            fail("H5.H5VLget_connector_id " + err);
+            fail("H5.H5VLget_connector_id_by_name " + err);
         }
     }
 
@@ -90,7 +122,15 @@ public class TestH5VL {
 
         try {
             String native_name = H5.H5VLget_connector_name(H5fid);
-            assertTrue("H5.H5VLget_connector_name H5VL_NATIVE", native_name.compareToIgnoreCase(HDF5Constants.H5VL_NATIVE_NAME)==0);
+
+    		/*
+    		 * If HDF5_VOL_CONNECTOR is set, this might not be the
+    		 * native connector. Only check for the native connector
+    		 * if this isn't set.
+    		 */
+    		String connector = System.getenv("HDF5_VOL_CONNECTOR");
+    		if (connector == null)
+    			assertTrue("H5.H5VLget_connector_name H5VL_NATIVE", native_name.compareToIgnoreCase(HDF5Constants.H5VL_NATIVE_NAME)==0);
         }
         catch (Throwable err) {
             err.printStackTrace();