4 files changed, 44 insertions, 25 deletions
diff --git a/java/test/TestH5Fbasic.java b/java/test/TestH5Fbasic.java
index fff9523..72a3c23 100644
--- a/java/test/TestH5Fbasic.java
+++ b/java/test/TestH5Fbasic.java
@@ -70,19 +70,6 @@ public class TestH5Fbasic {
     }
 
     @Test
-    public void testH5Fis_hdf5() {
-        boolean isH5 = false;
-
-        try {
-            isH5 = H5.H5Fis_hdf5(H5_FILE);
-        }
-        catch (Throwable err) {
-            fail("H5.H5Fis_hdf5 failed on " + H5_FILE + ": " + err);
-        }
-        assertTrue(isH5 == true);
-    }
-
-    @Test
     public void testH5Fis_accessible() {
         boolean isH5 = false;
 
diff --git a/java/test/TestH5Fparams.java b/java/test/TestH5Fparams.java
index 3d64aa9..40cbe4b 100644
--- a/java/test/TestH5Fparams.java
+++ b/java/test/TestH5Fparams.java
@@ -22,10 +22,12 @@ import java.io.File;
 
 import hdf.hdf5lib.H5;
 import hdf.hdf5lib.HDF5Constants;
+import hdf.hdf5lib.exceptions.HDF5FunctionArgumentException;
 import hdf.hdf5lib.structs.H5F_info2_t;
 
 import org.junit.After;
 import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.TestName;
@@ -55,11 +57,6 @@ public class TestH5Fparams {
     }
 
     @Test(expected = NullPointerException.class)
-    public void testH5Fis_hdf5_null() throws Throwable {
-        H5.H5Fis_hdf5(null);
-    }
-
-    @Test(expected = NullPointerException.class)
     public void testH5Fis_accessible_null() throws Throwable {
         H5.H5Fis_accessible(null, -1);
     }
@@ -74,7 +71,7 @@ public class TestH5Fparams {
         H5.H5Funmount(-1, null);
     }
 
-    @Test
+    @Ignore
     public void testH5Fis_hdf5_text() {
         File txtFile = null;
         boolean isH5 = false;
@@ -195,7 +192,7 @@ public class TestH5Fparams {
                         HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
             }
             catch (Throwable err) {
-                fail("H5.H5Fopen: " + err);
+                fail("H5.H5Fcreate: " + err);
             }
 
             try {
@@ -215,4 +212,42 @@ public class TestH5Fparams {
             try {H5.H5Fclose(fid);} catch (Exception ex) {}
         }
     }
+
+    @Ignore//(expected = HDF5FunctionArgumentException.class)
+    public void testH5Fset_libver_bounds_invalidlow() throws Throwable {
+        long fid = -1;
+
+        try {
+            try {
+                fid = H5.H5Fcreate("test.h5", HDF5Constants.H5F_ACC_TRUNC,
+                        HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
+            }
+            catch (Throwable err) {
+                fail("H5.H5Fcreate: " + err);
+            }
+            H5.H5Fset_libver_bounds(fid, 5, HDF5Constants.H5F_LIBVER_LATEST);
+        }
+        finally {
+            try {H5.H5Fclose(fid);} catch (Exception ex) {}
+        }
+    }
+
+    @Ignore//(expected = HDF5FunctionArgumentException.class)
+    public void testH5Fset_libver_bounds_invalidhigh() throws Throwable {
+        long fid = -1;
+
+        try {
+            try {
+                fid = H5.H5Fcreate("test.h5", HDF5Constants.H5F_ACC_TRUNC,
+                        HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
+            }
+            catch (Throwable err) {
+                fail("H5.H5Fcreate: " + err);
+            }
+            H5.H5Fset_libver_bounds(fid, HDF5Constants.H5F_LIBVER_V110, HDF5Constants.H5F_LIBVER_V110+1);
+        }
+        finally {
+            try {H5.H5Fclose(fid);} catch (Exception ex) {}
+        }
+    }
 }
diff --git a/java/test/testfiles/JUnit-TestH5Fbasic.txt b/java/test/testfiles/JUnit-TestH5Fbasic.txt
index 05504de..cd4e282 100644
--- a/java/test/testfiles/JUnit-TestH5Fbasic.txt
+++ b/java/test/testfiles/JUnit-TestH5Fbasic.txt
@@ -1,7 +1,6 @@
 JUnit version 4.11
 .testH5Fget_mdc_size
 .testH5Fget_mdc_hit_rate
-.testH5Fis_hdf5
 .testH5F_dset_no_attrs_hint
 .testH5Fget_freespace
 .testH5Fclose
@@ -19,5 +18,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (17 tests)
+OK (16 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Fparams.txt b/java/test/testfiles/JUnit-TestH5Fparams.txt
index e91cbdc..91a8435 100644
--- a/java/test/testfiles/JUnit-TestH5Fparams.txt
+++ b/java/test/testfiles/JUnit-TestH5Fparams.txt
@@ -9,10 +9,8 @@ JUnit version 4.11
 .testH5Funmount_null
 .testH5Fclose_negative
 .testH5Fopen_null
-.testH5Fis_hdf5_null
-.testH5Fis_hdf5_text
 
 Time:  XXXX
 
-OK (12 tests)
+OK (10 tests)