Skip to content

Commit

Permalink
H5Iget_name accept any valid name for an object (#59)
Browse files Browse the repository at this point in the history 
* H5Iget_name usages now accept any valid name
  • Loading branch information
@mattjala
mattjala authored Jul 28, 2023
1 parent 59eaedb commit 718efbc
Show file tree
Hide file tree
Showing 2 changed files with 103 additions and 35 deletions.
123 changes: 94 additions & 29 deletions vol_link_test.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -370,11 +370,12 @@ test_create_hard_link_long_name(void)
static int
test_create_hard_link_many(void)
{
htri_t link_exists;
hid_t file_id = H5I_INVALID_HID;
hid_t container_group = H5I_INVALID_HID;
hid_t group_id = H5I_INVALID_HID, group_id2 = H5I_INVALID_HID;
char objname[HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE]; /* Object name */
htri_t link_exists;
hid_t file_id = H5I_INVALID_HID;
hid_t container_group = H5I_INVALID_HID;
hid_t group_id = H5I_INVALID_HID, group_id2 = H5I_INVALID_HID;
hbool_t valid_name_matched = false;
char objname[HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE]; /* Object name */

TESTING("hard link creation of many links");

Expand Down Expand Up @@ -505,16 +506,31 @@ test_create_hard_link_many(void)
HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
goto error;
}

/* Check name */
if (H5Iget_name(group_id2, objname, (size_t)HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE) < 0) {
H5_FAILED();
HDprintf(" couldn't get the name of the object '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
goto error;
}

if (HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" HARD_LINK_TEST_GROUP_MANY_NAME "/hard21")) {
for (size_t i = 1; i < HARD_LINK_TEST_GROUP_MANY_NUM_HARD_LINKS + 1; i++) {
char name_possibility[VOL_TEST_FILENAME_MAX_LENGTH];

HDsnprintf(name_possibility, VOL_TEST_FILENAME_MAX_LENGTH, "%s%zu",
"/" LINK_TEST_GROUP_NAME "/" HARD_LINK_TEST_GROUP_MANY_NAME "/hard", i);

valid_name_matched = !HDstrcmp(objname, name_possibility) || valid_name_matched;
}

valid_name_matched = !HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" HARD_LINK_TEST_GROUP_MANY_NAME
"/" HARD_LINK_TEST_GROUP_MANY_FINAL_NAME) ||
valid_name_matched;

if (!valid_name_matched) {
H5_FAILED();
HDprintf(" wrong name of the object '%s'\n", objname);
HDprintf(" H5Iget_name failed to retrieve a valid name for '%s'\n",
HARD_LINK_TEST_GROUP_MANY_FINAL_NAME);
goto error;
}

Expand Down Expand Up @@ -1555,12 +1571,13 @@ test_create_soft_link_long_name(void)
static int
test_create_soft_link_many(void)
{
htri_t link_exists;
hid_t file_id = H5I_INVALID_HID;
hid_t container_group = H5I_INVALID_HID;
hid_t group_id = H5I_INVALID_HID;
hid_t object_id = H5I_INVALID_HID;
char objname[SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE]; /* Object name */
htri_t link_exists;
hbool_t valid_name_matched = false;
hid_t file_id = H5I_INVALID_HID;
hid_t container_group = H5I_INVALID_HID;
hid_t group_id = H5I_INVALID_HID;
hid_t object_id = H5I_INVALID_HID;
char objname[SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE]; /* Object name */

TESTING("soft link creation of many links");

Expand Down Expand Up @@ -1702,16 +1719,32 @@ test_create_soft_link_many(void)
HDprintf(" failed to open object pointed to by soft link '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME);
goto error;
}

/* Check name */
if (H5Iget_name(object_id, objname, (size_t)SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE) < 0) {
H5_FAILED();
HDprintf(" couldn't get the name of the object 'soft16'\n");
goto error;
}

if (HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" SOFT_LINK_TEST_GROUP_MANY_NAME "/soft16")) {
for (size_t i = 1; i < SOFT_LINK_TEST_GROUP_MANY_NAME_SOFT_LINK_COUNT + 1; i++) {
char name_possibility[VOL_TEST_FILENAME_MAX_LENGTH];

HDsnprintf(name_possibility, VOL_TEST_FILENAME_MAX_LENGTH, "%s%zu",
"/" LINK_TEST_GROUP_NAME "/" SOFT_LINK_TEST_GROUP_MANY_NAME "/soft", i);

valid_name_matched = !HDstrcmp(objname, name_possibility) || valid_name_matched;
}

valid_name_matched = !HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" SOFT_LINK_TEST_GROUP_MANY_NAME
"/" SOFT_LINK_TEST_GROUP_MANY_FINAL_NAME) ||
valid_name_matched;

if (!valid_name_matched) {
H5_FAILED();
HDprintf(" wrong name of the object '%s'\n", objname);
HDprintf(" H5Iget_name failed to retrieve a valid name for '%s'\n",
"/" LINK_TEST_GROUP_NAME "/" SOFT_LINK_TEST_GROUP_MANY_NAME
"/" SOFT_LINK_TEST_GROUP_MANY_FINAL_NAME);
goto error;
}

Expand Down Expand Up @@ -2463,9 +2496,10 @@ test_create_external_link_multi(void)
PART_ERROR(H5Lcreate_external_final_file);
}

if (HDstrcmp(objname, "/A/B/C")) {
if (HDstrcmp(objname, "/A/B/C") && HDstrcmp(objname, "/D/E/F") && HDstrcmp(objname, "/G/H/I") &&
HDstrcmp(objname, "/" LINK_TEST_GROUP_NAME "/" EXTERNAL_LINK_TEST_MULTI_NAME "/ext_link")) {
H5_FAILED();
HDprintf(" wrong name of the object '%s'\n", objname);
HDprintf(" H5Iget_name failed to retrieve a valid name for the object '%s'\n", "/A/B/C");
PART_ERROR(H5Lcreate_external_final_file);
}

Expand Down Expand Up @@ -2533,9 +2567,13 @@ test_create_external_link_multi(void)
PART_ERROR(H5Lcreate_external_object_created);
}

if (HDstrcmp(objname, "/A/B/C/new_group")) {
if (HDstrcmp(objname, "/A/B/C/new_group") && HDstrcmp(objname, "/D/E/F/new_group") &&
HDstrcmp(objname, "/G/H/I/new_group") &&
HDstrcmp(objname,
"/" LINK_TEST_GROUP_NAME "/" EXTERNAL_LINK_TEST_MULTI_NAME "/ext_link/new_group")) {
H5_FAILED();
HDprintf(" wrong name of the object '%s'\n", objname);
HDprintf(" H5Iget_name was unable to retrieve a valid name for the object '%s'\n",
"/A/B/C/new_group");
PART_ERROR(H5Lcreate_external_object_created);
}

Expand Down Expand Up @@ -2588,12 +2626,13 @@ test_create_external_link_multi(void)
static int
test_create_external_link_ping_pong(void)
{
hid_t file_id = H5I_INVALID_HID;
hid_t group_id = H5I_INVALID_HID;
hid_t group_id2 = H5I_INVALID_HID;
char ext_link_filename1[VOL_TEST_FILENAME_MAX_LENGTH];
char ext_link_filename2[VOL_TEST_FILENAME_MAX_LENGTH];
char objname[EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE];
hid_t file_id = H5I_INVALID_HID;
hid_t group_id = H5I_INVALID_HID;
hid_t group_id2 = H5I_INVALID_HID;
hbool_t valid_name_matched = false;
char ext_link_filename1[VOL_TEST_FILENAME_MAX_LENGTH];
char ext_link_filename2[VOL_TEST_FILENAME_MAX_LENGTH];
char objname[EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE];

TESTING_MULTIPART("external link creation to an object in ping pong style");

Expand Down Expand Up @@ -2737,9 +2776,24 @@ test_create_external_link_ping_pong(void)
PART_ERROR(H5Lcreate_external_verify);
}

if (HDstrcmp(objname, "/final")) {
for (size_t i = 1; i < EXTERNAL_LINK_TEST_PING_PONG_NUM_LINKS + 1; i++) {
char name_possibility[VOL_TEST_FILENAME_MAX_LENGTH];

HDsnprintf(name_possibility, VOL_TEST_FILENAME_MAX_LENGTH, "%s%zu", "/link", i);

if (!HDstrcmp(name_possibility, objname)) {
valid_name_matched = true;
break;
}
}

if (!HDstrcmp(objname, "/final"))
valid_name_matched = true;

if (!valid_name_matched) {
H5_FAILED();
HDprintf(" wrong name of the object '%s'\n", objname);
HDprintf(" H5Iget_name was unable to retrieve a valid name for the object '%s'\n",
"/final");
PART_ERROR(H5Lcreate_external_verify);
}

Expand Down Expand Up @@ -2797,9 +2851,20 @@ test_create_external_link_ping_pong(void)
PART_ERROR(H5Lcreate_external_verify_again);
}

if (HDstrcmp(objname, "/final/new_group")) {
for (size_t i = 1; i < EXTERNAL_LINK_TEST_PING_PONG_NUM_LINKS + 1; i++) {
char name_possibility[VOL_TEST_FILENAME_MAX_LENGTH];

HDsnprintf(name_possibility, VOL_TEST_FILENAME_MAX_LENGTH, "%s%zu%s", "/link", i,
"/new_group");

valid_name_matched = !HDstrcmp(objname, name_possibility) || valid_name_matched;
}

valid_name_matched = !HDstrcmp(objname, "/final/new_group") || valid_name_matched;

if (!valid_name_matched) {
H5_FAILED();
HDprintf(" wrong name of the object '%s'\n", objname);
HDprintf(" H5Iget_name was unable to find a valid name for '%s'\n", "/final/new_group");
PART_ERROR(H5Lcreate_external_verify_again);
}

Expand Down
15 changes: 9 additions & 6 deletions vol_link_test.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,10 @@ int vol_link_test(void);
#define HARD_LINK_TEST_GROUP_LONG_NAME "hard_link_long_name"
#define MAX_NAME_LEN ((64 * 1024) + 1024)

#define HARD_LINK_TEST_GROUP_MANY_NAME "hard_link_many_name"
#define HARD_LINK_TEST_GROUP_MANY_FINAL_NAME "hard_link_final"
#define HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE 1024
#define HARD_LINK_TEST_GROUP_MANY_NAME "hard_link_many_name"
#define HARD_LINK_TEST_GROUP_MANY_FINAL_NAME "hard_link_final"
#define HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE 1024
#define HARD_LINK_TEST_GROUP_MANY_NUM_HARD_LINKS 21

#define H5L_SAME_LOC_TEST_GROUP_NAME "h5l_same_loc_test_group"
#define H5L_SAME_LOC_TEST_LINK_NAME1 "h5l_same_loc_test_link1"
Expand All @@ -58,9 +59,10 @@ int vol_link_test(void);
#define SOFT_LINK_TEST_GROUP_LONG_NAME "soft_link_long_name"
#define SOFT_LINK_TEST_LONG_OBJECT_NAME "soft_link_object_name"

#define SOFT_LINK_TEST_GROUP_MANY_NAME "soft_link_many_name"
#define SOFT_LINK_TEST_GROUP_MANY_FINAL_NAME "soft_link_final"
#define SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE 1024
#define SOFT_LINK_TEST_GROUP_MANY_NAME "soft_link_many_name"
#define SOFT_LINK_TEST_GROUP_MANY_FINAL_NAME "soft_link_final"
#define SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE 1024
#define SOFT_LINK_TEST_GROUP_MANY_NAME_SOFT_LINK_COUNT 16

#define SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME "soft_link_creation_invalid_params_test"
#define SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME "soft_link_to_root"
Expand All @@ -82,6 +84,7 @@ int vol_link_test(void);
#define EXTERNAL_LINK_TEST_PING_PONG_NAME1 "ext_link_file_ping_pong_1.h5"
#define EXTERNAL_LINK_TEST_PING_PONG_NAME2 "ext_link_file_ping_pong_2.h5"
#define EXTERNAL_LINK_TEST_PING_PONG_NAME_BUF_SIZE 1024
#define EXTERNAL_LINK_TEST_PING_PONG_NUM_LINKS 6

#define EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME "external_link_creation_invalid_params_test"
#define EXTERNAL_LINK_INVALID_PARAMS_TEST_FILE_NAME "ext_link_invalid_params_file.h5"
Expand Down

0 comments on commit 718efbc

Please sign in to comment.