diff options
author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2018-07-21 05:40:57 (GMT) |
---|---|---|
committer | M. Scot Breitenfeld <brtnfld@hdfgroup.org> | 2018-07-26 22:23:10 (GMT) |
commit | df934cd6657a3a9da386a8d878a9074897279a0c (patch) | |
tree | 3cf7b03bd9e9cdb818acc91d4e9eeaeedd879ad2 /c++/test | |
parent | 56d1d200b81b00284a2aa62d401b97d076145f12 (diff) | |
download | hdf5-df934cd6657a3a9da386a8d878a9074897279a0c.zip hdf5-df934cd6657a3a9da386a8d878a9074897279a0c.tar.gz hdf5-df934cd6657a3a9da386a8d878a9074897279a0c.tar.bz2 |
Code improvement
Description:
Moved the new H5Object::getInfo member functions to H5Location and
made them overloaded with the existing H5Location::getObjinfo. This
way is cleaner than the previous approach.
Platforms tested:
Linux/64 (jelly)
Linux/32 (jam)
Darwin (osx1010test)
Diffstat (limited to 'c++/test')
-rw-r--r-- | c++/test/dsets.cpp | 12 | ||||
-rw-r--r-- | c++/test/tattr.cpp | 12 | ||||
-rw-r--r-- | c++/test/tfile.cpp | 8 | ||||
-rw-r--r-- | c++/test/tobject.cpp | 18 | ||||
-rw-r--r-- | c++/test/trefer.cpp | 10 | ||||
-rw-r--r-- | c++/test/ttypes.cpp | 9 |
6 files changed, 34 insertions, 35 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index e86052b..a3a055d 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -1116,9 +1116,9 @@ static herr_t test_types(H5File& file) /*------------------------------------------------------------------------- - * Function: test_getinfo + * Function: test_getObjinfo * - * Purpose Tests getInfo() + * Purpose Tests getObjinfo() * * Return Success: 0 * @@ -1145,16 +1145,16 @@ static herr_t test_getinfo(H5File& file) // Get dataset header info H5O_info_t oinfo; HDmemset(&oinfo, 0, sizeof(oinfo)); - dataset.getInfo(oinfo, H5O_INFO_HDR); - verify_val(oinfo.hdr.nchunks, 1, "DataSet::getInfo", __LINE__, __FILE__); + dataset.getObjinfo(oinfo, H5O_INFO_HDR); + verify_val(oinfo.hdr.nchunks, 1, "DataSet::getObjinfo", __LINE__, __FILE__); dataset.close(); // Open the dataset we created above and then close it. This is one // way to open an existing dataset for accessing. dataset = file.openDataSet(DSET_DEFAULT_NAME); HDmemset(&oinfo, 0, sizeof(oinfo)); - dataset.getInfo(oinfo, H5O_INFO_ALL); - verify_val(oinfo.hdr.nchunks, 1, "DataSet::getInfo", __LINE__, __FILE__); + dataset.getObjinfo(oinfo, H5O_INFO_ALL); + verify_val(oinfo.hdr.nchunks, 1, "DataSet::getObjinfo", __LINE__, __FILE__); dataset.close(); PASSED(); diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index 94c811a..bdf6d80 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -521,8 +521,8 @@ static void test_attr_basic_read() // Verify the correct number of attributes another way H5O_info_t oinfo; HDmemset(&oinfo, 0, sizeof(oinfo)); - dataset.getInfo(oinfo, H5O_INFO_NUM_ATTRS); - verify_val(oinfo.num_attrs, 3, "DataSet::getInfo", __LINE__, __FILE__); + dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); + verify_val(oinfo.num_attrs, 3, "DataSet::getObjinfo", __LINE__, __FILE__); // Open an attribute for the dataset Attribute ds_attr=dataset.openAttribute(ATTR1_NAME); @@ -548,8 +548,8 @@ static void test_attr_basic_read() // Verify the correct number of attributes another way HDmemset(&oinfo, 0, sizeof(oinfo)); - group.getInfo(oinfo, H5O_INFO_NUM_ATTRS); - verify_val(oinfo.num_attrs, 1, "Group::getInfo", __LINE__, __FILE__); + group.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); + verify_val(oinfo.num_attrs, 1, "Group::getObjinfo", __LINE__, __FILE__); // Open an attribute for the group Attribute gr_attr = group.openAttribute(ATTR2_NAME); @@ -672,8 +672,8 @@ static void test_attr_compound_read() // Verify the correct number of attributes another way H5O_info_t oinfo; HDmemset(&oinfo, 0, sizeof(oinfo)); - dataset.getInfo(oinfo, H5O_INFO_NUM_ATTRS); - verify_val(oinfo.num_attrs, 1, "DataSet::getInfo", __LINE__, __FILE__); + dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS); + verify_val(oinfo.num_attrs, 1, "DataSet::getObjinfo", __LINE__, __FILE__); // Open 1st attribute for the dataset Attribute attr = dataset.openAttribute((unsigned)0); diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index dd32364..a2bf1c2 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -660,8 +660,8 @@ static void test_libver_bounds_real( // Verify object header version another way H5O_info_t oinfo; HDmemset(&oinfo, 0, sizeof(oinfo)); - file.getInfo(oinfo, H5O_INFO_HDR); - verify_val(oinfo.hdr.version, oh_vers_create, "H5File::getInfo", __LINE__, __FILE__); + file.getObjinfo(oinfo, H5O_INFO_HDR); + verify_val(oinfo.hdr.version, oh_vers_create, "H5File::getObjinfo", __LINE__, __FILE__); /* * Reopen the file and make sure the root group still has the correct @@ -687,8 +687,8 @@ static void test_libver_bounds_real( // Verify object header version another way HDmemset(&oinfo, 0, sizeof(oinfo)); - group.getInfo(oinfo, H5O_INFO_HDR); - verify_val(oinfo.hdr.version, oh_vers_mod, "Group::getInfo", __LINE__, __FILE__); + group.getObjinfo(oinfo, H5O_INFO_HDR); + verify_val(oinfo.hdr.version, oh_vers_mod, "Group::getObjinfo", __LINE__, __FILE__); group.close(); // close "/G1" diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp index bfc13a0..537716f 100644 --- a/c++/test/tobject.cpp +++ b/c++/test/tobject.cpp @@ -545,7 +545,7 @@ static void test_getobjectinfo_same_file() H5O_info_t oinfo1, oinfo2; /* Object info structs */ // Output message about test being performed - SUBTEST("Group::getInfo"); + SUBTEST("Group::getObjinfo"); try { // Create a new HDF5 file @@ -561,9 +561,9 @@ static void test_getobjectinfo_same_file() // Query the info of two groups and verify that they have the same // file number - grp1.getInfo(oinfo1); - grp2.getInfo(oinfo2); - verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getInfo", __LINE__, __FILE__); + grp1.getObjinfo(oinfo1); + grp2.getObjinfo(oinfo2); + verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__); // Close groups and file grp1.close(); @@ -584,17 +584,17 @@ static void test_getobjectinfo_same_file() // Query the info of two groups and verify that they have the same // file number - grp1.getInfo(oinfo1); - grp2.getInfo(oinfo2); - verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getInfo", __LINE__, __FILE__); + grp1.getObjinfo(oinfo1); + grp2.getObjinfo(oinfo2); + verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__); // Reset object info HDmemset(&oinfo1, 0, sizeof(oinfo1)); HDmemset(&oinfo2, 0, sizeof(oinfo2)); - file1.getInfo(GROUP1NAME, oinfo1); - file1.getInfo(GROUP2NAME, oinfo2); + file1.getObjinfo(GROUP1NAME, oinfo1); + file1.getObjinfo(GROUP2NAME, oinfo2); verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjectInfo", __LINE__, __FILE__); // Close groups and files diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp index fa214df..562b127 100644 --- a/c++/test/trefer.cpp +++ b/c++/test/trefer.cpp @@ -481,19 +481,19 @@ static void test_reference_group() fname = group.getFileName(); verify_val(fname, FILE1, "H5Group::getFileName",__LINE__,__FILE__); - // Check object type using Group::getInfo() + // Check object type using Group::getObjinfo() H5O_info_t oinfo; HDmemset(&oinfo, 0, sizeof(oinfo)); - group.getInfo(".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, oinfo); - verify_val(oinfo.type, H5O_TYPE_DATASET, "Group::getInfo",__LINE__,__FILE__); + group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)0, oinfo); + verify_val(oinfo.type, H5O_TYPE_DATASET, "Group::getObjinfo",__LINE__,__FILE__); // Check for out of bound query by index try { HDmemset(&oinfo, 0, sizeof(oinfo)); - group.getInfo(".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)9, oinfo); + group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, (hsize_t)9, oinfo); // Should FAIL but didn't, so throw an invalid action exception - throw InvalidActionException("Group::getInfo", "Out of bound index."); + throw InvalidActionException("Group::getObjinfo", "Out of bound index."); } catch (Exception& err) {} // do nothing, failure expected // Unlink one of the objects in the dereferenced group, and re-check diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index 6d585bd..0de66d7 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -1097,13 +1097,12 @@ static void test_operators() verify_val(flttyp == member_inttyp, false, "DataType::operator==", __LINE__, __FILE__); verify_val(flttyp != member_inttyp, true, "DataType::operator==", __LINE__, __FILE__); - // Get the NATIVE_LONG member from the compound datatype above - IntType member_longtyp = cmptyp.getMemberIntType(2); + // Get the NATIVE_FLOAT member from the compound datatype above + IntType member_flttyp = cmptyp.getMemberIntType(1); // Test various combinations - verify_val(inttyp == member_longtyp, false, "DataType::operator==", __LINE__, __FILE__); - verify_val(flttyp == member_longtyp, false, "DataType::operator==", __LINE__, __FILE__); - verify_val(flttyp != member_longtyp, true, "DataType::operator==", __LINE__, __FILE__); + verify_val(inttyp == member_flttyp, false, "DataType::operator==", __LINE__, __FILE__); + verify_val(flttyp != member_flttyp, false, "DataType::operator==", __LINE__, __FILE__); PASSED(); } |