Merge branch 'develop' into feature/coding_standardsfeature/coding_standards

15 files changed, 126 insertions, 77 deletions

diff --git a/java/test/testfiles/JUnit-TestH5.txt b/java/test/testfiles/JUnit-TestH5.txt
index b282a91..fb50a57 100644
--- a/java/test/testfiles/JUnit-TestH5.txt
+++ b/java/test/testfiles/JUnit-TestH5.txt
@@ -1,9 +1,14 @@
 JUnit version 4.11
+.testH5export_region
 .testH5get_libversion_null_param
 .testJ2C
+.testH5export_dataset
 .testIsSerializable
+.testH5export_attrdataset
 .testH5garbage_collect
 .testH5error_off
+.testH5export_regdataset
+.testH5export_attribute
 .serializeToDisk
 .testH5open
 .testH5check_version
@@ -12,5 +17,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (10 tests)
+OK (15 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Arw.txt b/java/test/testfiles/JUnit-TestH5Arw.txt
new file mode 100644
index 0000000..49d3b1c
--- /dev/null
+++ b/java/test/testfiles/JUnit-TestH5Arw.txt
@@ -0,0 +1,13 @@
+JUnit version 4.11
+.testH5Aread_128bit_floats
+.testH5Aread_64bit_floats
+.testH5Aread_8bit_ints
+.testH5Aread_32bit_ints
+.testH5Aread_64bit_ints
+.testH5Aread_32bit_floats
+.testH5Aread_16bit_ints
+
+Time:  XXXX
+
+OK (7 tests)
+
diff --git a/java/test/testfiles/JUnit-TestH5Dparams.txt b/java/test/testfiles/JUnit-TestH5Dparams.txt
index 9751be4..9acedd7 100644
--- a/java/test/testfiles/JUnit-TestH5Dparams.txt
+++ b/java/test/testfiles/JUnit-TestH5Dparams.txt
@@ -7,11 +7,9 @@ JUnit version 4.11
 .testH5Dvlen_get_buf_size_invalid
 .testH5Dcreate_null
 .testH5Dset_extent_status_null
-.testH5Dvlen_reclaim_null
 .testH5Dcreate_invalid
 .testH5Dcreate_anon_invalid
 .testH5Dset_extent_status_invalid
-.testH5Dvlen_reclaim_invalid
 .testH5Dopen_invalid
 .testH5Dclose_invalid
 .testH5Dflush_invalid
@@ -22,5 +20,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (20 tests)
+OK (18 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Drw.txt b/java/test/testfiles/JUnit-TestH5Drw.txt
new file mode 100644
index 0000000..6b854cf
--- /dev/null
+++ b/java/test/testfiles/JUnit-TestH5Drw.txt
@@ -0,0 +1,13 @@
+JUnit version 4.11
+.testH5Dread_32bit_floats
+.testH5Dread_32bit_ints
+.testH5Dread_64bit_ints
+.testH5Dread_64bit_floats
+.testH5Dread_8bit_ints
+.testH5Dread_128bit_floats
+.testH5Dread_16bit_ints
+
+Time:  XXXX
+
+OK (7 tests)
+
diff --git a/java/test/testfiles/JUnit-TestH5Edefault.txt b/java/test/testfiles/JUnit-TestH5Edefault.txt
index 48c6254..bb43c64 100644
--- a/java/test/testfiles/JUnit-TestH5Edefault.txt
+++ b/java/test/testfiles/JUnit-TestH5Edefault.txt
@@ -1,10 +1,8 @@
 JUnit version 4.11
-.testH5EprintInt
 .testH5Eset_current_stack_invalid_stkid
 .testH5Eset_current_stack
 .testH5Eget_num
 .testH5Eclear
-.testH5Eprint
 .testH5Epush_null_name
 .testH5Eget_num_with_msg
 .testH5Eclear2_with_msg
@@ -30,49 +28,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (28 tests)
+OK (26 tests)
 
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Fopen(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #001: (file name) line (number) in H5VL_file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_file_open(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #004: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
-    major: File accessibility
-    minor: Unable to open file
-  #005: (file name) line (number) in H5FD_open(): open failed
-    major: Virtual File Layer
-    minor: Unable to initialize object
-  #006: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
-    major: File accessibility
-    minor: Unable to open file
-HDF5-DIAG: Error detected in HDF5 (version (number)) thread (IDs):
-  #000: (file name) line (number) in H5Fopen(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #001: (file name) line (number) in H5VL_file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #002: (file name) line (number) in H5VL__file_open(): open failed
-    major: Virtual Object Layer
-    minor: Can't open object
-  #003: (file name) line (number) in H5VL__native_file_open(): unable to open file
-    major: File accessibility
-    minor: Unable to open file
-  #004: (file name) line (number) in H5F_open(): unable to open file: name = 'test', tent_flags = 1
-    major: File accessibility
-    minor: Unable to open file
-  #005: (file name) line (number) in H5FD_open(): open failed
-    major: Virtual File Layer
-    minor: Unable to initialize object
-  #006: (file name) line (number) in H5FD_sec2_open(): unable to open file: name = 'test', errno = 2, error message = 'No such file or directory', flags = 1, o_flags = 2
-    major: File accessibility
-    minor: Unable to open file
diff --git a/java/test/testfiles/JUnit-TestH5Obasic.txt b/java/test/testfiles/JUnit-TestH5Obasic.txt
index d015bdd..c39c01d 100644
--- a/java/test/testfiles/JUnit-TestH5Obasic.txt
+++ b/java/test/testfiles/JUnit-TestH5Obasic.txt
@@ -1,29 +1,45 @@
 JUnit version 4.11
 .testH5Oexists_by_name
+.testH5Oget_native_info_dataset
+.testH5Oopen_by_token
 .testH5Oget_info_by_idx_n0
 .testH5Oget_info_by_idx_n3
+.testH5Oget_native_info_datatype
 .testH5Oget_info_by_name_not_exist_name
 .testH5Ovisit_by_name
+.testH5Oget_native_info_by_name_datatype
 .testH5Oget_info_by_idx_name_not_exist_name
 .testH5Oget_info_datatype
 .testH5Oget_info_by_idx_not_exist_name
 .testH5Oopen_by_idx_n0
 .testH5Oopen_by_idx_n3
+.testH5Oget_native_info_by_name_not_exist_name
 .testH5Oopen_not_exists
 .testH5Ovisit
 .testH5Oget_info_by_idx_not_exist_create
+.testH5Oget_native_info_by_idx_not_exist_name
 .testH5Oget_info_by_name_hardlink
 .testH5Oget_info_by_name_group
-.testH5Oopen_by_addr
 .testH5Oget_info_by_name_not_exists
+.testH5Oget_native_info_by_idx_not_exist_create
 .testH5Oget_info_by_name_dataset
 .testH5Oget_info_group
+.testH5Oget_native_info_hardlink
+.testH5Oget_native_info_by_name_hardlink
+.testH5Oget_native_info_by_idx_name_not_exist_name
 .testH5Oget_info_by_name_datatype
 .testH5Oget_info_hardlink
+.testH5Oget_native_info_group
+.testH5Oget_native_info_by_name_not_exists
+.testH5Oget_native_info_by_name_dataset
 .testH5Oget_info_by_idx_name_not_exist_create
+.testH5Oget_native_info_by_idx_n0
+.testH5Oget_native_info_by_idx_n3
 .testH5Oget_info_dataset
+.testH5Oget_native_info_by_name_group
+.testH5Oget_native_info_by_idx_name_not_exist_create
 
 Time:  XXXX
 
-OK (23 tests)
+OK (39 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Ocopy.txt b/java/test/testfiles/JUnit-TestH5Ocopy.txt
index 32dfde7..7f66410 100644
--- a/java/test/testfiles/JUnit-TestH5Ocopy.txt
+++ b/java/test/testfiles/JUnit-TestH5Ocopy.txt
@@ -1,9 +1,10 @@
 JUnit version 4.11
 .testH5OcopyRefsDatasettosameFile
+.testH5OcopyNullRef
 .testH5OcopyRefsDatasettodiffFile
 .testH5OcopyRefsAttr
 
 Time:  XXXX
 
-OK (3 tests)
+OK (4 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5OcopyOld.txt b/java/test/testfiles/JUnit-TestH5OcopyOld.txt
new file mode 100644
index 0000000..7f66410
--- /dev/null
+++ b/java/test/testfiles/JUnit-TestH5OcopyOld.txt
@@ -0,0 +1,10 @@
+JUnit version 4.11
+.testH5OcopyRefsDatasettosameFile
+.testH5OcopyNullRef
+.testH5OcopyRefsDatasettodiffFile
+.testH5OcopyRefsAttr
+
+Time:  XXXX
+
+OK (4 tests)
+
diff --git a/java/test/testfiles/JUnit-TestH5Oparams.txt b/java/test/testfiles/JUnit-TestH5Oparams.txt
index bc23695..b756bcf 100644
--- a/java/test/testfiles/JUnit-TestH5Oparams.txt
+++ b/java/test/testfiles/JUnit-TestH5Oparams.txt
@@ -1,22 +1,27 @@
 JUnit version 4.11
 .testH5Oget_comment_by_name_null
+.testH5Oget_native_info_by_name_invalid
 .testH5Ovisit_by_name_nullname
 .testH5Oget_info_invalid
 .testH5Ovisit_by_name_null
 .testH5Odisable_mdc_flushes
 .testH5Oget_comment_invalid
+.testH5Oget_native_info_invalid
 .testH5Oset_comment_by_name_invalid
 .testH5Oare_mdc_flushes_disabled
 .testH5Oopen_null
 .testH5Oclose_invalid
 .testH5Oflush_invalid
+.testH5Oget_native_info_by_name_null
 .testH5Oget_comment_by_name_invalid
 .testH5Orefresh_invalid
 .testH5Ocopy_null_dest
+.testH5Oget_native_info_by_idx_null
 .testH5Olink_invalid
 .testH5Oget_info_by_idx_invalid
 .testH5Oget_info_by_idx_null
 .testH5Olink_null_dest
+.testH5Oget_native_info_by_idx_invalid
 .testH5Oget_info_by_name_invalid
 .testH5Oget_info_by_name_null
 .testH5Ocopy_invalid
@@ -29,5 +34,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (27 tests)
+OK (32 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Pfapl.txt b/java/test/testfiles/JUnit-TestH5Pfapl.txt
index c4f37d0..c34ac1c 100644
--- a/java/test/testfiles/JUnit-TestH5Pfapl.txt
+++ b/java/test/testfiles/JUnit-TestH5Pfapl.txt
@@ -28,6 +28,7 @@ JUnit version 4.11
 .testH5Pset_elink_fapl
 .testH5P_hyper_vector_size
 .testH5P_gc_references
+.testH5P_file_locking
 .testH5P_family_offset
 .testH5P_fapl_core
 .testH5P_fapl_muti
@@ -37,5 +38,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (35 tests)
+OK (36 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5R.txt b/java/test/testfiles/JUnit-TestH5R.txt
index 150df54..a96fbb4 100644
--- a/java/test/testfiles/JUnit-TestH5R.txt
+++ b/java/test/testfiles/JUnit-TestH5R.txt
@@ -1,23 +1,28 @@
 JUnit version 4.11
-.testH5Rgetregion_Nullreference
-.testH5Rget_obj_type2_Invalidreftype
-.testH5Rdereference
-.testH5Rget_name
-.testH5Rcreate_Invalidreftype
-.testH5Rget_name_NULLreference
-.testH5Rget_region
-.testH5Rdereference_Nullreference
-.testH5Rcreate_refobj
-.testH5Rcreate_Invalidspace_id
-.testH5Rdereference_Invalidreference
-.testH5Rgetregion_Badreferencetype
-.testH5Rcreate_regionrefobj
-.testH5Rget_name_Invalidreftype
-.testH5Rgetregion_Invalidreftype
-.testH5Rget_obj_type2
-.testH5Rcreate_InvalidObjectName
+.testH5Ropen_attr_Nullref
+.testH5Rget_attr_name_Nullref
+.testH5Ropen_region_Nullref
+.testH5Requal_Nullref1
+.testH5Requal_Nullref2
+.testH5Rget_object
+.testH5Rget_obj_type3_Nullref
+.testH5Ropen_object_Nullref
+.testH5Rdestroy_Nullref
+.testH5Rcreate_object_Nullname
+.testH5Rget_obj_type3
+.testH5Rget_name_Invalidloc
+.testH5Rcopy_Nullref1
+.testH5Rcreate_attr_Invalidloc
+.testH5Rget_file_name_Nullref
+.testH5Rget_obj_name_Nullref
+.testH5Rcreate_region_Nullname
+.testH5Rcreate_regionref_object
+.testH5Rcreate_attr_Nullattrname
+.testH5Rcreate_region_Invalidloc
+.testH5Rget_type_Nullref
+.testH5Rcreate_attr_Nullname
 
 Time:  XXXX
 
-OK (17 tests)
+OK (22 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Rref.txt b/java/test/testfiles/JUnit-TestH5Rref.txt
new file mode 100644
index 0000000..05019c0
--- /dev/null
+++ b/java/test/testfiles/JUnit-TestH5Rref.txt
@@ -0,0 +1,10 @@
+JUnit version 4.11
+.testH5Rget_region_dataset
+.testH5Rget_object
+.testH5Rget_region_attribute
+.testH5Rget_obj_type3
+
+Time:  XXXX
+
+OK (4 tests)
+
diff --git a/java/test/testfiles/JUnit-TestH5Sbasic.txt b/java/test/testfiles/JUnit-TestH5Sbasic.txt
index 707878e..3422442 100644
--- a/java/test/testfiles/JUnit-TestH5Sbasic.txt
+++ b/java/test/testfiles/JUnit-TestH5Sbasic.txt
@@ -5,18 +5,32 @@ JUnit version 4.11
 .testH5Sdecode_null
 .testH5Screate_simple_dims_exceed
 .testH5Screate_simple_unlimted_1d
+.testH5Sselect_intersect_block_rank_start
+.testH5Sget_regular_hyperslab_invalid
+.testH5Sselect_adjust_rank_offset
 .testH5Screate_simple_dims_invalid
 .testH5Screate_scalar
 .testH5Screate_simple
+.testH5Sselect_project_intersection_invalid
 .testH5Screate_simple_rank_invalid
 .testH5Sget_simple_extent_type_invalid
+.testH5Scombine_hyperslab_invalid
+.testH5Scombine_hyperslab_null_count
+.testH5Scombine_hyperslab_null_start
 .testH5Sencode_invalid
 .testH5Screate_null
 .testH5Screate_simple_extent
 .testH5Screate_invalid
+.testH5Sselect_intersect_block_invalid
+.testH5Sselect_adjust_invalid
 .testH5Screate_simple_unlimted
+.testH5Sselect_shape_same_invalid
+.testH5Smodify_select_invalid
+.testH5Scombine_select_invalid
+.testH5Sselect_copy_invalid
+.testH5Sselect_intersect_block_rank_end
 
 Time:  XXXX
 
-OK (16 tests)
+OK (30 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5Tparams.txt b/java/test/testfiles/JUnit-TestH5Tparams.txt
index e61f1e4..9f725ac 100644
--- a/java/test/testfiles/JUnit-TestH5Tparams.txt
+++ b/java/test/testfiles/JUnit-TestH5Tparams.txt
@@ -1,5 +1,6 @@
 JUnit version 4.11
 .testH5Tget_member_type_invalid
+.testH5Treclaim_invalid
 .testH5Tenum_insert_null
 .testH5Tget_offset_invalid
 .testH5Tset_precision_invalid
@@ -68,9 +69,10 @@ JUnit version 4.11
 .testH5Tget_member_index_null
 .testH5Trefresh_invalid
 .testH5Tset_sign_invalid
+.testH5Treclaim_null
 .testH5Tenum_insert_name_null
 
 Time:  XXXX
 
-OK (70 tests)
+OK (72 tests)
 
diff --git a/java/test/testfiles/JUnit-TestH5VL.txt b/java/test/testfiles/JUnit-TestH5VL.txt
index caadf26..ff94969 100644
--- a/java/test/testfiles/JUnit-TestH5VL.txt
+++ b/java/test/testfiles/JUnit-TestH5VL.txt
@@ -1,4 +1,6 @@
 JUnit version 4.11
+.testH5VLget_connector_id_by_name
+.testH5VLget_connector_id_by_value
 .testH5VLget_connector_id
 .testH5VLnative_init
 .testH5VLget_connector_name
@@ -7,5 +9,5 @@ JUnit version 4.11
 
 Time:  XXXX
 
-OK (5 tests)
+OK (7 tests)