1 12 merge java copyright header changes (#391)
* OESS-98 fix tools test for plugins * sync fork * Merge of changes from dev * Move problem option to bottom of the list until fixed * HDFFV-11106 - fix parsing optional args * HDFFV-11106 add note * grammer fix * Whitespace after clang formatting * Undo format version 11 changes * Update check to working version * Merge workflow and minor changes from develop * Update supported platforms * PR#3 merge from develop * Merge gcc 10 diagnostics option from develop * Merge #318 OSX changes from develop * Merge serval small changes from dev * fix typo * Minor non-space formatting changes * GH #386 copyright corrections for java folder * revert because logic requires false return
This commit is contained in:
@@ -1,6 +1,5 @@
|
||||
/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
|
||||
* Copyright by The HDF Group. *
|
||||
* Copyright by the Board of Trustees of the University of Illinois. *
|
||||
* All rights reserved. *
|
||||
* *
|
||||
* This file is part of HDF5. The full HDF5 copyright notice, including *
|
||||
@@ -35,7 +34,7 @@ public class TestH5Fbasic {
|
||||
@Rule public TestName testname = new TestName();
|
||||
private static final String H5_FILE = "testFb.h5";
|
||||
private static final String TXT_FILE = "testFb.txt";
|
||||
long H5fid = -1;
|
||||
long H5fid = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
private final void _deleteFile(String filename) {
|
||||
File file = new File(filename);
|
||||
@@ -90,7 +89,7 @@ public class TestH5Fbasic {
|
||||
|
||||
@Test(expected = HDF5LibraryException.class)
|
||||
public void testH5Fopen_read_only() throws Throwable {
|
||||
long fid = -1;
|
||||
long fid = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
try {
|
||||
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
|
||||
@@ -125,8 +124,8 @@ public class TestH5Fbasic {
|
||||
|
||||
@Test(expected = HDF5LibraryException.class)
|
||||
public void testH5Freopen_closed() throws Throwable {
|
||||
long fid = -1;
|
||||
long fid2 = -1;
|
||||
long fid = HDF5Constants.H5I_INVALID_HID;
|
||||
long fid2 = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
try {
|
||||
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
|
||||
@@ -148,8 +147,8 @@ public class TestH5Fbasic {
|
||||
|
||||
@Test
|
||||
public void testH5Freopen() {
|
||||
long fid = -1;
|
||||
long fid2 = -1;
|
||||
long fid = HDF5Constants.H5I_INVALID_HID;
|
||||
long fid2 = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
try {
|
||||
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
|
||||
@@ -182,7 +181,7 @@ public class TestH5Fbasic {
|
||||
|
||||
@Test
|
||||
public void testH5Fclose() {
|
||||
long fid = -1;
|
||||
long fid = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
try {
|
||||
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
|
||||
@@ -202,7 +201,7 @@ public class TestH5Fbasic {
|
||||
|
||||
@Test(expected = HDF5LibraryException.class)
|
||||
public void testH5Fclose_twice() throws Throwable {
|
||||
long fid = -1;
|
||||
long fid = HDF5Constants.H5I_INVALID_HID;
|
||||
|
||||
try {
|
||||
fid = H5.H5Fopen(H5_FILE, HDF5Constants.H5F_ACC_RDWR,
|
||||
|
||||
Reference in New Issue
Block a user