1 10 Fix java data export functions (#450)
* HDFFV-10865 - merge from dev, HDFArray perf fix. * Remove duplicate setting * Whitespace changes after clang format * Undo version 11 clang format changes * Merge CMake changes from develop * test testing script merge from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge small changes from develop * Minor non-space formatting changes * #386 copyright corrections for java folder * Merges from develop #358 patches from vtk #361 fix header guard spelling * Merge updates #358 patches from vtk #361 fix header guard spelling * format fix * Fix missing underscore and make H5public.h closer to dev * Merges from develop #340 clang -Wformat-security warnings #360 Fixed uninitialized warnings header guard underscore cleanup JNI cleanup * format alignment * Add missing test ref file * Merge #380 from develop * Finish java merges from develop * Fix java issues with tests and javadoc * Correct use of attribute access plist * Remove debug code * Remove unused variable * Change file access to read only for java tests * Split clang format operations. * More javadoc comments * Remove pre-split setting * format source
This commit is contained in:
@@ -37,11 +37,11 @@ public class TestH5G {
|
||||
private static final String[] GROUPS = { "/G1", "/G1/G11", "/G1/G12",
|
||||
"/G1/G11/G111", "/G1/G11/G112", "/G1/G11/G113", "/G1/G11/G114" };
|
||||
private static final String[] GROUPS2 = { "/G1", "/G1/G14", "/G1/G12", "/G1/G13", "/G1/G11"};
|
||||
long H5fid = -1;
|
||||
long H5fid2 = -1;
|
||||
long H5fid = HDF5Constants.H5I_INVALID_HID;
|
||||
long H5fid2 = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
private final long _createGroup(long fid, String name) {
|
||||
long gid = -1;
|
||||
long gid = HDF5Constants.H5I_INVALID_HID;
|
||||
try {
|
||||
gid = H5.H5Gcreate(fid, name, HDF5Constants.H5P_DEFAULT,
|
||||
HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
|
||||
@@ -56,8 +56,8 @@ public class TestH5G {
|
||||
}
|
||||
|
||||
private final long _createGroup2(long fid, String name) {
|
||||
long gid = -1;
|
||||
long gcpl = -1;
|
||||
long gid = HDF5Constants.H5I_INVALID_HID;
|
||||
long gcpl = HDF5Constants.H5I_INVALID_HID;
|
||||
try {
|
||||
gcpl = H5.H5Pcreate(HDF5Constants.H5P_GROUP_CREATE); //create gcpl
|
||||
}
|
||||
@@ -90,12 +90,12 @@ public class TestH5G {
|
||||
}
|
||||
|
||||
private final long _openGroup(long fid, String name) {
|
||||
long gid = -1;
|
||||
long gid = HDF5Constants.H5I_INVALID_HID;
|
||||
try {
|
||||
gid = H5.H5Gopen(fid, name, HDF5Constants.H5P_DEFAULT);
|
||||
}
|
||||
catch (Throwable err) {
|
||||
gid = -1;
|
||||
gid = HDF5Constants.H5I_INVALID_HID;
|
||||
err.printStackTrace();
|
||||
fail("H5.H5Gopen: " + err);
|
||||
}
|
||||
@@ -132,7 +132,7 @@ public class TestH5G {
|
||||
assertTrue("TestH5G.createH5file: H5.H5Fcreate: ", H5fid > 0);
|
||||
assertTrue("TestH5G.createH5file: H5.H5Fcreate: ", H5fid2 > 0);
|
||||
|
||||
long gid = -1;
|
||||
long gid = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
for (int i = 0; i < GROUPS.length; i++) {
|
||||
gid = _createGroup(H5fid, GROUPS[i]);
|
||||
@@ -163,7 +163,7 @@ public class TestH5G {
|
||||
|
||||
@Test
|
||||
public void testH5Gopen() {
|
||||
long gid = -1;
|
||||
long gid = HDF5Constants.H5I_INVALID_HID;
|
||||
for (int i = 0; i < GROUPS.length; i++) {
|
||||
try {
|
||||
gid = H5.H5Gopen(H5fid, GROUPS[i], HDF5Constants.H5P_DEFAULT);
|
||||
@@ -183,8 +183,8 @@ public class TestH5G {
|
||||
|
||||
@Test
|
||||
public void testH5Gget_create_plist() {
|
||||
long gid = -1;
|
||||
long pid = -1;
|
||||
long gid = HDF5Constants.H5I_INVALID_HID;
|
||||
long pid = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
for (int i = 0; i < GROUPS.length; i++) {
|
||||
try {
|
||||
|
||||
Reference in New Issue
Block a user