mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-01-30 15:32:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix java for new H5Fget_info function

Browse Source
This commit is contained in:
Allen Byrne 2019-04-15 11:19:29 -05:00
parent 5696c02a3c
commit 6bf109d1ae
3 changed files with 37 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
java/src/jni/h5fImp.c
View File

@ -260,11 +260,11 @@ done:
*/
JNIEXPORT jint JNICALL
Java_hdf_hdf5lib_H5_H5Fget_1intent
(JNIEnv *env, jclass cls, jlong file_id)
(JNIEnv *env, jclass clss, jlong file_id)
{
unsigned intent = 0;
UNUSED(cls);
UNUSED(clss);
if (H5Fget_intent((hid_t)file_id, &intent) < 0)
H5_LIBRARY_ERROR(ENVONLY);
@ -280,18 +280,18 @@ done:
*/
JNIEXPORT jlong JNICALL
Java_hdf_hdf5lib_H5_H5Fget_1fileno
(JNIEnv *env, jclass cls, jlong file_id)
(JNIEnv *env, jclass clss, jlong file_id)
{
unsigned long fileno = 0;
UNUSED(cls);
UNUSED(clss);
if (H5Fget_intent((hid_t)file_id, &fileno) < 0)
if (H5Fget_fileno((hid_t)file_id, &fileno) < 0)
H5_LIBRARY_ERROR(ENVONLY);
done:
return (jlong)fileno;
} /* end Java_hdf_hdf5lib_H5_H5Fget_1intent */
} /* end Java_hdf_hdf5lib_H5_H5Fget_1fileno */
/*
* Class: hdf_hdf5lib_H5

174
java/test/TestH5F.java
View File

@ -50,7 +50,6 @@ public class TestH5F {
HDF5Constants.H5F_OBJ_DATATYPE, HDF5Constants.H5F_OBJ_ATTR,
HDF5Constants.H5F_OBJ_ALL };
long H5fid = -1;
long H5fid2 = -1;
private final void _deleteFile(String filename) {
File file = new File(filename);
@ -69,10 +68,6 @@ public class TestH5F {
H5fid = H5.H5Fcreate(H5_FILE, HDF5Constants.H5F_ACC_TRUNC,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Fflush(H5fid, HDF5Constants.H5F_SCOPE_LOCAL);
H5fid2 = H5.H5Fcreate(H5_FILE2, HDF5Constants.H5F_ACC_TRUNC,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Fflush(H5fid2, HDF5Constants.H5F_SCOPE_LOCAL);
}
@After
@ -81,12 +76,7 @@ public class TestH5F {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
H5fid = -1;
}
if (H5fid2 > 0) {
try {H5.H5Fclose(H5fid2);} catch (Exception ex) {}
H5fid2 = -1;
}
_deleteFile(H5_FILE);
_deleteFile(H5_FILE2);
System.out.println();
}
@ -106,28 +96,12 @@ public class TestH5F {
@Test(expected = HDF5LibraryException.class)
public void testH5Fget_create_plist_closed() throws Throwable {
long fid = -1;
if (H5fid > 0) {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
H5fid = -1;
}
try {
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
try {
H5.H5Fclose(fid);
}
catch (Exception ex) {
}
// it should fail because the file was closed.
H5.H5Fget_create_plist(fid);
H5.H5Fget_create_plist(H5fid);
}
@Test
@ -146,34 +120,17 @@ public class TestH5F {
@Test(expected = HDF5LibraryException.class)
public void testH5Fget_access_plist_closed() throws Throwable {
long fid = -1;
if (H5fid > 0) {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
H5fid = -1;
}
try {
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
try {
H5.H5Fclose(fid);
}
catch (Exception ex) {
}
// it should fail because the file was closed.
H5.H5Fget_access_plist(fid);
H5.H5Fget_access_plist(H5fid);
}
@Test
public void testH5Fget_intent_rdwr() {
int intent = 0;
long fid = -1;
if (H5fid > 0) {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
@ -181,31 +138,24 @@ public class TestH5F {
}
try {
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
H5fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
try {
intent = H5.H5Fget_intent(fid);
intent = H5.H5Fget_intent(H5fid);
}
catch (Throwable err) {
fail("H5.H5Fget_intent: " + err);
}
assertEquals(HDF5Constants.H5F_ACC_RDWR, intent);
try {
H5.H5Fclose(fid);
}
catch (Exception ex) {
}
}
@Test
public void testH5Fget_intent_rdonly() {
int intent = 0;
long fid = -1;
if (H5fid > 0) {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
@ -213,25 +163,19 @@ public class TestH5F {
}
try {
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDONLY,
H5fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDONLY,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
try {
intent = H5.H5Fget_intent(fid);
intent = H5.H5Fget_intent(H5fid);
}
catch (Throwable err) {
fail("H5.H5Fget_intent: " + err);
}
assertEquals(HDF5Constants.H5F_ACC_RDONLY, intent);
try {
H5.H5Fclose(fid);
}
catch (Exception ex) {
}
}
@Test
@ -241,115 +185,55 @@ public class TestH5F {
long fid1 = -1;
long fid2 = -1;
if (H5fid > 0) {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
H5fid = -1;
}
try {
fid1 = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
fid1 = H5.H5Fcreate(H5_FILE2, HDF5Constants.H5F_ACC_TRUNC,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Fflush(fid1, HDF5Constants.H5F_SCOPE_LOCAL);
assertTrue("H5Fcreate failed", fid1 > 0);
fid2 = H5.H5Fopen(H5_FILE2, HDF5Constants.H5F_ACC_RDWR,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
try {
fid2 = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
try {
assertTrue("H5Fopen failed", fid2 > 0);
fileno1 = H5.H5Fget_fileno(fid1);
}
catch (Throwable err) {
fail("H5.H5Fget_fileno: " + err);
}
try {
assertTrue("H5Fget_fileno1="+fileno1, fileno1 > 0);
fileno2 = H5.H5Fget_fileno(fid2);
assertTrue("H5Fget_fileno2="+fileno2, fileno2 > 0);
assertEquals("fileno1["+fileno1+"]!=fileno2["+fileno2+"]", fileno1, fileno2);
}
catch (Throwable err) {
fail("H5.H5Fget_fileno: " + err);
fail("testH5Fget_fileno_same: " + err);
}
assertEquals(fileno1, fileno2);
try {
finally {
H5.H5Fclose(fid1);
}
catch (Exception ex) {
}
try {
H5.H5Fclose(fid2);
}
catch (Exception ex) {
}
}
@Test
public void testH5Fget_fileno_diff() {
long fileno1 = 0;
long fileno2 = 0;
long fid1 = -1;
long fid2 = -1;
if (H5fid > 0) {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
H5fid = -1;
}
if (H5fid2 > 0) {
try {H5.H5Fclose(H5fid2);} catch (Exception ex) {}
H5fid2 = -1;
}
try {
fid1 = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
fid2 = H5.H5Fcreate(H5_FILE2, HDF5Constants.H5F_ACC_TRUNC,
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
H5.H5Fflush(fid2, HDF5Constants.H5F_SCOPE_LOCAL);
assertTrue("H5Fcreate failed", fid2 > 0);
try {
fid2 = H5.H5Fopen(H5_FILE2, HDF5Constants.H5F_ACC_RDWR,
HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
fail("H5.H5Fopen: " + err);
}
try {
fileno1 = H5.H5Fget_fileno(fid1);
}
catch (Throwable err) {
fail("H5.H5Fget_fileno: " + err);
}
try {
fileno1 = H5.H5Fget_fileno(H5fid);
assertTrue("H5Fget_fileno1="+fileno1, fileno1 > 0);
fileno2 = H5.H5Fget_fileno(fid2);
assertTrue("H5Fget_fileno2="+fileno2, fileno2 > 0);
assertNotEquals("fileno1["+fileno1+"]==fileno2["+fileno2+"]", fileno1, fileno2);
}
catch (Throwable err) {
fail("H5.H5Fget_fileno: " + err);
fail("testH5Fget_fileno_diff: " + err);
}
assertNotEquals(fileno1, fileno2);
try {
H5.H5Fclose(fid1);
}
catch (Exception ex) {
}
try {
finally {
H5.H5Fclose(fid2);
}
catch (Exception ex) {
}
}
@Test

4
java/test/testfiles/JUnit-TestH5F.txt
View File

@ -1,5 +1,7 @@
JUnit version 4.11
.testH5Fget_access_plist
.testH5Fget_fileno_diff
.testH5Fget_fileno_same
.testH5Fget_obj_ids
.testH5Fget_intent_rdwr
.testH5Fget_access_plist_closed
@ -7,8 +9,6 @@ JUnit version 4.11
.testH5Fget_intent_rdonly
.testH5Fget_create_plist
.testH5Fget_obj_count
.testH5Fget_fileno_same
.testH5Fget_fileno_diff
Time: XXXX