summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/links.c188
-rwxr-xr-xtest/objcopy.c4
-rw-r--r--test/th5o.c4
-rw-r--r--test/titerate.c8
-rw-r--r--test/trefer.c2
5 files changed, 181 insertions, 25 deletions
diff --git a/test/links.c b/test/links.c
index 1675d44..ce3714f 100644
--- a/test/links.c
+++ b/test/links.c
@@ -1456,7 +1456,7 @@ error:
/*-------------------------------------------------------------------------
- * Function: test_compat
+ * Function: test_deprec
*
* Purpose: Tests deprecated functions for backward compatibility.
*
@@ -1472,7 +1472,7 @@ error:
*/
#ifndef H5_NO_DEPRECATED_SYMBOLS
static int
-test_compat(hid_t fapl, hbool_t new_format)
+test_deprec(hid_t fapl, hbool_t new_format)
{
hid_t file_id = -1;
hid_t group1_id = -1;
@@ -1592,7 +1592,7 @@ error:
H5Fclose(file_id);
} H5E_END_TRY;
return 1;
-} /* end test_compat() */
+} /* end test_deprec() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
@@ -8990,14 +8990,32 @@ group_info(hid_t fapl)
/* Create hard link, with group object */
if((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR
+
+ /* Retrieve group's information */
+ if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
+
+ /* Check (new/empty) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != 0) TEST_ERROR
+
/* Retrieve group's information */
- if(H5Gget_info(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check (new/empty) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != 0) TEST_ERROR
+ /* Retrieve group's information */
+ if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check (new/empty) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != 0) TEST_ERROR
+
+
/* Create objects in new group created */
for(v = 0; v <= u; v++) {
/* Make name for link */
@@ -9010,8 +9028,17 @@ group_info(hid_t fapl)
if(H5Gclose(group_id3) < 0) TEST_ERROR
} /* end for */
+
+ /* Retrieve group's information */
+ if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
+
+ /* Check (new) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
/* Retrieve group's information */
- if(H5Gget_info(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
@@ -9019,6 +9046,15 @@ group_info(hid_t fapl)
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
/* Retrieve group's information */
+ if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check (new) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+
+ /* Retrieve group's information */
if(order != H5_ITER_NATIVE) {
if(order == H5_ITER_INC) {
if(H5Gget_info_by_idx(group_id, ".", idx_type, order, (hsize_t)u, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
@@ -9037,8 +9073,24 @@ group_info(hid_t fapl)
if(H5Gclose(group_id2) < 0) TEST_ERROR
+ /* Retrieve main group's information */
+ if(H5Gget_info(group_id, &grp_info) < 0) TEST_ERROR
+
+ /* Check main group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+ /* Retrieve main group's information, by name */
+ if(H5Gget_info_by_name(file_id, CORDER_GROUP_NAME, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check main group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
/* Retrieve main group's information, by name */
- if(H5Gget_info(group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info_by_name(group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check main group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
@@ -9051,7 +9103,7 @@ group_info(hid_t fapl)
if(H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
/* Retrieve soft link group's information, by name */
- if(H5Gget_info(soft_group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(soft_group_id, &grp_info) < 0) TEST_ERROR
/* Check soft link group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
@@ -9079,14 +9131,32 @@ group_info(hid_t fapl)
/* Create hard link, with group object */
if((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) TEST_ERROR
+
/* Retrieve group's information */
- if(H5Gget_info(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
+
+ /* Check (new/empty) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != 0) TEST_ERROR
+
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check (new/empty) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != 0) TEST_ERROR
+
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check (new/empty) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_COMPACT) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != 0) TEST_ERROR
+
/* Create objects in new group created */
for(v = 0; v <= u; v++) {
/* Make name for link */
@@ -9099,14 +9169,32 @@ group_info(hid_t fapl)
if(H5Gclose(group_id3) < 0) TEST_ERROR
} /* end for */
+
/* Retrieve group's information */
- if(H5Gget_info(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check (new) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check (new) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+
/* Retrieve group's information */
if(order != H5_ITER_NATIVE) {
if(order == H5_ITER_INC) {
@@ -9126,8 +9214,24 @@ group_info(hid_t fapl)
if(H5Gclose(group_id2) < 0) TEST_ERROR
+ /* Retrieve main group's information */
+ if(H5Gget_info(group_id, &grp_info) < 0) TEST_ERROR
+
+ /* Check main group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+ /* Retrieve main group's information, by name */
+ if(H5Gget_info_by_name(file_id, CORDER_GROUP_NAME, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check main group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
+ if(grp_info.max_corder != (int64_t)(u + 1)) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
/* Retrieve main group's information, by name */
- if(H5Gget_info(group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info_by_name(group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check main group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
@@ -9140,7 +9244,7 @@ group_info(hid_t fapl)
if(H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
/* Retrieve soft link group's information, by name */
- if(H5Gget_info(soft_group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(soft_group_id, &grp_info) < 0) TEST_ERROR
/* Check soft link group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_DENSE) TEST_ERROR
@@ -9257,14 +9361,32 @@ group_info_old(hid_t fapl)
/* Create hard link, with group object */
if((group_id2 = H5Gcreate2(group_id, objname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR
+
/* Retrieve group's information */
- if(H5Gget_info(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
+
+ /* Check (new/empty) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != 0) TEST_ERROR
+
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check (new/empty) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != 0) TEST_ERROR
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check (new/empty) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != 0) TEST_ERROR
+
+
/* Create objects in new group created */
for(v = 0; v <= u; v++) {
/* Make name for link */
@@ -9277,14 +9399,32 @@ group_info_old(hid_t fapl)
if(H5Gclose(group_id3) < 0) TEST_ERROR
} /* end for */
+
/* Retrieve group's information */
- if(H5Gget_info(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(group_id2, &grp_info) < 0) TEST_ERROR
+
+ /* Check (new) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id, objname, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check (new) group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
if(grp_info.max_corder != 0) TEST_ERROR
if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+ /* Retrieve group's information, by name */
+ if(H5Gget_info_by_name(group_id2, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check (new) group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+
/* Retrieve group's information */
if(order != H5_ITER_NATIVE) {
if(order == H5_ITER_INC) {
@@ -9304,8 +9444,24 @@ group_info_old(hid_t fapl)
if(H5Gclose(group_id2) < 0) TEST_ERROR
+ /* Retrieve main group's information */
+ if(H5Gget_info(group_id, &grp_info) < 0) TEST_ERROR
+
+ /* Check main group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
+ /* Retrieve main group's information, by name */
+ if(H5Gget_info_by_name(file_id, CORDER_GROUP_NAME, &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+
+ /* Check main group's information */
+ if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
+ if(grp_info.max_corder != 0) TEST_ERROR
+ if(grp_info.nlinks != (hsize_t)(u + 1)) TEST_ERROR
+
/* Retrieve main group's information, by name */
- if(H5Gget_info(group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info_by_name(group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
/* Check main group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
@@ -9318,7 +9474,7 @@ group_info_old(hid_t fapl)
if(H5Lcreate_soft(valname, soft_group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) TEST_ERROR
/* Retrieve soft link group's information, by name */
- if(H5Gget_info(soft_group_id, ".", &grp_info, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(soft_group_id, &grp_info) < 0) TEST_ERROR
/* Check soft link group's information */
if(grp_info.storage_type != H5G_STORAGE_TYPE_SYMBOL_TABLE) TEST_ERROR
@@ -9582,7 +9738,7 @@ main(void)
nerrors += test_copy((new_format ? fapl2 : fapl), new_format);
nerrors += test_move_preserves((new_format ? fapl2 : fapl), new_format);
#ifndef H5_NO_DEPRECATED_SYMBOLS
- nerrors += test_compat((new_format ? fapl2 : fapl), new_format);
+ nerrors += test_deprec((new_format ? fapl2 : fapl), new_format);
#endif /* H5_NO_DEPRECATED_SYMBOLS */
#ifndef H5_CANNOT_OPEN_TWICE
nerrors += external_link_root((new_format ? fapl2 : fapl), new_format) < 0 ? 1 : 0;
diff --git a/test/objcopy.c b/test/objcopy.c
index fa6a6e2..cde4e2c 100755
--- a/test/objcopy.c
+++ b/test/objcopy.c
@@ -1247,8 +1247,8 @@ compare_groups(hid_t gid, hid_t gid2, hid_t pid, int depth, unsigned copy_flags)
cpy_flags = 0;
/* Check if both groups have the same # of objects */
- if(H5Gget_info(gid, ".", &ginfo, H5P_DEFAULT) < 0) TEST_ERROR
- if(H5Gget_info(gid2, ".", &ginfo2, H5P_DEFAULT) < 0) TEST_ERROR
+ if(H5Gget_info(gid, &ginfo) < 0) TEST_ERROR
+ if(H5Gget_info(gid2, &ginfo2) < 0) TEST_ERROR
if((cpy_flags & H5O_COPY_SHALLOW_HIERARCHY_FLAG) && depth == 0) {
if(ginfo2.nlinks != 0) TEST_ERROR
} /* end if */
diff --git a/test/th5o.c b/test/th5o.c
index f6e6f0b..6af08e4 100644
--- a/test/th5o.c
+++ b/test/th5o.c
@@ -102,7 +102,7 @@ test_h5o_open(void)
VERIFY(id_type, H5I_DATASET, "H5Iget_type for dataset ID");
/* Do something more complex with each of the IDs to make sure they "work" */
- ret = H5Gget_info(grp, ".", &ginfo, H5P_DEFAULT);
+ ret = H5Gget_info(grp, &ginfo);
CHECK(ret, FAIL, "H5Gget_info");
VERIFY(ginfo.nlinks, 1, "H5Gget_info"); /* There should be one object, the datatype */
@@ -315,7 +315,7 @@ test_h5o_open_by_addr(void)
VERIFY(id_type, H5I_DATASET, "H5Iget_type for dataset ID");
/* Do something more complex with each of the IDs to make sure they "work" */
- ret = H5Gget_info(grp, ".", &ginfo, H5P_DEFAULT);
+ ret = H5Gget_info(grp, &ginfo);
CHECK(ret, FAIL, "H5Gget_info");
VERIFY(ginfo.nlinks, 1, "H5Gget_info"); /* There should be one object, the datatype */
diff --git a/test/titerate.c b/test/titerate.c
index 5b354ce..9f93427 100644
--- a/test/titerate.c
+++ b/test/titerate.c
@@ -208,7 +208,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
root_group = H5Gopen2(file, "/", H5P_DEFAULT);
CHECK(root_group, FAIL, "H5Gopen2");
- ret = H5Gget_info(root_group, ".", &ginfo, H5P_DEFAULT);
+ ret = H5Gget_info(root_group, &ginfo);
CHECK(ret, FAIL, "H5Gget_info");
VERIFY(ginfo.nlinks, (NDATASETS + 2), "H5Gget_info");
@@ -234,7 +234,7 @@ test_iter_group(hid_t fapl, hbool_t new_format)
* iterate through B-tree for group members in internal library design.
* (Same as test above, but with the file ID instead of opening the root group)
*/
- ret = H5Gget_info(file, ".", &ginfo, H5P_DEFAULT);
+ ret = H5Gget_info(file, &ginfo);
CHECK(ret, FAIL, "H5Gget_info");
VERIFY(ginfo.nlinks, NDATASETS + 2, "H5Gget_info");
@@ -772,7 +772,7 @@ static void test_grp_memb_funcs(hid_t fapl)
root_group = H5Gopen2(file, "/", H5P_DEFAULT);
CHECK(root_group, FAIL, "H5Gopen2");
- ret = H5Gget_info(root_group, ".", &ginfo, H5P_DEFAULT);
+ ret = H5Gget_info(root_group, &ginfo);
CHECK(ret, FAIL, "H5Gget_info");
VERIFY(ginfo.nlinks, (NDATASETS + 2), "H5Gget_info");
@@ -868,7 +868,7 @@ static void test_links(hid_t fapl)
ret = H5Lcreate_hard(gid, "/g1", H5L_SAME_LOC, "hardlink", H5P_DEFAULT, H5P_DEFAULT);
CHECK(ret, FAIL, "H5Lcreate_hard");
- ret = H5Gget_info(gid, ".", &ginfo, H5P_DEFAULT);
+ ret = H5Gget_info(gid, &ginfo);
CHECK(ret, FAIL, "H5Gget_info");
VERIFY(ginfo.nlinks, 3, "H5Gget_info");
diff --git a/test/trefer.c b/test/trefer.c
index 6c88a60..bef497f 100644
--- a/test/trefer.c
+++ b/test/trefer.c
@@ -1081,7 +1081,7 @@ test_reference_group(void)
CHECK(ret, FAIL, "H5Literate");
/* Various queries on the group opened */
- ret = H5Gget_info(gid, ".", &ginfo, H5P_DEFAULT);
+ ret = H5Gget_info(gid, &ginfo);
CHECK(ret, FAIL, "H5Gget_info");
VERIFY(ginfo.nlinks, 3, "H5Gget_info");
generated by cgit v0.12 at 2024-11-17 09:53:32 (GMT)