philipp/hdf5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1 10 Fix java data export functions (#450)

Browse Source 
* 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:
Allen Byrne
2021-03-10 07:41:14 -06:00
committed by GitHub
parent 2524ad19c0
commit dd5b8a8747
98 changed files with 1339 additions and 1041 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
java/test/TestH5D.java
View File

@@ -38,13 +38,13 @@ public class TestH5D {
private static final int DIM_X = 4;
private static final int DIM_Y = 6;
private static final int RANK = 2;
long H5fid = -1;
long H5faplid = -1;
long H5dsid = -1;
long H5dtid = -1;
long H5did = -1;
long H5did0 = -1;
long H5dcpl_id = -1;
long H5fid = HDF5Constants.H5I_INVALID_HID;
long H5faplid = HDF5Constants.H5I_INVALID_HID;
long H5dsid = HDF5Constants.H5I_INVALID_HID;
long H5dtid = HDF5Constants.H5I_INVALID_HID;
long H5did = HDF5Constants.H5I_INVALID_HID;
long H5did0 = HDF5Constants.H5I_INVALID_HID;
long H5dcpl_id = HDF5Constants.H5I_INVALID_HID;
long[] H5dims = { DIM_X, DIM_Y };
// Values for the status of space allocation
@@ -194,10 +194,10 @@ public class TestH5D {
try {H5.H5Fclose(H5fid);} catch (Exception ex) {}
}
private final void _openH5file(String name, long dapl) {
private final void _openH5file(String filename, String dsetname, long dapl) {
try {
H5fid = H5.H5Fopen(H5_FILE,
HDF5Constants.H5F_ACC_RDWR, HDF5Constants.H5P_DEFAULT);
H5fid = H5.H5Fopen(filename,
HDF5Constants.H5F_ACC_RDONLY, HDF5Constants.H5P_DEFAULT);
}
catch (Throwable err) {
err.printStackTrace();
@@ -205,7 +205,7 @@ public class TestH5D {
}
assertTrue("TestH5D._openH5file: H5.H5Fopen: ",H5fid >= 0);
try {
H5did = H5.H5Dopen(H5fid, name, dapl);
H5did = H5.H5Dopen(H5fid, dsetname, dapl);
}
catch (Throwable err) {
err.printStackTrace();
@@ -267,7 +267,7 @@ public class TestH5D {
@Test
public void testH5Dcreate() {
long dataset_id = -1;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
try {
dataset_id = H5.H5Dcreate(H5fid, "dset",
HDF5Constants.H5T_STD_I32BE, H5dsid,
@@ -291,7 +291,7 @@ public class TestH5D {
@Test
public void testH5Dcreate_anon() {
long dataset_id = -1;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
try {
dataset_id = H5.H5Dcreate_anon(H5fid, HDF5Constants.H5T_STD_I32BE,
H5dsid, HDF5Constants.H5P_DEFAULT, HDF5Constants.H5P_DEFAULT);
@@ -314,12 +314,12 @@ public class TestH5D {
@Test
public void testH5Dopen() {
long dataset_id = -1;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
_createDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT);
try {
H5.H5Dclose(H5did);
H5did = -1;
H5did = HDF5Constants.H5I_INVALID_HID;
dataset_id = H5.H5Dopen(H5fid, "dset", HDF5Constants.H5P_DEFAULT);
}
catch (Exception err) {
@@ -387,8 +387,8 @@ public class TestH5D {
@Test
public void testH5Dget_access_plist() {
long dapl_id = -1;
long test_dapl_id = -1;
long dapl_id = HDF5Constants.H5I_INVALID_HID;
long test_dapl_id = HDF5Constants.H5I_INVALID_HID;
int[] mdc_nelmts1 = {0};
int[] mdc_nelmts2 = {0};
long[] rdcc_nelmts1 = {0};
@@ -499,7 +499,7 @@ public class TestH5D {
@Test(expected = HDF5LibraryException.class)
public void testH5Dget_space_closed() throws Throwable {
long dataset_id = -1;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
try {
dataset_id = H5.H5Dcreate(H5fid, "dset",
HDF5Constants.H5T_STD_I32BE, H5dsid,
@@ -517,7 +517,7 @@ public class TestH5D {
@Test
public void testH5Dget_space() {
long dataspace_id = -1;
long dataspace_id = HDF5Constants.H5I_INVALID_HID;
_createDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT);
try {
@@ -541,7 +541,7 @@ public class TestH5D {
@Test(expected = HDF5LibraryException.class)
public void testH5Dget_type_closed() throws Throwable {
long dataset_id = -1;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
try {
dataset_id = H5.H5Dcreate(H5fid, "dset",
HDF5Constants.H5T_STD_I32BE, H5dsid,
@@ -559,7 +559,7 @@ public class TestH5D {
@Test
public void testH5Dget_type() {
long datatype_id = -1;
long datatype_id = HDF5Constants.H5I_INVALID_HID;
_createDataset(H5fid, H5dsid, "dset", HDF5Constants.H5P_DEFAULT);
try {