Squashed commit of the token_refactoring branch:

This commit is contained in:
Dana Robinson
2020-01-16 13:29:34 -08:00
parent 024f7ba092
commit a92c735c9b
225 changed files with 14022 additions and 4695 deletions

View File

@@ -22,8 +22,8 @@ import java.util.ArrayList;
import hdf.hdf5lib.H5;
import hdf.hdf5lib.HDF5Constants;
import hdf.hdf5lib.callbacks.H5O_iterate_cb;
import hdf.hdf5lib.callbacks.H5O_iterate_t;
import hdf.hdf5lib.callbacks.H5O_iterate_opdata_t;
import hdf.hdf5lib.exceptions.HDF5Exception;
import hdf.hdf5lib.exceptions.HDF5LibraryException;
import hdf.hdf5lib.structs.H5O_info_t;
@@ -264,9 +264,9 @@ public class TestH5Ocreate {
err.printStackTrace();
fail("H5.H5Oget_info: " + err);
}
assertFalse("H5Oget_info ", obj_info==null);
assertFalse("H5Oget_info", obj_info==null);
assertTrue("H5Oget_info link type", obj_info.type==HDF5Constants.H5O_TYPE_DATASET);
assertTrue("Link Address ", obj_info.addr>0);
assertTrue("Link Object Token", obj_info.token != null);
}
@Test(expected = HDF5LibraryException.class)
@@ -286,9 +286,9 @@ public class TestH5Ocreate {
err.printStackTrace();
fail("H5.H5Oget_info: " + err);
}
assertFalse("H5Oget_info ", obj_info==null);
assertFalse("H5Oget_info", obj_info==null);
assertTrue("H5Oget_info link type", obj_info.type==HDF5Constants.H5O_TYPE_NAMED_DATATYPE);
assertTrue("Link Address ", obj_info.addr>0);
assertTrue("Link Object Token", obj_info.token != null);
}
@Test
@@ -351,18 +351,18 @@ public class TestH5Ocreate {
this.link_type = type;
}
}
class H5O_iter_data implements H5O_iterate_t {
class H5O_iter_data implements H5O_iterate_opdata_t {
public ArrayList<idata> iterdata = new ArrayList<idata>();
}
H5O_iterate_t iter_data = new H5O_iter_data();
class H5O_iter_callback implements H5O_iterate_cb {
public int callback(long group, String name, H5O_info_t info, H5O_iterate_t op_data) {
H5O_iterate_opdata_t iter_data = new H5O_iter_data();
class H5O_iter_callback implements H5O_iterate_t {
public int callback(long group, String name, H5O_info_t info, H5O_iterate_opdata_t op_data) {
idata id = new idata(name, info.type);
((H5O_iter_data)op_data).iterdata.add(id);
return 0;
}
}
H5O_iterate_cb iter_cb = new H5O_iter_callback();
H5O_iterate_t iter_cb = new H5O_iter_callback();
try {
H5.H5Ovisit(H5fid, HDF5Constants.H5_INDEX_CRT_ORDER, HDF5Constants.H5_ITER_INC, iter_cb, iter_data);
}