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

40
java/test/TestH5Ocopy.java
View File

@@ -35,13 +35,13 @@ public class TestH5Ocopy {
private static final String FILENAME = "testRefsattribute.h5";
private static final int DIM_X = 4;
private static final int DIM_Y = 6;
long H5fid = -1;
long H5dsid = -1;
long H5did1 = -1;
long H5did2 = -1;
long H5gcpl = -1;
long H5gid = -1;
long H5dsid2 = -1;
long H5fid = HDF5Constants.H5I_INVALID_HID;
long H5dsid = HDF5Constants.H5I_INVALID_HID;
long H5did1 = HDF5Constants.H5I_INVALID_HID;
long H5did2 = HDF5Constants.H5I_INVALID_HID;
long H5gcpl = HDF5Constants.H5I_INVALID_HID;
long H5gid = HDF5Constants.H5I_INVALID_HID;
long H5dsid2 = HDF5Constants.H5I_INVALID_HID;
long[] dims = { 2 };
private final void _deleteFile(String filename) {
@@ -58,7 +58,7 @@ public class TestH5Ocopy {
}
private final long _createDataset(long fid, long dsid, String name, long dapl) {
long did = -1;
long did = HDF5Constants.H5I_INVALID_HID;
try {
did = H5.H5Dcreate(fid, name,
HDF5Constants.H5T_STD_I32BE, dsid,
@@ -74,7 +74,7 @@ public class TestH5Ocopy {
}
private final long _createGroup(long fid, String name) {
long gid = -1;
long gid = HDF5Constants.H5I_INVALID_HID;
try {
H5gcpl = HDF5Constants.H5P_DEFAULT;
gid = H5.H5Gcreate(fid, name, HDF5Constants.H5P_DEFAULT,
@@ -135,10 +135,10 @@ public class TestH5Ocopy {
@Test
public void testH5OcopyRefsAttr() {
long ocp_plist_id = -1;
long ocp_plist_id = HDF5Constants.H5I_INVALID_HID;
byte rbuf0[]=null , rbuf1[] = null;
byte[] dset_data = new byte[16];
long attribute_id = -1;
long attribute_id = HDF5Constants.H5I_INVALID_HID;
try {
@@ -183,9 +183,9 @@ public class TestH5Ocopy {
public void testH5OcopyRefsDatasettodiffFile() {
byte rbuf1[] = null;
byte[] dset_data = new byte[16];
long ocp_plist_id = -1;
long dataset_id = -1;
long H5fid2 = -1;
long ocp_plist_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long H5fid2 = HDF5Constants.H5I_INVALID_HID;
try {
rbuf1 = H5.H5Rcreate(H5fid, "DS2", HDF5Constants.H5R_OBJECT, -1);
@@ -243,9 +243,9 @@ public class TestH5Ocopy {
public void testH5OcopyRefsDatasettosameFile() {
byte rbuf0[]=null , rbuf1[] = null;
byte[] dset_data = new byte[16];
long ocp_plist_id = -1;
long dataset_id = -1;
long did = -1;
long ocp_plist_id = HDF5Constants.H5I_INVALID_HID;
long dataset_id = HDF5Constants.H5I_INVALID_HID;
long did = HDF5Constants.H5I_INVALID_HID;
int obj_type = -1;
byte[] read_data = new byte[16];
@@ -327,9 +327,9 @@ public class TestH5Ocopy {
// @Test(expected = HDF5LibraryException.class)
// public void testH5OcopyInvalidRef() throws Throwable {
// final long _pid_ = HDF5Constants.H5P_DEFAULT;
// long sid = -1;
// long did = -1;
// long aid = -1;
// long sid = HDF5Constants.H5I_INVALID_HID;
// long did = HDF5Constants.H5I_INVALID_HID;
// long aid = HDF5Constants.H5I_INVALID_HID;
//
// try {
// sid = H5.H5Screate_simple(1, new long[] {1}, null);