diff --git a/test/API/H5_api_async_test.c b/test/API/H5_api_async_test.c index 3c39878bd79..4ce9ecd7f62 100644 --- a/test/API/H5_api_async_test.c +++ b/test/API/H5_api_async_test.c @@ -72,12 +72,12 @@ test_one_dataset_io(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, dataset, or flush aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); /* Create dataspace */ if ((space_id = H5Screate_simple(2, dims, NULL)) < 0) @@ -96,13 +96,13 @@ test_one_dataset_io(void) H5P_DEFAULT, es_id)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(single_dset_eswait) { - TESTING_2_API("synchronization using H5ESwait()"); + TESTING_2("synchronization using H5ESwait()"); /* Initialize wbuf */ for (i = 0; i < 6; i++) @@ -111,40 +111,40 @@ test_one_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_eswait); + PART_TEST_ERROR(single_dset_eswait); /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(single_dset_eswait); + PART_TEST_ERROR(single_dset_eswait); if (op_failed) - PART_TEST_ERROR_API(single_dset_eswait); + PART_TEST_ERROR(single_dset_eswait); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_eswait); + PART_TEST_ERROR(single_dset_eswait); /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(single_dset_eswait); + PART_TEST_ERROR(single_dset_eswait); if (op_failed) - PART_TEST_ERROR_API(single_dset_eswait); + PART_TEST_ERROR(single_dset_eswait); /* Verify the read data */ for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(single_dset_eswait); + PART_ERROR(single_dset_eswait); } /* end if */ - PASSED_API(); + PASSED(); } PART_END(single_dset_eswait); PART_BEGIN(single_dset_dclose) { - TESTING_2_API("synchronization using H5Dclose()"); + TESTING_2("synchronization using H5Dclose()"); /* Update wbuf */ for (i = 0; i < 6; i++) @@ -153,44 +153,44 @@ test_one_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_dclose); + PART_TEST_ERROR(single_dset_dclose); /* Close the dataset synchronously */ if (H5Dclose(dset_id) < 0) - PART_TEST_ERROR_API(single_dset_dclose); + PART_TEST_ERROR(single_dset_dclose); /* Re-open the dataset asynchronously */ if ((dset_id = H5Dopen_async(file_id, "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(single_dset_dclose); + PART_TEST_ERROR(single_dset_dclose); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_dclose); + PART_TEST_ERROR(single_dset_dclose); /* Close the dataset synchronously */ if (H5Dclose(dset_id) < 0) - PART_TEST_ERROR_API(single_dset_dclose); + PART_TEST_ERROR(single_dset_dclose); /* Verify the read data */ for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(single_dset_dclose); + PART_ERROR(single_dset_dclose); } /* end if */ /* Re-open the dataset asynchronously */ if ((dset_id = H5Dopen_async(file_id, "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(single_dset_dclose); + PART_TEST_ERROR(single_dset_dclose); - PASSED_API(); + PASSED(); } PART_END(single_dset_dclose); PART_BEGIN(single_dset_dflush) { - TESTING_2_API("synchronization using H5Oflush_async()"); + TESTING_2("synchronization using H5Oflush_async()"); /* Update wbuf */ for (i = 0; i < 6; i++) @@ -199,39 +199,39 @@ test_one_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_dflush); + PART_TEST_ERROR(single_dset_dflush); /* Flush the dataset asynchronously. This will effectively work as a * barrier, guaranteeing the read takes place after the write. */ if (H5Oflush_async(dset_id, es_id) < 0) - PART_TEST_ERROR_API(single_dset_dflush); + PART_TEST_ERROR(single_dset_dflush); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_dflush); + PART_TEST_ERROR(single_dset_dflush); /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(single_dset_dflush); + PART_TEST_ERROR(single_dset_dflush); if (op_failed) - PART_TEST_ERROR_API(single_dset_dflush); + PART_TEST_ERROR(single_dset_dflush); /* Verify the read data */ for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(single_dset_dflush); + PART_ERROR(single_dset_dflush); } /* end if */ - PASSED_API(); + PASSED(); } PART_END(single_dset_dflush); PART_BEGIN(single_dset_fclose) { - TESTING_2_API("synchronization using H5Fclose()"); + TESTING_2("synchronization using H5Fclose()"); /* Update wbuf */ for (i = 0; i < 6; i++) @@ -240,52 +240,52 @@ test_one_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id, es_id) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Close the file synchronously */ if (H5Fclose(file_id) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Reopen the file asynchronously. */ if ((file_id = H5Fopen_async(ASYNC_API_TEST_FILE, H5F_ACC_RDONLY, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Re-open the dataset asynchronously */ if ((dset_id = H5Dopen_async(file_id, "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf, es_id) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id, es_id) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Close the file synchronously */ if (H5Fclose(file_id) < 0) - PART_TEST_ERROR_API(single_dset_fclose); + PART_TEST_ERROR(single_dset_fclose); /* Verify the read data */ for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(single_dset_fclose); + PART_ERROR(single_dset_fclose); } /* end if */ - PASSED_API(); + PASSED(); } PART_END(single_dset_fclose); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) @@ -298,7 +298,7 @@ test_one_dataset_io(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -340,12 +340,12 @@ test_multi_dataset_io(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, dataset, or flush aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); /* Create dataspace */ if ((space_id = H5Screate_simple(2, dims, NULL)) < 0) @@ -359,25 +359,25 @@ test_multi_dataset_io(void) if ((file_id = H5Fcreate_async(ASYNC_API_TEST_FILE, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(multi_dset_open) { - TESTING_2_API("keeping datasets open"); + TESTING_2("keeping datasets open"); /* Loop over datasets */ for (i = 0; i < 5; i++) { /* Set dataset name */ if ((chars_written = snprintf(dset_name, ASYNC_API_TEST_FILENAME_SIZE, "dset%d", i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); /* Create the dataset asynchronously */ if ((dset_id[i] = H5Dcreate_async(file_id, dset_name, H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); /* Initialize wbuf. Must use a new slice of wbuf for each dset * since we can't overwrite the buffers until I/O is done. */ @@ -388,27 +388,27 @@ test_multi_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); } /* end for */ /* Flush the file asynchronously. This will effectively work as a * barrier, guaranteeing the read takes place after the write. */ if (H5Fflush_async(file_id, H5F_SCOPE_LOCAL, es_id) < 0) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); /* Loop over datasets */ for (i = 0; i < 5; i++) { /* Read the dataset asynchronously */ if (H5Dread_async(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); if (op_failed) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); /*printf("\nwbuf:\n"); for(i = 0; i < 5; i++) { for(j = 0; j < 6; j++) { @@ -432,34 +432,34 @@ test_multi_dataset_io(void) for (j = 0; j < 6; j++) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(multi_dset_open); + PART_ERROR(multi_dset_open); } /* end if */ /* Close the datasets */ for (i = 0; i < 5; i++) if (H5Dclose(dset_id[i]) < 0) - PART_TEST_ERROR_API(multi_dset_open); + PART_TEST_ERROR(multi_dset_open); - PASSED_API(); + PASSED(); } PART_END(multi_dset_open); PART_BEGIN(multi_dset_close) { - TESTING_2_API("closing datasets between I/O"); + TESTING_2("closing datasets between I/O"); /* Loop over datasets */ for (i = 0; i < 5; i++) { /* Set dataset name */ if ((chars_written = snprintf(dset_name, ASYNC_API_TEST_FILENAME_SIZE, "dset%d", i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /* Open the dataset asynchronously */ if ((dset_id[0] = H5Dopen_async(file_id, dset_name, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /* Update wbuf */ for (j = 0; j < 6; j++) @@ -469,44 +469,44 @@ test_multi_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); } /* end for */ /* Flush the file asynchronously. This will effectively work as a * barrier, guaranteeing the read takes place after the write. */ if (H5Fflush_async(file_id, H5F_SCOPE_LOCAL, es_id) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /* Loop over datasets */ for (i = 0; i < 5; i++) { /* Set dataset name */ if ((chars_written = snprintf(dset_name, ASYNC_API_TEST_FILENAME_SIZE, "dset%d", i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /* Open the dataset asynchronously */ if ((dset_id[0] = H5Dopen_async(file_id, dset_name, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); if (op_failed) - PART_TEST_ERROR_API(multi_dset_close); + PART_TEST_ERROR(multi_dset_close); /*printf("\nwbuf:\n"); for(i = 0; i < 5; i++) { for(j = 0; j < 6; j++) { @@ -530,18 +530,18 @@ test_multi_dataset_io(void) for (j = 0; j < 6; j++) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(multi_dset_close); + PART_ERROR(multi_dset_close); } /* end if */ - PASSED_API(); + PASSED(); } PART_END(multi_dset_close); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Fclose_async(file_id, es_id) < 0) TEST_ERROR; @@ -557,7 +557,7 @@ test_multi_dataset_io(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -601,12 +601,12 @@ test_multi_file_dataset_io(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, dataset, or flush aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); /* Create dataspace */ if ((space_id = H5Screate_simple(2, dims, NULL)) < 0) @@ -616,32 +616,32 @@ test_multi_file_dataset_io(void) if ((es_id = H5EScreate()) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(multi_file_dset_open) { - TESTING_2_API("keeping files and datasets open"); + TESTING_2("keeping files and datasets open"); /* Loop over files */ for (i = 0; i < 5; i++) { /* Set file name */ if ((chars_written = snprintf(file_name, ASYNC_API_TEST_FILENAME_SIZE, ASYNC_API_TEST_FILE_PRINTF, i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); /* Create file asynchronously */ if ((file_id[i] = H5Fcreate_async(file_name, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); if (i > max_printf_file) max_printf_file = i; /* Create the dataset asynchronously */ if ((dset_id[i] = H5Dcreate_async(file_id[i], "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); /* Initialize wbuf. Must use a new slice of wbuf for each dset * since we can't overwrite the buffers until I/O is done. */ @@ -652,7 +652,7 @@ test_multi_file_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); } /* end for */ /* Loop over files */ @@ -660,48 +660,48 @@ test_multi_file_dataset_io(void) /* Flush the dataset asynchronously. This will effectively work as a * barrier, guaranteeing the read takes place after the write. */ if (H5Oflush_async(dset_id[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id[i], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); if (op_failed) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); /* Verify the read data */ for (i = 0; i < 5; i++) for (j = 0; j < 6; j++) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(multi_file_dset_open); + PART_ERROR(multi_file_dset_open); } /* end if */ /* Close the datasets */ for (i = 0; i < 5; i++) if (H5Dclose(dset_id[i]) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); - PASSED_API(); + PASSED(); } PART_END(multi_file_dset_open); PART_BEGIN(multi_file_dset_dclose) { - TESTING_2_API("closing datasets between I/O"); + TESTING_2("closing datasets between I/O"); /* Loop over files */ for (i = 0; i < 5; i++) { /* Open the dataset asynchronously */ if ((dset_id[0] = H5Dopen_async(file_id[i], "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); /* Update wbuf */ for (j = 0; j < 6; j++) @@ -711,11 +711,11 @@ test_multi_file_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); } /* end for */ /* Loop over files */ @@ -723,65 +723,65 @@ test_multi_file_dataset_io(void) /* Flush the file asynchronously. This will effectively work as a * barrier, guaranteeing the read takes place after the write. */ if (H5Fflush_async(file_id[i], H5F_SCOPE_LOCAL, es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_open); + PART_TEST_ERROR(multi_file_dset_open); /* Open the dataset asynchronously */ if ((dset_id[0] = H5Dopen_async(file_id[i], "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); if (op_failed) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); /* Verify the read data */ for (i = 0; i < 5; i++) for (j = 0; j < 6; j++) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(multi_file_dset_dclose); + PART_ERROR(multi_file_dset_dclose); } /* end if */ /* Close the files */ for (i = 0; i < 5; i++) if (H5Fclose(file_id[i]) < 0) - PART_TEST_ERROR_API(multi_file_dset_dclose); + PART_TEST_ERROR(multi_file_dset_dclose); - PASSED_API(); + PASSED(); } PART_END(multi_file_dset_dclose); PART_BEGIN(multi_file_dset_fclose) { - TESTING_2_API("closing files between I/O"); + TESTING_2("closing files between I/O"); /* Loop over files */ for (i = 0; i < 5; i++) { /* Set file name */ if ((chars_written = snprintf(file_name, ASYNC_API_TEST_FILENAME_SIZE, ASYNC_API_TEST_FILE_PRINTF, i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Open the file asynchronously */ if ((file_id[0] = H5Fopen_async(file_name, H5F_ACC_RDWR, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Open the dataset asynchronously */ if ((dset_id[0] = H5Dopen_async(file_id[0], "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Update wbuf */ for (j = 0; j < 6; j++) @@ -791,75 +791,75 @@ test_multi_file_dataset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Close the file asynchronously */ if (H5Fclose_async(file_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); if (op_failed) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Loop over files */ for (i = 0; i < 5; i++) { /* Set file name */ if ((chars_written = snprintf(file_name, ASYNC_API_TEST_FILENAME_SIZE, ASYNC_API_TEST_FILE_PRINTF, i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Open the file asynchronously */ if ((file_id[0] = H5Fopen_async(file_name, H5F_ACC_RDONLY, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Open the dataset asynchronously */ if ((dset_id[0] = H5Dopen_async(file_id[0], "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id[0], H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Close the file asynchronously */ if (H5Fclose_async(file_id[0], es_id) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); if (op_failed) - PART_TEST_ERROR_API(multi_file_dset_fclose); + PART_TEST_ERROR(multi_file_dset_fclose); /* Verify the read data */ for (i = 0; i < 5; i++) for (j = 0; j < 6; j++) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(multi_file_dset_fclose); + PART_ERROR(multi_file_dset_fclose); } /* end if */ - PASSED_API(); + PASSED(); } PART_END(multi_file_dset_fclose); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) @@ -872,7 +872,7 @@ test_multi_file_dataset_io(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -918,12 +918,12 @@ test_multi_file_grp_dset_io(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); /* Create dataspace */ if ((space_id = H5Screate_simple(2, dims, NULL)) < 0) @@ -933,37 +933,37 @@ test_multi_file_grp_dset_io(void) if ((es_id = H5EScreate()) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(multi_file_grp_dset_no_kick) { - TESTING_2_API("without intermediate calls to H5ESwait()"); + TESTING_2("without intermediate calls to H5ESwait()"); /* Loop over files */ for (i = 0; i < 5; i++) { /* Set file name */ if ((chars_written = snprintf(file_name, ASYNC_API_TEST_FILENAME_SIZE, ASYNC_API_TEST_FILE_PRINTF, i)) < 0 || (chars_written >= ASYNC_API_TEST_FILENAME_SIZE)) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Create file asynchronously */ if ((file_id = H5Fcreate_async(file_name, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); if (i > max_printf_file) max_printf_file = i; /* Create the group asynchronously */ if ((grp_id = H5Gcreate_async(file_id, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Create the dataset asynchronously */ if ((dset_id = H5Dcreate_async(grp_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Initialize wbuf. Must use a new slice of wbuf for each dset * since we can't overwrite the buffers until I/O is done. */ @@ -974,110 +974,110 @@ test_multi_file_grp_dset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Close the group asynchronously */ if (H5Gclose_async(grp_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Close the file asynchronously */ if (H5Fclose_async(file_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); if (op_failed) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Loop over files */ for (i = 0; i < 5; i++) { /* Set file name */ if ((chars_written = snprintf(file_name, ASYNC_API_TEST_FILENAME_SIZE, ASYNC_API_TEST_FILE_PRINTF, i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Open the file asynchronously */ if ((file_id = H5Fopen_async(file_name, H5F_ACC_RDONLY, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Open the group asynchronously */ if ((grp_id = H5Gopen_async(file_id, "grp", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Open the dataset asynchronously */ if ((dset_id = H5Dopen_async(grp_id, "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Close the group asynchronously */ if (H5Gclose_async(grp_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Close the file asynchronously */ if (H5Fclose_async(file_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); if (op_failed) - PART_TEST_ERROR_API(multi_file_grp_dset_no_kick); + PART_TEST_ERROR(multi_file_grp_dset_no_kick); /* Verify the read data */ for (i = 0; i < 5; i++) for (j = 0; j < 6; j++) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(multi_file_grp_dset_no_kick); + PART_ERROR(multi_file_grp_dset_no_kick); } /* end if */ - PASSED_API(); + PASSED(); } PART_END(multi_file_grp_dset_no_kick); PART_BEGIN(multi_file_grp_dset_kick) { - TESTING_2_API("with intermediate calls to H5ESwait() (0 timeout)"); + TESTING_2("with intermediate calls to H5ESwait() (0 timeout)"); /* Loop over files */ for (i = 0; i < 5; i++) { /* Set file name */ if ((chars_written = snprintf(file_name, ASYNC_API_TEST_FILENAME_SIZE, ASYNC_API_TEST_FILE_PRINTF, i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Create file asynchronously */ if ((file_id = H5Fcreate_async(file_name, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); if (i > max_printf_file) max_printf_file = i; /* Create the group asynchronously */ if ((grp_id = H5Gcreate_async(file_id, "grp", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Create the dataset asynchronously */ if ((dset_id = H5Dcreate_async(grp_id, "dset", H5T_NATIVE_INT, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Update wbuf */ for (j = 0; j < 6; j++) @@ -1087,98 +1087,98 @@ test_multi_file_grp_dset_io(void) /* Write the dataset asynchronously */ if (H5Dwrite_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Close the group asynchronously */ if (H5Gclose_async(grp_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Close the file asynchronously */ if (H5Fclose_async(file_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Kick the event stack to make progress */ if (H5ESwait(es_id, 0, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); if (op_failed) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); if (op_failed) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Loop over files */ for (i = 0; i < 5; i++) { /* Set file name */ if ((chars_written = snprintf(file_name, ASYNC_API_TEST_FILENAME_SIZE, ASYNC_API_TEST_FILE_PRINTF, i)) < 0 || chars_written >= ASYNC_API_TEST_FILENAME_SIZE) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Open the file asynchronously */ if ((file_id = H5Fopen_async(file_name, H5F_ACC_RDONLY, H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Open the group asynchronously */ if ((grp_id = H5Gopen_async(file_id, "grp", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Open the dataset asynchronously */ if ((dset_id = H5Dopen_async(grp_id, "dset", H5P_DEFAULT, es_id)) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Read the dataset asynchronously */ if (H5Dread_async(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf[i], es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Close the dataset asynchronously */ if (H5Dclose_async(dset_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Close the group asynchronously */ if (H5Gclose_async(grp_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Close the file asynchronously */ if (H5Fclose_async(file_id, es_id) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Kick the event stack to make progress */ if (H5ESwait(es_id, 0, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); if (op_failed) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); } /* end for */ /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); if (op_failed) - PART_TEST_ERROR_API(multi_file_grp_dset_kick); + PART_TEST_ERROR(multi_file_grp_dset_kick); /* Verify the read data */ for (i = 0; i < 5; i++) for (j = 0; j < 6; j++) for (k = 0; k < 10; k++) if (wbuf[i][j][k] != rbuf[i][j][k]) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); - PART_ERROR_API(multi_file_grp_dset_kick); + PART_ERROR(multi_file_grp_dset_kick); } /* end if */ - PASSED_API(); + PASSED(); } PART_END(multi_file_grp_dset_kick); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) @@ -1191,7 +1191,7 @@ test_multi_file_grp_dset_io(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1237,12 +1237,12 @@ test_set_extent(void) int rbuf[6][10]; int i, j; - TESTING_API("H5Dset_extent() and H5Dget_space()"); + TESTING("H5Dset_extent() and H5Dget_space()"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, dataset, dataset more, or flush aren't supported with " "this connector\n"); return 0; @@ -1329,7 +1329,7 @@ test_set_extent(void) if ((tri_ret = H5Sextent_equal(fspace_id[i], fspace_out[i])) < 0) TEST_ERROR; if (!tri_ret) - FAIL_PUTS_ERROR_API(" dataspaces are not equal\n"); + FAIL_PUTS_ERROR(" dataspaces are not equal\n"); if (i && H5Sclose(fspace_id[i]) < 0) TEST_ERROR; if (H5Sclose(fspace_out[i]) < 0) @@ -1346,7 +1346,7 @@ test_set_extent(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); /* * Now try extending the dataset, closing it, reopening it, and getting the @@ -1377,7 +1377,7 @@ test_set_extent(void) if ((tri_ret = H5Sextent_equal(fspace_id[0], fspace_out[0])) < 0) TEST_ERROR; if (!tri_ret) - FAIL_PUTS_ERROR_API(" dataspaces are not equal\n"); + FAIL_PUTS_ERROR(" dataspaces are not equal\n"); /* Wait for the event stack to complete */ if (H5ESwait(es_id, H5_API_TEST_WAIT_FOREVER, &num_in_progress, &op_failed) < 0) @@ -1401,7 +1401,7 @@ test_set_extent(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1441,12 +1441,12 @@ test_attribute_exists(void) size_t num_in_progress; hbool_t op_failed; - TESTING_API("H5Aexists()"); + TESTING("H5Aexists()"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, dataset, dataset more, attribute, or flush aren't " "supported with this connector\n"); return 0; @@ -1502,9 +1502,9 @@ test_attribute_exists(void) /* Check if H5Aexists returned the correct values */ if (exists1) - FAIL_PUTS_ERROR_API(" H5Aexists returned TRUE for an attribute that should not exist"); + FAIL_PUTS_ERROR(" H5Aexists returned TRUE for an attribute that should not exist"); if (!exists2) - FAIL_PUTS_ERROR_API(" H5Aexists returned FALSE for an attribute that should exist"); + FAIL_PUTS_ERROR(" H5Aexists returned FALSE for an attribute that should exist"); /* Close */ if (H5Aclose_async(attr_id, es_id) < 0) @@ -1525,7 +1525,7 @@ test_attribute_exists(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1562,12 +1562,12 @@ test_attribute_io(void) int rbuf[6][10]; int i, j; - TESTING_API("attribute I/O"); + TESTING("attribute I/O"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, dataset, dataset more, attribute, or flush aren't " "supported with this connector\n"); return 0; @@ -1623,7 +1623,7 @@ test_attribute_io(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); /* Close the attribute asynchronously */ if (H5Aclose_async(attr_id, es_id) < 0) @@ -1647,7 +1647,7 @@ test_attribute_io(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); /* Close out of order to see if it trips things up */ if (H5Dclose_async(dset_id, es_id) < 0) @@ -1668,7 +1668,7 @@ test_attribute_io(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1704,12 +1704,12 @@ test_attribute_io_tconv(void) int rbuf[6][10]; int i, j; - TESTING_API("attribute I/O with type conversion"); + TESTING("attribute I/O with type conversion"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, attribute, or flush aren't supported with this connector\n"); return 0; @@ -1760,7 +1760,7 @@ test_attribute_io_tconv(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); /* Close the attribute asynchronously */ if (H5Aclose_async(attr_id, es_id) < 0) @@ -1785,7 +1785,7 @@ test_attribute_io_tconv(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) if (wbuf[i][j] != rbuf[i][j]) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); /* Close */ if (H5Aclose_async(attr_id, es_id) < 0) @@ -1804,7 +1804,7 @@ test_attribute_io_tconv(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1850,12 +1850,12 @@ test_attribute_io_compound(void) tattr_cmpd_t fbuf[6][10]; int i, j; - TESTING_API("attribute I/O with compound type conversion"); + TESTING("attribute I/O with compound type conversion"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, attribute, or flush aren't supported with this connector\n"); return 0; @@ -1940,9 +1940,9 @@ test_attribute_io_compound(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) { if (rbuf[i][j].a != fbuf[i][j].a) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); if (rbuf[i][j].b != fbuf[i][j].b) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); } /* end for */ /* Clear the read buffer */ @@ -1966,9 +1966,9 @@ test_attribute_io_compound(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) { if (rbuf[i][j].a != fbuf[i][j].a) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); if (rbuf[i][j].b != -2) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); } /* end for */ /* Clear the read buffer */ @@ -1992,9 +1992,9 @@ test_attribute_io_compound(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) { if (rbuf[i][j].a != -2) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); if (rbuf[i][j].b != fbuf[i][j].b) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); } /* end for */ /* Update wbuf */ @@ -2039,9 +2039,9 @@ test_attribute_io_compound(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) { if (rbuf[i][j].a != fbuf[i][j].a) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); if (rbuf[i][j].b != fbuf[i][j].b) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); } /* end for */ /* Update wbuf */ @@ -2086,9 +2086,9 @@ test_attribute_io_compound(void) for (i = 0; i < 6; i++) for (j = 0; j < 10; j++) { if (rbuf[i][j].a != fbuf[i][j].a) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); if (rbuf[i][j].b != fbuf[i][j].b) - FAIL_PUTS_ERROR_API(" data verification failed\n"); + FAIL_PUTS_ERROR(" data verification failed\n"); } /* end for */ /* Close */ @@ -2116,7 +2116,7 @@ test_attribute_io_compound(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2156,12 +2156,12 @@ test_group(void) size_t num_in_progress; hbool_t op_failed; - TESTING_API("group operations"); + TESTING("group operations"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or group more aren't supported " "with this connector\n"); return 0; @@ -2258,13 +2258,13 @@ test_group(void) /* Verify group infos */ if (info1.nlinks != 0) - FAIL_PUTS_ERROR_API(" incorrect number of links"); + FAIL_PUTS_ERROR(" incorrect number of links"); if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (info2.nlinks != 1) - FAIL_PUTS_ERROR_API(" incorrect number of links"); + FAIL_PUTS_ERROR(" incorrect number of links"); } if (info3.nlinks != 2) - FAIL_PUTS_ERROR_API(" incorrect number of links"); + FAIL_PUTS_ERROR(" incorrect number of links"); /* Close */ if (H5Gclose_async(group_id, es_id) < 0) @@ -2285,7 +2285,7 @@ test_group(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2325,14 +2325,14 @@ test_link(void) size_t num_in_progress; hbool_t op_failed; - TESTING_API("link operations"); + TESTING("link operations"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, link, hard link, soft link, flush, or creation order " "aren't supported with this connector\n"); return 0; @@ -2454,17 +2454,17 @@ test_link(void) /* Check if existence returns were correct */ if (!existsh1) - FAIL_PUTS_ERROR_API(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); if (!existss1) - FAIL_PUTS_ERROR_API(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); if (!existsh2) - FAIL_PUTS_ERROR_API(" link exists returned FALSE for link that should exist"); + FAIL_PUTS_ERROR(" link exists returned FALSE for link that should exist"); if (existss2) - FAIL_PUTS_ERROR_API(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); if (existsh3) - FAIL_PUTS_ERROR_API(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); if (existsh3) - FAIL_PUTS_ERROR_API(" link exists returned TRUE for link that should not exist"); + FAIL_PUTS_ERROR(" link exists returned TRUE for link that should not exist"); /* Close */ if (H5Gclose_async(parent_group_id, es_id) < 0) @@ -2483,7 +2483,7 @@ test_link(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2517,13 +2517,13 @@ test_ocopy_orefresh(void) size_t num_in_progress; hbool_t op_failed; - TESTING_API("H5Ocopy() and H5Orefresh()"); + TESTING("H5Ocopy() and H5Orefresh()"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, object more, flush, or refresh aren't " "supported with this connector\n"); return 0; @@ -2599,7 +2599,7 @@ test_ocopy_orefresh(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2629,11 +2629,11 @@ test_file_reopen(void) size_t num_in_progress; hbool_t op_failed; - TESTING_API("H5Freopen()"); + TESTING("H5Freopen()"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or file more aren't supported with this connector\n"); return 0; } @@ -2671,7 +2671,7 @@ test_file_reopen(void) if (H5ESclose(es_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2718,7 +2718,7 @@ H5_api_async_test(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_ASYNC)) { - SKIPPED_API(); + SKIPPED(); printf(" Async APIs aren't supported with this connector\n"); return 0; } diff --git a/test/API/H5_api_attribute_test.c b/test/API/H5_api_attribute_test.c index 31527d6636e..aa7b6f88103 100644 --- a/test/API/H5_api_attribute_test.c +++ b/test/API/H5_api_attribute_test.c @@ -125,15 +125,15 @@ test_create_attribute_on_root(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } @@ -146,72 +146,72 @@ test_create_attribute_on_root(void) if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Acreate2) { - TESTING_2_API("H5Acreate on the root group"); + TESTING_2("H5Acreate on the root group"); if ((attr_id = H5Acreate2(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME, attr_dtype1, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' using H5Acreate\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); - PART_ERROR_API(H5Acreate2); + PART_ERROR(H5Acreate2); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); - PART_ERROR_API(H5Acreate2); + PART_ERROR(H5Acreate2); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME); - PART_ERROR_API(H5Acreate2); + PART_ERROR(H5Acreate2); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate2); PART_BEGIN(H5Acreate_by_name) { - TESTING_2_API("H5Acreate_by_name on the root group"); + TESTING_2("H5Acreate_by_name on the root group"); if ((attr_id2 = H5Acreate_by_name(file_id, "/", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2, attr_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute on root group using H5Acreate_by_name\n"); - PART_ERROR_API(H5Acreate_by_name); + PART_ERROR(H5Acreate_by_name); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(file_id, ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2); - PART_ERROR_API(H5Acreate_by_name); + PART_ERROR(H5Acreate_by_name); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_ROOT_ATTR_NAME2); - PART_ERROR_API(H5Acreate_by_name); + PART_ERROR(H5Acreate_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -226,7 +226,7 @@ test_create_attribute_on_root(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -268,29 +268,29 @@ test_create_attribute_on_dataset(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or attribute aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATASET_GROUP_NAME); goto error; } @@ -311,77 +311,77 @@ test_create_attribute_on_dataset(void) if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_CREATE_ON_DATASET_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Acreate_on_dataset) { - TESTING_2_API("H5Acreate on a dataset"); + TESTING_2("H5Acreate on a dataset"); if ((attr_id = H5Acreate2(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME, attr_dtype1, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); - PART_ERROR_API(H5Acreate_on_dataset); + PART_ERROR(H5Acreate_on_dataset); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME); - PART_ERROR_API(H5Acreate_on_dataset); + PART_ERROR(H5Acreate_on_dataset); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME); - PART_ERROR_API(H5Acreate_on_dataset); + PART_ERROR(H5Acreate_on_dataset); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_on_dataset); PART_BEGIN(H5Acreate_by_name_on_dataset) { - TESTING_2_API("H5Acreate_by_name on a dataset"); + TESTING_2("H5Acreate_by_name on a dataset"); if ((attr_id2 = H5Acreate_by_name(group_id, ATTRIBUTE_CREATE_ON_DATASET_DSET_NAME, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2, attr_dtype2, attr_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute on dataset by name\n"); - PART_ERROR_API(H5Acreate_by_name_on_dataset); + PART_ERROR(H5Acreate_by_name_on_dataset); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(dset_id, ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2); - PART_ERROR_API(H5Acreate_by_name_on_dataset); + PART_ERROR(H5Acreate_by_name_on_dataset); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_CREATE_ON_DATASET_ATTR_NAME2); - PART_ERROR_API(H5Acreate_by_name_on_dataset); + PART_ERROR(H5Acreate_by_name_on_dataset); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_on_dataset); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dset_space_id) < 0) TEST_ERROR; @@ -406,7 +406,7 @@ test_create_attribute_on_dataset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -452,42 +452,42 @@ test_create_attribute_on_datatype(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, stored datatype, or attribute aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_ON_DATATYPE_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, ATTRIBUTE_CREATE_ON_DATATYPE_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype\n"); goto error; } @@ -500,69 +500,69 @@ test_create_attribute_on_datatype(void) if ((attr_dtype2 = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Acreate_on_datatype) { - TESTING_2_API("H5Acreate on a committed datatype"); + TESTING_2("H5Acreate on a committed datatype"); if ((attr_id = H5Acreate2(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME, attr_dtype1, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute on datatype using H5Acreate\n"); - PART_ERROR_API(H5Acreate_on_datatype); + PART_ERROR(H5Acreate_on_datatype); } if ((attr_exists = H5Aexists(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); - PART_ERROR_API(H5Acreate_on_datatype); + PART_ERROR(H5Acreate_on_datatype); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); - PART_ERROR_API(H5Acreate_on_datatype); + PART_ERROR(H5Acreate_on_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_on_datatype); PART_BEGIN(H5Acreate_by_name_on_datatype) { - TESTING_2_API("H5Acreate_by_name on a committed datatype"); + TESTING_2("H5Acreate_by_name on a committed datatype"); if ((attr_id2 = H5Acreate_by_name(group_id, ATTRIBUTE_CREATE_ON_DATATYPE_DTYPE_NAME, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME2, attr_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute on datatype using H5Acreate_by_name\n"); - PART_ERROR_API(H5Acreate_by_name_on_datatype); + PART_ERROR(H5Acreate_by_name_on_datatype); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(type_id, ATTRIBUTE_CREATE_ON_DATATYPE_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); - PART_ERROR_API(H5Acreate_by_name_on_datatype); + PART_ERROR(H5Acreate_by_name_on_datatype); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); - PART_ERROR_API(H5Acreate_by_name_on_datatype); + PART_ERROR(H5Acreate_by_name_on_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_on_datatype); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -583,7 +583,7 @@ test_create_attribute_on_datatype(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -619,32 +619,32 @@ test_create_attribute_with_null_space(void) hid_t attr_dtype = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - TESTING_API("attribute creation with a NULL dataspace"); + TESTING("attribute creation with a NULL dataspace"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup\n"); goto error; } @@ -657,20 +657,20 @@ test_create_attribute_with_null_space(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -679,7 +679,7 @@ test_create_attribute_with_null_space(void) TEST_ERROR; if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_NULL_DATASPACE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute\n"); goto error; } @@ -697,7 +697,7 @@ test_create_attribute_with_null_space(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -730,32 +730,32 @@ test_create_attribute_with_scalar_space(void) hid_t attr_dtype = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - TESTING_API("attribute creation with a SCALAR dataspace"); + TESTING("attribute creation with a SCALAR dataspace"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup\n"); goto error; } @@ -768,20 +768,20 @@ test_create_attribute_with_scalar_space(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -790,7 +790,7 @@ test_create_attribute_with_scalar_space(void) TEST_ERROR; if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_SCALAR_DATASPACE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute\n"); goto error; } @@ -808,7 +808,7 @@ test_create_attribute_with_scalar_space(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -843,32 +843,32 @@ test_create_attribute_with_space_in_name(void) hid_t attr_dtype = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - TESTING_API("attribute creation with a space in attribute's name"); + TESTING("attribute creation with a space in attribute's name"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_GROUP_NAME); goto error; } @@ -882,20 +882,20 @@ test_create_attribute_with_space_in_name(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_WITH_SPACE_IN_NAME_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -913,7 +913,7 @@ test_create_attribute_with_space_in_name(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -951,29 +951,29 @@ test_create_attribute_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group\n"); goto error; } @@ -984,13 +984,13 @@ test_create_attribute_invalid_params(void) if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Acreate_invalid_loc_id) { - TESTING_2_API("H5Acreate with invalid loc_id"); + TESTING_2("H5Acreate with invalid loc_id"); H5E_BEGIN_TRY { @@ -1000,19 +1000,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate with an invalid loc_id!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_invalid_loc_id); + PART_ERROR(H5Acreate_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_invalid_loc_id); PART_BEGIN(H5Acreate_invalid_attr_name) { - TESTING_2_API("H5Acreate with invalid attribute name"); + TESTING_2("H5Acreate with invalid attribute name"); H5E_BEGIN_TRY { @@ -1021,10 +1021,10 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate with a NULL name!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_invalid_attr_name); + PART_ERROR(H5Acreate_invalid_attr_name); } H5E_BEGIN_TRY @@ -1034,19 +1034,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate with an invalid name of ''!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_invalid_attr_name); + PART_ERROR(H5Acreate_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_invalid_attr_name); PART_BEGIN(H5Acreate_invalid_datatype) { - TESTING_2_API("H5Acreate with an invalid datatype"); + TESTING_2("H5Acreate with an invalid datatype"); H5E_BEGIN_TRY { @@ -1056,19 +1056,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate with an invalid datatype!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_invalid_datatype); + PART_ERROR(H5Acreate_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_invalid_datatype); PART_BEGIN(H5Acreate_invalid_dataspace) { - TESTING_2_API("H5Acreate with an invalid dataspace"); + TESTING_2("H5Acreate with an invalid dataspace"); H5E_BEGIN_TRY { @@ -1078,19 +1078,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate with an invalid dataspace!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_invalid_dataspace); + PART_ERROR(H5Acreate_invalid_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_invalid_dataspace); PART_BEGIN(H5Acreate_invalid_acpl) { - TESTING_2_API("H5Acreate with an invalid ACPL"); + TESTING_2("H5Acreate with an invalid ACPL"); H5E_BEGIN_TRY { @@ -1100,19 +1100,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate with an invalid ACPL!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_invalid_acpl); + PART_ERROR(H5Acreate_invalid_acpl); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_invalid_acpl); PART_BEGIN(H5Acreate_invalid_aapl) { - TESTING_2_API("H5Acreate with an invalid AAPL"); + TESTING_2("H5Acreate with an invalid AAPL"); H5E_BEGIN_TRY { @@ -1122,19 +1122,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate with an invalid AAPL!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_invalid_aapl); + PART_ERROR(H5Acreate_invalid_aapl); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_invalid_aapl); PART_BEGIN(H5Acreate_by_name_invalid_loc_id) { - TESTING_2_API("H5Acreate_by_name with an invalid loc_id"); + TESTING_2("H5Acreate_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -1145,19 +1145,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with an invalid loc_id!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_loc_id); + PART_ERROR(H5Acreate_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_loc_id); PART_BEGIN(H5Acreate_by_name_invalid_obj_name) { - TESTING_2_API("H5Acreate_by_name with invalid object name"); + TESTING_2("H5Acreate_by_name with invalid object name"); H5E_BEGIN_TRY { @@ -1167,10 +1167,10 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with a NULL object name!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_obj_name); + PART_ERROR(H5Acreate_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -1181,19 +1181,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with an invalid object name of ''!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_obj_name); + PART_ERROR(H5Acreate_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_obj_name); PART_BEGIN(H5Acreate_by_name_invalid_attr_name) { - TESTING_2_API("H5Acreate_by_name with invalid attribute name"); + TESTING_2("H5Acreate_by_name with invalid attribute name"); H5E_BEGIN_TRY { @@ -1203,10 +1203,10 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with a NULL attribute name!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_attr_name); + PART_ERROR(H5Acreate_by_name_invalid_attr_name); } H5E_BEGIN_TRY @@ -1217,20 +1217,20 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " created attribute using H5Acreate_by_name with an invalid attribute name of ''!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_attr_name); + PART_ERROR(H5Acreate_by_name_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_attr_name); PART_BEGIN(H5Acreate_by_name_invalid_datatype) { - TESTING_2_API("H5Acreate_by_name with invalid datatype"); + TESTING_2("H5Acreate_by_name with invalid datatype"); H5E_BEGIN_TRY { @@ -1241,19 +1241,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with an invalid datatype!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_datatype); + PART_ERROR(H5Acreate_by_name_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_datatype); PART_BEGIN(H5Acreate_by_name_invalid_dataspace) { - TESTING_2_API("H5Acreate_by_name with invalid dataspace"); + TESTING_2("H5Acreate_by_name with invalid dataspace"); H5E_BEGIN_TRY { @@ -1264,19 +1264,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with an invalid dataspace!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_dataspace); + PART_ERROR(H5Acreate_by_name_invalid_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_dataspace); PART_BEGIN(H5Acreate_by_name_invalid_acpl) { - TESTING_2_API("H5Acreate_by_name with invalid ACPL"); + TESTING_2("H5Acreate_by_name with invalid ACPL"); H5E_BEGIN_TRY { @@ -1287,19 +1287,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with an invalid ACPL!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_acpl); + PART_ERROR(H5Acreate_by_name_invalid_acpl); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_acpl); PART_BEGIN(H5Acreate_by_name_invalid_aapl) { - TESTING_2_API("H5Acreate_by_name with invalid AAPL"); + TESTING_2("H5Acreate_by_name with invalid AAPL"); H5E_BEGIN_TRY { @@ -1310,19 +1310,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with an invalid AAPL!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_aapl); + PART_ERROR(H5Acreate_by_name_invalid_aapl); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_aapl); PART_BEGIN(H5Acreate_by_name_invalid_lapl) { - TESTING_2_API("H5Acreate_by_name with invalid LAPL"); + TESTING_2("H5Acreate_by_name with invalid LAPL"); H5E_BEGIN_TRY { @@ -1333,19 +1333,19 @@ test_create_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created attribute using H5Acreate_by_name with an invalid LAPL!\n"); H5Aclose(attr_id); - PART_ERROR_API(H5Acreate_by_name_invalid_lapl); + PART_ERROR(H5Acreate_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -1358,7 +1358,7 @@ test_create_attribute_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1395,35 +1395,35 @@ test_open_attribute(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or attribute aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order tracking\n"); goto error; } @@ -1431,7 +1431,7 @@ test_open_attribute(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_OPEN_TEST_GROUP_NAME); goto error; } @@ -1445,7 +1445,7 @@ test_open_attribute(void) /* Create several attributes */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); goto error; } @@ -1455,7 +1455,7 @@ test_open_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME2, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); goto error; } @@ -1465,7 +1465,7 @@ test_open_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME3, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); goto error; } @@ -1473,279 +1473,279 @@ test_open_attribute(void) if (H5Aclose(attr_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aopen) { - TESTING_2_API("H5Aopen"); + TESTING_2("H5Aopen"); if ((attr_id = H5Aopen(group_id, ATTRIBUTE_OPEN_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' using H5Aopen\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen); + PART_ERROR(H5Aopen); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen); + PART_ERROR(H5Aopen); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen); PART_BEGIN(H5Aopen_by_name) { - TESTING_2_API("H5Aopen_by_name"); + TESTING_2("H5Aopen_by_name"); if ((attr_id = H5Aopen_by_name(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, ATTRIBUTE_OPEN_TEST_ATTR_NAME, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' using H5Aopen_by_name\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen_by_name); + PART_ERROR(H5Aopen_by_name); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen_by_name); + PART_ERROR(H5Aopen_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_name); PART_BEGIN(H5Aopen_by_idx_crt_order_increasing) { - TESTING_2_API("H5Aopen_by_idx by creation order in increasing order"); + TESTING_2("H5Aopen_by_idx by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking is not supported with this VOL connector\n"); PART_EMPTY(H5Aopen_by_idx_crt_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " "order in increasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0); - PART_ERROR_API(H5Aopen_by_idx_crt_order_increasing); + PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen_by_idx_crt_order_increasing); + PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " "order in increasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); - PART_ERROR_API(H5Aopen_by_idx_crt_order_increasing); + PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); - PART_ERROR_API(H5Aopen_by_idx_crt_order_increasing); + PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " "order in increasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2); - PART_ERROR_API(H5Aopen_by_idx_crt_order_increasing); + PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); - PART_ERROR_API(H5Aopen_by_idx_crt_order_increasing); + PART_ERROR(H5Aopen_by_idx_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_crt_order_increasing); PART_BEGIN(H5Aopen_by_idx_crt_order_decreasing) { - TESTING_2_API("H5Aopen_by_idx by creation order in decreasing order"); + TESTING_2("H5Aopen_by_idx by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking is not supported with this VOL connector\n"); PART_EMPTY(H5Aopen_by_idx_crt_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " "order in decreasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2); - PART_ERROR_API(H5Aopen_by_idx_crt_order_decreasing); + PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen_by_idx_crt_order_decreasing); + PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " "order in decreasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); - PART_ERROR_API(H5Aopen_by_idx_crt_order_decreasing); + PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); - PART_ERROR_API(H5Aopen_by_idx_crt_order_decreasing); + PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by creation " "order in decreasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0); - PART_ERROR_API(H5Aopen_by_idx_crt_order_decreasing); + PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); - PART_ERROR_API(H5Aopen_by_idx_crt_order_decreasing); + PART_ERROR(H5Aopen_by_idx_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_crt_order_decreasing); PART_BEGIN(H5Aopen_by_idx_name_order_increasing) { - TESTING_2_API("H5Aopen_by_idx by alphabetical order in increasing order"); + TESTING_2("H5Aopen_by_idx by alphabetical order in increasing order"); if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " "order in increasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME, 0); - PART_ERROR_API(H5Aopen_by_idx_name_order_increasing); + PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen_by_idx_name_order_increasing); + PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " "order in increasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); - PART_ERROR_API(H5Aopen_by_idx_name_order_increasing); + PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); - PART_ERROR_API(H5Aopen_by_idx_name_order_increasing); + PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by alphabetical " "order in increasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 2); - PART_ERROR_API(H5Aopen_by_idx_name_order_increasing); + PART_ERROR(H5Aopen_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); - PART_ERROR_API(H5Aopen_by_idx_name_order_increasing); + PART_ERROR(H5Aopen_by_idx_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_name_order_increasing); PART_BEGIN(H5Aopen_by_idx_name_order_decreasing) { - TESTING_2_API("H5Aopen_by_idx by alphabetical order in decreasing order"); + TESTING_2("H5Aopen_by_idx by alphabetical order in decreasing order"); if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " "alphabetical order in decreasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME, 2); - PART_ERROR_API(H5Aopen_by_idx_name_order_decreasing); + PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME); - PART_ERROR_API(H5Aopen_by_idx_name_order_decreasing); + PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " "alphabetical order in decreasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2, 1); - PART_ERROR_API(H5Aopen_by_idx_name_order_decreasing); + PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME2); - PART_ERROR_API(H5Aopen_by_idx_name_order_decreasing); + PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if ((attr_id = H5Aopen_by_idx(container_group, ATTRIBUTE_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s' at index %d using H5Aopen_by_idx by " "alphabetical order in decreasing order\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3, 0); - PART_ERROR_API(H5Aopen_by_idx_name_order_decreasing); + PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_OPEN_TEST_ATTR_NAME3); - PART_ERROR_API(H5Aopen_by_idx_name_order_decreasing); + PART_ERROR(H5Aopen_by_idx_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_name_order_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -1760,7 +1760,7 @@ test_open_attribute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1798,29 +1798,29 @@ test_open_attribute_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -1834,7 +1834,7 @@ test_open_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME, attr_type, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); goto error; } @@ -1842,13 +1842,13 @@ test_open_attribute_invalid_params(void) if (H5Aclose(attr_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aopen_invalid_loc_id) { - TESTING_2_API("H5Aopen with an invalid loc_id"); + TESTING_2("H5Aopen with an invalid loc_id"); H5E_BEGIN_TRY { @@ -1857,20 +1857,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen with an invalid loc_id!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_invalid_loc_id); + PART_ERROR(H5Aopen_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_invalid_loc_id); PART_BEGIN(H5Aopen_invalid_attr_name) { - TESTING_2_API("H5Aopen with an invalid attribute name"); + TESTING_2("H5Aopen with an invalid attribute name"); H5E_BEGIN_TRY { @@ -1879,11 +1879,11 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen with a NULL attribute name!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_invalid_attr_name); + PART_ERROR(H5Aopen_invalid_attr_name); } H5E_BEGIN_TRY @@ -1893,20 +1893,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen with an invalid attribute name of ''!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_invalid_attr_name); + PART_ERROR(H5Aopen_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_invalid_attr_name); PART_BEGIN(H5Aopen_invalid_aapl) { - TESTING_2_API("H5Aopen with an invalid AAPL"); + TESTING_2("H5Aopen with an invalid AAPL"); H5E_BEGIN_TRY { @@ -1915,20 +1915,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen with an invalid AAPL!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_invalid_aapl); + PART_ERROR(H5Aopen_invalid_aapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_invalid_aapl); PART_BEGIN(H5Aopen_by_name_invalid_loc_id) { - TESTING_2_API("H5Aopen_by_name with an invalid loc_id"); + TESTING_2("H5Aopen_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -1939,20 +1939,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_name with an invalid loc_id!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_name_invalid_loc_id); + PART_ERROR(H5Aopen_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_name_invalid_loc_id); PART_BEGIN(H5Aopen_by_name_invalid_obj_name) { - TESTING_2_API("H5Aopen_by_name with an invalid object name"); + TESTING_2("H5Aopen_by_name with an invalid object name"); H5E_BEGIN_TRY { @@ -1962,11 +1962,11 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_name with a NULL object name!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_name_invalid_obj_name); + PART_ERROR(H5Aopen_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -1977,20 +1977,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_name with an invalid object name of ''!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_name_invalid_obj_name); + PART_ERROR(H5Aopen_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_name_invalid_obj_name); PART_BEGIN(H5Aopen_by_name_invalid_attr_name) { - TESTING_2_API("H5Aopen_by_name with an invalid attribute name"); + TESTING_2("H5Aopen_by_name with an invalid attribute name"); H5E_BEGIN_TRY { @@ -2000,11 +2000,11 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_name with a NULL attribute name!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_name_invalid_attr_name); + PART_ERROR(H5Aopen_by_name_invalid_attr_name); } H5E_BEGIN_TRY @@ -2015,21 +2015,21 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " opened attribute '%s' using H5Aopen_by_name with an invalid attribute name of ''!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_name_invalid_attr_name); + PART_ERROR(H5Aopen_by_name_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_name_invalid_attr_name); PART_BEGIN(H5Aopen_by_name_invalid_aapl) { - TESTING_2_API("H5Aopen_by_name with an invalid AAPL"); + TESTING_2("H5Aopen_by_name with an invalid AAPL"); H5E_BEGIN_TRY { @@ -2040,20 +2040,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_name with an invalid AAPL!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_name_invalid_aapl); + PART_ERROR(H5Aopen_by_name_invalid_aapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_name_invalid_aapl); PART_BEGIN(H5Aopen_by_name_invalid_lapl) { - TESTING_2_API("H5Aopen_by_name with an invalid LAPL"); + TESTING_2("H5Aopen_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -2064,20 +2064,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_name with an invalid LAPL!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_name_invalid_lapl); + PART_ERROR(H5Aopen_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_name_invalid_lapl); PART_BEGIN(H5Aopen_by_idx_invalid_loc_id) { - TESTING_2_API("H5Aopen_by_idx with an invalid loc_id"); + TESTING_2("H5Aopen_by_idx with an invalid loc_id"); H5E_BEGIN_TRY { @@ -2087,20 +2087,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid loc_id!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_loc_id); + PART_ERROR(H5Aopen_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_invalid_loc_id); PART_BEGIN(H5Aopen_by_idx_invalid_obj_name) { - TESTING_2_API("H5Aopen_by_idx with an invalid object name"); + TESTING_2("H5Aopen_by_idx with an invalid object name"); H5E_BEGIN_TRY { @@ -2110,11 +2110,11 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with a NULL object name!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_obj_name); + PART_ERROR(H5Aopen_by_idx_invalid_obj_name); } H5E_BEGIN_TRY @@ -2125,20 +2125,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid object name of ''!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_obj_name); + PART_ERROR(H5Aopen_by_idx_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_invalid_obj_name); PART_BEGIN(H5Aopen_by_idx_invalid_index_type) { - TESTING_2_API("H5Aopen_by_idx with an invalid index type"); + TESTING_2("H5Aopen_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -2148,12 +2148,12 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with invalid index type " "H5_INDEX_UNKNOWN!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_index_type); + PART_ERROR(H5Aopen_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -2164,20 +2164,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with invalid index type H5_INDEX_N!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_index_type); + PART_ERROR(H5Aopen_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_invalid_index_type); PART_BEGIN(H5Aopen_by_idx_invalid_iter_order) { - TESTING_2_API("H5Aopen_by_idx with an invalid iteration order"); + TESTING_2("H5Aopen_by_idx with an invalid iteration order"); H5E_BEGIN_TRY { @@ -2187,12 +2187,12 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with invalid iteration order " "H5_ITER_UNKNOWN!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_iter_order); + PART_ERROR(H5Aopen_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -2203,21 +2203,21 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with invalid iteration order " "H5_ITER_N!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_iter_order); + PART_ERROR(H5Aopen_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_invalid_iter_order); PART_BEGIN(H5Aopen_by_idx_invalid_aapl) { - TESTING_2_API("H5Aopen_by_idx with an invalid AAPL"); + TESTING_2("H5Aopen_by_idx with an invalid AAPL"); H5E_BEGIN_TRY { @@ -2227,20 +2227,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid AAPL!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_aapl); + PART_ERROR(H5Aopen_by_idx_invalid_aapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_invalid_aapl); PART_BEGIN(H5Aopen_by_idx_invalid_lapl) { - TESTING_2_API("H5Aopen_by_idx with an invalid LAPL"); + TESTING_2("H5Aopen_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -2250,20 +2250,20 @@ test_open_attribute_invalid_params(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened attribute '%s' using H5Aopen_by_idx with an invalid LAPL!\n", ATTRIBUTE_OPEN_INVALID_PARAMS_TEST_ATTR_NAME); H5Aclose(attr_id); - PART_ERROR_API(H5Aopen_by_idx_invalid_lapl); + PART_ERROR(H5Aopen_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aopen_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -2276,7 +2276,7 @@ test_open_attribute_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2312,32 +2312,32 @@ test_write_attribute(void) hid_t space_id = H5I_INVALID_HID; void *data = NULL; - TESTING_API("H5Awrite"); + TESTING("H5Awrite"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or file flush aren't supported with " "this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_WRITE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_WRITE_TEST_GROUP_NAME); goto error; } @@ -2347,20 +2347,20 @@ test_write_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_WRITE_TEST_ATTR_NAME, ATTRIBUTE_WRITE_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_WRITE_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -2376,14 +2376,14 @@ test_write_attribute(void) ((int *)data)[i] = (int)i; if (H5Awrite(attr_id, ATTRIBUTE_WRITE_TEST_ATTR_DTYPE, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to attribute\n"); goto error; } /* Make sure that the attribute can be flushed to the file */ if (H5Fflush(file_id, H5F_SCOPE_GLOBAL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't flush the attribute\n"); goto error; } @@ -2404,7 +2404,7 @@ test_write_attribute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2447,29 +2447,29 @@ test_write_attribute_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -2481,20 +2481,20 @@ test_write_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_NAME, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -2509,13 +2509,13 @@ test_write_attribute_invalid_params(void) for (i = 0; i < data_size / ATTRIBUTE_WRITE_INVALID_PARAMS_TEST_ATTR_DTYPE_SIZE; i++) ((int *)data)[i] = (int)i; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Awrite_invalid_attr_id) { - TESTING_2_API("H5Awrite with an invalid attr_id"); + TESTING_2("H5Awrite with an invalid attr_id"); H5E_BEGIN_TRY { @@ -2524,18 +2524,18 @@ test_write_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to attribute using an invalid attr_id!\n"); - PART_ERROR_API(H5Awrite_invalid_attr_id); + PART_ERROR(H5Awrite_invalid_attr_id); } - PASSED_API(); + PASSED(); } PART_END(H5Awrite_invalid_attr_id); PART_BEGIN(H5Awrite_invalid_datatype) { - TESTING_2_API("H5Awrite with an invalid datatype"); + TESTING_2("H5Awrite with an invalid datatype"); H5E_BEGIN_TRY { @@ -2544,18 +2544,18 @@ test_write_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to attribute using an invalid datatype!\n"); - PART_ERROR_API(H5Awrite_invalid_datatype); + PART_ERROR(H5Awrite_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Awrite_invalid_datatype); PART_BEGIN(H5Awrite_invalid_data_buf) { - TESTING_2_API("H5Awrite with an invalid data buffer"); + TESTING_2("H5Awrite with an invalid data buffer"); H5E_BEGIN_TRY { @@ -2564,18 +2564,18 @@ test_write_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to attribute using an invalid data buffer!\n"); - PART_ERROR_API(H5Awrite_invalid_data_buf); + PART_ERROR(H5Awrite_invalid_data_buf); } - PASSED_API(); + PASSED(); } PART_END(H5Awrite_invalid_data_buf); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (data) { free(data); @@ -2593,7 +2593,7 @@ test_write_attribute_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2632,32 +2632,32 @@ test_read_attribute(void) void *data = NULL; void *read_buf = NULL; - TESTING_API("H5Aread"); + TESTING("H5Aread"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_TEST_GROUP_NAME); goto error; } @@ -2667,20 +2667,20 @@ test_read_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME, ATTRIBUTE_READ_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -2698,7 +2698,7 @@ test_read_attribute(void) ((int *)data)[i] = (int)i; if (H5Awrite(attr_id, ATTRIBUTE_READ_TEST_ATTR_DTYPE, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to attribute\n"); goto error; } @@ -2712,20 +2712,20 @@ test_read_attribute(void) TEST_ERROR; if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute\n"); goto error; } if (H5Aread(attr_id, ATTRIBUTE_READ_TEST_ATTR_DTYPE, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from attribute\n"); goto error; } for (i = 0; i < data_size / ATTRIBUTE_READ_TEST_ATTR_DTYPE_SIZE; i++) { if (((int *)read_buf)[i] != (int)i) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); goto error; } @@ -2747,7 +2747,7 @@ test_read_attribute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2793,29 +2793,29 @@ test_read_attribute_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -2827,20 +2827,20 @@ test_read_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -2858,7 +2858,7 @@ test_read_attribute_invalid_params(void) ((int *)data)[i] = (int)i; if (H5Awrite(attr_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_DTYPE, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to attribute\n"); goto error; } @@ -2872,18 +2872,18 @@ test_read_attribute_invalid_params(void) TEST_ERROR; if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_INVALID_PARAMS_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aread_invalid_attr_id) { - TESTING_2_API("H5Aread with an invalid attr_id"); + TESTING_2("H5Aread with an invalid attr_id"); H5E_BEGIN_TRY { @@ -2892,18 +2892,18 @@ test_read_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read attribute with an invalid attr_id!\n"); - PART_ERROR_API(H5Aread_invalid_attr_id); + PART_ERROR(H5Aread_invalid_attr_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aread_invalid_attr_id); PART_BEGIN(H5Aread_invalid_datatype) { - TESTING_2_API("H5Aread with an invalid datatype"); + TESTING_2("H5Aread with an invalid datatype"); H5E_BEGIN_TRY { @@ -2912,18 +2912,18 @@ test_read_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read attribute with an invalid datatype!\n"); - PART_ERROR_API(H5Aread_invalid_datatype); + PART_ERROR(H5Aread_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Aread_invalid_datatype); PART_BEGIN(H5Aread_invalid_read_buf) { - TESTING_2_API("H5Aread with an invalid read buffer"); + TESTING_2("H5Aread with an invalid read buffer"); H5E_BEGIN_TRY { @@ -2932,18 +2932,18 @@ test_read_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read attribute with an invalid read buffer!\n"); - PART_ERROR_API(H5Aread_invalid_read_buf); + PART_ERROR(H5Aread_invalid_read_buf); } - PASSED_API(); + PASSED(); } PART_END(H5Aread_invalid_read_buf); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (read_buf) { free(read_buf); @@ -2961,7 +2961,7 @@ test_read_attribute_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2999,32 +2999,32 @@ test_read_empty_attribute(void) hid_t space_id = H5I_INVALID_HID; void *read_buf = NULL; - TESTING_API("reading an empty attribute"); + TESTING("reading an empty attribute"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_READ_EMPTY_ATTR_GROUP_NAME); goto error; } @@ -3034,20 +3034,20 @@ test_read_empty_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME, ATTRIBUTE_READ_EMPTY_DTYPE, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -3056,7 +3056,7 @@ test_read_empty_attribute(void) TEST_ERROR; if ((attr_id = H5Aopen(group_id, ATTRIBUTE_READ_EMPTY_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute\n"); goto error; } @@ -3069,7 +3069,7 @@ test_read_empty_attribute(void) TEST_ERROR; if (H5Aread(attr_id, ATTRIBUTE_READ_EMPTY_DTYPE, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from attribute\n"); goto error; } @@ -3090,7 +3090,7 @@ test_read_empty_attribute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3119,17 +3119,17 @@ test_close_attribute_invalid_id(void) herr_t err_ret = -1; hid_t file_id = H5I_INVALID_HID; - TESTING_API("H5Aclose with an invalid attribute ID"); + TESTING("H5Aclose with an invalid attribute ID"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } @@ -3141,7 +3141,7 @@ test_close_attribute_invalid_id(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aclose succeeded with an invalid attribute ID!\n"); goto error; } @@ -3149,7 +3149,7 @@ test_close_attribute_invalid_id(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3188,29 +3188,29 @@ test_get_attribute_space_and_type(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or attribute aren't supported with " "this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_GROUP_NAME); goto error; } @@ -3224,87 +3224,87 @@ test_get_attribute_space_and_type(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { /* Retrieve the attribute's datatype and dataspace and verify them */ PART_BEGIN(H5Aget_type) { - TESTING_2_API("H5Aget_type"); + TESTING_2("H5Aget_type"); if ((tmp_type_id = H5Aget_type(attr_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve attribute's datatype\n"); - PART_ERROR_API(H5Aget_type); + PART_ERROR(H5Aget_type); } { htri_t types_equal = H5Tequal(tmp_type_id, attr_dtype); if (types_equal < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" datatype was invalid\n"); - PART_ERROR_API(H5Aget_type); + PART_ERROR(H5Aget_type); } if (!types_equal) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's datatype did not match\n"); - PART_ERROR_API(H5Aget_type); + PART_ERROR(H5Aget_type); } } - PASSED_API(); + PASSED(); } PART_END(H5Aget_type); PART_BEGIN(H5Aget_space) { - TESTING_2_API("H5Aget_space"); + TESTING_2("H5Aget_space"); if ((tmp_space_id = H5Aget_space(attr_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve attribute's dataspace\n"); - PART_ERROR_API(H5Aget_space); + PART_ERROR(H5Aget_space); } { hsize_t space_dims[ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK]; if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dimensions of dataspace\n"); - PART_ERROR_API(H5Aget_space); + PART_ERROR(H5Aget_space); } for (i = 0; i < ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) if (space_dims[i] != attr_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's dataspace dims didn't match\n"); - PART_ERROR_API(H5Aget_space); + PART_ERROR(H5Aget_space); } } - PASSED_API(); + PASSED(); } PART_END(H5Aget_space); @@ -3338,33 +3338,33 @@ test_get_attribute_space_and_type(void) PART_BEGIN(H5Aget_type_reopened) { - TESTING_2_API("H5Aget_type after re-opening an attribute"); + TESTING_2("H5Aget_type after re-opening an attribute"); if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME); - PART_ERROR_API(H5Aget_type_reopened); + PART_ERROR(H5Aget_type_reopened); } if ((tmp_type_id = H5Aget_type(attr_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve attribute's datatype\n"); - PART_ERROR_API(H5Aget_type_reopened); + PART_ERROR(H5Aget_type_reopened); } { htri_t types_equal = H5Tequal(tmp_type_id, attr_dtype); if (types_equal < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" datatype was invalid\n"); - PART_ERROR_API(H5Aget_type_reopened); + PART_ERROR(H5Aget_type_reopened); } if (!types_equal) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's datatype did not match\n"); - PART_ERROR_API(H5Aget_type_reopened); + PART_ERROR(H5Aget_type_reopened); } } @@ -3377,40 +3377,40 @@ test_get_attribute_space_and_type(void) attr_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Aget_type_reopened); PART_BEGIN(H5Aget_space_reopened) { - TESTING_2_API("H5Aget_space after re-opening an attribute"); + TESTING_2("H5Aget_space after re-opening an attribute"); if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_TEST_ATTR_NAME); - PART_ERROR_API(H5Aget_space_reopened); + PART_ERROR(H5Aget_space_reopened); } if ((tmp_space_id = H5Aget_space(attr_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve attribute's dataspace\n"); - PART_ERROR_API(H5Aget_space_reopened); + PART_ERROR(H5Aget_space_reopened); } { hsize_t space_dims[ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK]; if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dimensions of dataspace\n"); - PART_ERROR_API(H5Aget_space_reopened); + PART_ERROR(H5Aget_space_reopened); } for (i = 0; i < ATTRIBUTE_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) { if (space_dims[i] != attr_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataspace dims didn't match!\n"); - PART_ERROR_API(H5Aget_space_reopened); + PART_ERROR(H5Aget_space_reopened); } } } @@ -3424,13 +3424,13 @@ test_get_attribute_space_and_type(void) attr_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Aget_space_reopened); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(tmp_space_id) < 0) TEST_ERROR; @@ -3447,7 +3447,7 @@ test_get_attribute_space_and_type(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3491,29 +3491,29 @@ test_get_attribute_space_and_type_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; @@ -3528,32 +3528,32 @@ test_get_attribute_space_and_type_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_SPACE_TYPE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { /* Retrieve the attribute's datatype and dataspace and verify them */ PART_BEGIN(H5Aget_type_invalid_attr_id) { - TESTING_2_API("H5Aget_type with an invalid attr_id"); + TESTING_2("H5Aget_type with an invalid attr_id"); H5E_BEGIN_TRY { @@ -3562,18 +3562,18 @@ test_get_attribute_space_and_type_invalid_params(void) H5E_END_TRY if (tmp_type_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved copy of attribute's datatype using an invalid attr_id!\n"); - PART_ERROR_API(H5Aget_type_invalid_attr_id); + PART_ERROR(H5Aget_type_invalid_attr_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_type_invalid_attr_id); PART_BEGIN(H5Aget_space_invalid_attr_id) { - TESTING_2_API("H5Aget_space with an invalid attr_id"); + TESTING_2("H5Aget_space with an invalid attr_id"); H5E_BEGIN_TRY { @@ -3582,18 +3582,18 @@ test_get_attribute_space_and_type_invalid_params(void) H5E_END_TRY if (tmp_space_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved copy of attribute's dataspace using an invalid attr_id!\n"); - PART_ERROR_API(H5Aget_space_invalid_attr_id); + PART_ERROR(H5Aget_space_invalid_attr_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_space_invalid_attr_id); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -3608,7 +3608,7 @@ test_get_attribute_space_and_type_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3651,29 +3651,29 @@ test_attribute_property_lists(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or getting property list aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group\n"); goto error; } @@ -3687,27 +3687,27 @@ test_attribute_property_lists(void) TEST_ERROR; if ((acpl_id1 = H5Pcreate(H5P_ATTRIBUTE_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create ACPL\n"); goto error; } if (H5Pset_char_encoding(acpl_id1, encoding) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set ACPL property value\n"); goto error; } if ((attr_id1 = H5Acreate2(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1, attr_dtype1, space_id, acpl_id1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2, attr_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } @@ -3717,81 +3717,81 @@ test_attribute_property_lists(void) /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aget_create_plist) { - TESTING_2_API("H5Aget_create_plist"); + TESTING_2("H5Aget_create_plist"); /* Try to retrieve copies of the two property lists, one which has the property set and one which * does not */ if ((acpl_id1 = H5Aget_create_plist(attr_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Aget_create_plist); + PART_ERROR(H5Aget_create_plist); } if ((acpl_id2 = H5Aget_create_plist(attr_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Aget_create_plist); + PART_ERROR(H5Aget_create_plist); } /* Ensure that property list 1 has the property list set and property list 2 does not */ encoding = H5T_CSET_ERROR; if (H5Pget_char_encoding(acpl_id1, &encoding) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve ACPL property value\n"); - PART_ERROR_API(H5Aget_create_plist); + PART_ERROR(H5Aget_create_plist); } if (H5T_CSET_UTF8 != encoding) { - H5_FAILED_API(); + H5_FAILED(); printf(" ACPL property value was incorrect\n"); - PART_ERROR_API(H5Aget_create_plist); + PART_ERROR(H5Aget_create_plist); } encoding = H5T_CSET_ERROR; if (H5Pget_char_encoding(acpl_id2, &encoding) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve ACPL property value\n"); - PART_ERROR_API(H5Aget_create_plist); + PART_ERROR(H5Aget_create_plist); } if (H5T_CSET_UTF8 == encoding) { - H5_FAILED_API(); + H5_FAILED(); printf(" ACPL property value was set!\n"); - PART_ERROR_API(H5Aget_create_plist); + PART_ERROR(H5Aget_create_plist); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_create_plist); @@ -3833,42 +3833,42 @@ test_attribute_property_lists(void) PART_BEGIN(H5Aget_create_plist_reopened) { - TESTING_2_API("H5Aget_create_plist after re-opening an attribute"); + TESTING_2("H5Aget_create_plist after re-opening an attribute"); if ((attr_id1 = H5Aopen(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME1); - PART_ERROR_API(H5Aget_create_plist_reopened); + PART_ERROR(H5Aget_create_plist_reopened); } if ((attr_id2 = H5Aopen(group_id, ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s'\n", ATTRIBUTE_PROPERTY_LIST_TEST_ATTRIBUTE_NAME2); - PART_ERROR_API(H5Aget_create_plist_reopened); + PART_ERROR(H5Aget_create_plist_reopened); } if ((acpl_id1 = H5Aget_create_plist(attr_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Aget_create_plist_reopened); + PART_ERROR(H5Aget_create_plist_reopened); } if ((acpl_id2 = H5Aget_create_plist(attr_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Aget_create_plist_reopened); + PART_ERROR(H5Aget_create_plist_reopened); } /* XXX: Check the value to be tested as above */ - PASSED_API(); + PASSED(); } PART_END(H5Aget_create_plist_reopened); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(acpl_id1) < 0) TEST_ERROR; @@ -3891,7 +3891,7 @@ test_attribute_property_lists(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3938,35 +3938,35 @@ test_get_attribute_name(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or attribute aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order tracking\n"); goto error; } @@ -3974,7 +3974,7 @@ test_get_attribute_name(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_NAME_TEST_GROUP_NAME); goto error; } @@ -3988,7 +3988,7 @@ test_get_attribute_name(void) /* Create several attributes */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); goto error; } @@ -3998,7 +3998,7 @@ test_get_attribute_name(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); goto error; } @@ -4008,7 +4008,7 @@ test_get_attribute_name(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); goto error; } @@ -4018,37 +4018,37 @@ test_get_attribute_name(void) /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); goto error; } @@ -4056,47 +4056,47 @@ test_get_attribute_name(void) /* Allocate the name buffer */ name_buf_size = strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 2; if (NULL == (name_buf = (char *)malloc((size_t)name_buf_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for storing attribute's name\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aget_name) { - TESTING_2_API("H5Aget_name"); + TESTING_2("H5Aget_name"); if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); - PART_ERROR_API(H5Aget_name); + PART_ERROR(H5Aget_name); } *name_buf = '\0'; if (H5Aget_name(attr_id, (size_t)name_buf_size, name_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve attribute name\n"); - PART_ERROR_API(H5Aget_name); + PART_ERROR(H5Aget_name); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); - PART_ERROR_API(H5Aget_name); + PART_ERROR(H5Aget_name); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); - PART_ERROR_API(H5Aget_name); + PART_ERROR(H5Aget_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name); @@ -4109,10 +4109,10 @@ test_get_attribute_name(void) PART_BEGIN(H5Aget_name_by_idx_crt_order_increasing) { - TESTING_2_API("H5Aget_name_by_idx by creation order in increasing order"); + TESTING_2("H5Aget_name_by_idx by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_name_by_idx_crt_order_increasing); } @@ -4120,67 +4120,67 @@ test_get_attribute_name(void) *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "creation order in increasing order\n", 0); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "creation order in increasing order\n", 1); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "creation order in increasing order\n", 2); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_crt_order_increasing); PART_BEGIN(H5Aget_name_by_idx_crt_order_decreasing) { - TESTING_2_API("H5Aget_name_by_idx by creation order in decreasing order"); + TESTING_2("H5Aget_name_by_idx by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_name_by_idx_crt_order_decreasing); } @@ -4188,188 +4188,188 @@ test_get_attribute_name(void) *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "creation order in decreasing order\n", 2); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "creation order in decreasing order\n", 1); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "creation order in decreasing order\n", 0); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); - PART_ERROR_API(H5Aget_name_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_crt_order_decreasing); PART_BEGIN(H5Aget_name_by_idx_name_order_increasing) { - TESTING_2_API("H5Aget_name_by_idx by alphabetical order in increasing order"); + TESTING_2("H5Aget_name_by_idx by alphabetical order in increasing order"); *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "alphabetical order in increasing order\n", 0); - PART_ERROR_API(H5Aget_name_by_idx_name_order_increasing); + PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); - PART_ERROR_API(H5Aget_name_by_idx_name_order_increasing); + PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "alphabetical order in increasing order\n", 1); - PART_ERROR_API(H5Aget_name_by_idx_name_order_increasing); + PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); - PART_ERROR_API(H5Aget_name_by_idx_name_order_increasing); + PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index by " "alphabetical order in increasing order\n", 2); - PART_ERROR_API(H5Aget_name_by_idx_name_order_increasing); + PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); - PART_ERROR_API(H5Aget_name_by_idx_name_order_increasing); + PART_ERROR(H5Aget_name_by_idx_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_name_order_increasing); PART_BEGIN(H5Aget_name_by_idx_name_order_decreasing) { - TESTING_2_API("H5Aget_name_by_idx by alphabetical order in decreasing order"); + TESTING_2("H5Aget_name_by_idx by alphabetical order in decreasing order"); *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 2, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " "by alphabetical order in decreasing order\n", 2); - PART_ERROR_API(H5Aget_name_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME); - PART_ERROR_API(H5Aget_name_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 1, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " "by alphabetical order in decreasing order\n", 1); - PART_ERROR_API(H5Aget_name_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME2); - PART_ERROR_API(H5Aget_name_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } *name_buf = '\0'; if (H5Aget_name_by_idx(container_group, ATTRIBUTE_GET_NAME_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 0, name_buf, (size_t)name_buf_size, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name of attribute at index %d using H5Aget_name_by_index " "by alphabetical order in decreasing order\n", 0); - PART_ERROR_API(H5Aget_name_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } if (HDstrncmp(name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3, strlen(ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name '%s' didn't match '%s'\n", name_buf, ATTRIBUTE_GET_NAME_TEST_ATTRIBUTE_NAME3); - PART_ERROR_API(H5Aget_name_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_name_by_idx_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_name_order_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (name_buf) { free(name_buf); @@ -4389,7 +4389,7 @@ test_get_attribute_name(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -4434,29 +4434,29 @@ test_get_attribute_name_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_GROUP_NAME); goto error; @@ -4471,20 +4471,20 @@ test_get_attribute_name_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_ATTRIBUTE_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NAME_INVALID_PARAMS_TEST_ATTRIBUTE_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -4494,7 +4494,7 @@ test_get_attribute_name_invalid_params(void) */ if ((name_buf_size = H5Aget_name(attr_id, 0, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve name buf size\n"); goto error; } @@ -4502,13 +4502,13 @@ test_get_attribute_name_invalid_params(void) if (NULL == (name_buf = (char *)malloc((size_t)name_buf_size + 1))) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aget_name_invalid_attr_id) { - TESTING_2_API("H5Aget_name with an invalid attr_id"); + TESTING_2("H5Aget_name with an invalid attr_id"); H5E_BEGIN_TRY { @@ -4517,18 +4517,18 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name with an invalid attr_id!\n"); - PART_ERROR_API(H5Aget_name_invalid_attr_id); + PART_ERROR(H5Aget_name_invalid_attr_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_invalid_attr_id); PART_BEGIN(H5Aget_name_invalid_name_buf) { - TESTING_2_API("H5Aget_name with an invalid name buffer"); + TESTING_2("H5Aget_name with an invalid name buffer"); H5E_BEGIN_TRY { @@ -4538,18 +4538,18 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name with an invalid name buffer!\n"); - PART_ERROR_API(H5Aget_name_invalid_name_buf); + PART_ERROR(H5Aget_name_invalid_name_buf); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_invalid_name_buf); PART_BEGIN(H5Aget_name_by_idx_invalid_loc_id) { - TESTING_2_API("H5Aget_name_by_idx with an invalid loc_id"); + TESTING_2("H5Aget_name_by_idx with an invalid loc_id"); H5E_BEGIN_TRY { @@ -4560,18 +4560,18 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with an invalid loc_id!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_loc_id); + PART_ERROR(H5Aget_name_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_invalid_loc_id); PART_BEGIN(H5Aget_name_by_idx_invalid_obj_name) { - TESTING_2_API("H5Aget_name_by_idx with an invalid object name"); + TESTING_2("H5Aget_name_by_idx with an invalid object name"); H5E_BEGIN_TRY { @@ -4581,9 +4581,9 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with a NULL object name!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_obj_name); + PART_ERROR(H5Aget_name_by_idx_invalid_obj_name); } H5E_BEGIN_TRY @@ -4594,19 +4594,19 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with an invalid object name " "of ''!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_obj_name); + PART_ERROR(H5Aget_name_by_idx_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_invalid_obj_name); PART_BEGIN(H5Aget_name_by_idx_invalid_index_type) { - TESTING_2_API("H5Aget_name_by_idx with an invalid index type"); + TESTING_2("H5Aget_name_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -4617,10 +4617,10 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with invalid index type " "H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_index_type); + PART_ERROR(H5Aget_name_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -4632,19 +4632,19 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with invalid index type " "H5_INDEX_N!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_index_type); + PART_ERROR(H5Aget_name_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_invalid_index_type); PART_BEGIN(H5Aget_name_by_idx_invalid_iter_order) { - TESTING_2_API("H5Aget_name_by_idx with an invalid iteration order"); + TESTING_2("H5Aget_name_by_idx with an invalid iteration order"); H5E_BEGIN_TRY { @@ -4655,10 +4655,10 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with invalid iteration order " "H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_iter_order); + PART_ERROR(H5Aget_name_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -4670,19 +4670,19 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with invalid iteration order " "H5_ITER_N!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_iter_order); + PART_ERROR(H5Aget_name_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_invalid_iter_order); PART_BEGIN(H5Aget_name_by_idx_invalid_name_buf) { - TESTING_2_API("H5Aget_name_by_idx with an invalid name buffer"); + TESTING_2("H5Aget_name_by_idx with an invalid name buffer"); H5E_BEGIN_TRY { @@ -4694,19 +4694,19 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " retrieved attribute name using H5Aget_name_by_idx with an invalid name buffer!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_name_buf); + PART_ERROR(H5Aget_name_by_idx_invalid_name_buf); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_invalid_name_buf); PART_BEGIN(H5Aget_name_by_idx_invalid_lapl) { - TESTING_2_API("H5Aget_name_by_idx with an invalid LAPL"); + TESTING_2("H5Aget_name_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -4717,18 +4717,18 @@ test_get_attribute_name_invalid_params(void) H5E_END_TRY if (name_buf_size >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute name using H5Aget_name_by_idx with an invalid LAPL!\n"); - PART_ERROR_API(H5Aget_name_by_idx_invalid_lapl); + PART_ERROR(H5Aget_name_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_name_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (name_buf) { free(name_buf); @@ -4748,7 +4748,7 @@ test_get_attribute_name_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -4775,9 +4775,9 @@ test_get_attribute_name_invalid_params(void) static int test_get_attribute_storage_size(void) { - TESTING_API("H5Aget_storage_size"); + TESTING("H5Aget_storage_size"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -4803,35 +4803,35 @@ test_get_attribute_info(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or attribute aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order tracking\n"); goto error; } @@ -4839,7 +4839,7 @@ test_get_attribute_info(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_INFO_TEST_GROUP_NAME); goto error; } @@ -4853,7 +4853,7 @@ test_get_attribute_info(void) /* Create several attributes */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); goto error; } @@ -4863,7 +4863,7 @@ test_get_attribute_info(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); goto error; } @@ -4873,7 +4873,7 @@ test_get_attribute_info(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); goto error; } @@ -4883,84 +4883,84 @@ test_get_attribute_info(void) /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aget_info) { - TESTING_2_API("H5Aget_info"); + TESTING_2("H5Aget_info"); if ((attr_id = H5Aopen(group_id, ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); - PART_ERROR_API(H5Aget_info); + PART_ERROR(H5Aget_info); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info(attr_id, &attr_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get attribute info\n"); - PART_ERROR_API(H5Aget_info); + PART_ERROR(H5Aget_info); } if (attr_info.corder_valid && (attr_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)0); - PART_ERROR_API(H5Aget_info); + PART_ERROR(H5Aget_info); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info); + PART_ERROR(H5Aget_info); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); - PART_ERROR_API(H5Aget_info); + PART_ERROR(H5Aget_info); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info); @@ -4973,87 +4973,87 @@ test_get_attribute_info(void) PART_BEGIN(H5Aget_info_by_name) { - TESTING_2_API("H5Aget_info_by_name"); + TESTING_2("H5Aget_info_by_name"); memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } if (attr_info.corder_valid && (attr_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)0); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME2); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } if (attr_info.corder_valid && (attr_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)1); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_name(group_id, ".", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get attribute info by name '%s'\n", ATTRIBUTE_GET_INFO_TEST_ATTR_NAME3); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } if (attr_info.corder_valid && (attr_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)2); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_name); + PART_ERROR(H5Aget_info_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_name); PART_BEGIN(H5Aget_info_by_idx_crt_order_increasing) { - TESTING_2_API("H5Aget_info_by_idx by creation order in increasing order"); + TESTING_2("H5Aget_info_by_idx by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_info_by_idx_crt_order_increasing); } @@ -5061,88 +5061,88 @@ test_get_attribute_info(void) memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "creation order in increasing order\n", 0); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)0); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "creation order in increasing order\n", 1); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)1); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "creation order in increasing order\n", 2); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)2); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_crt_order_increasing); PART_BEGIN(H5Aget_info_by_idx_crt_order_decreasing) { - TESTING_2_API("H5Aget_info_by_idx by creation order in decreasing order"); + TESTING_2("H5Aget_info_by_idx by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aget_info_by_idx_crt_order_decreasing); } @@ -5150,251 +5150,251 @@ test_get_attribute_info(void) memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "creation order in decreasing order\n", 2); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)0); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "creation order in decreasing order\n", 1); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)1); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "creation order in decreasing order\n", 0); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)2); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_crt_order_decreasing); PART_BEGIN(H5Aget_info_by_idx_name_order_increasing) { - TESTING_2_API("H5Aget_info_by_idx by alphabetical order in increasing order"); + TESTING_2("H5Aget_info_by_idx by alphabetical order in increasing order"); memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "alphabetical order in increasing order\n", 0); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)0); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "alphabetical order in increasing order\n", 1); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)1); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "alphabetical order in increasing order\n", 2); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)2); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_name_order_increasing); + PART_ERROR(H5Aget_info_by_idx_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_name_order_increasing); PART_BEGIN(H5Aget_info_by_idx_name_order_decreasing) { - TESTING_2_API("H5Aget_info_by_idx by alphabetical order in decreasing order"); + TESTING_2("H5Aget_info_by_idx by alphabetical order in decreasing order"); memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "alphabetical order in decreasing order\n", 2); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)0); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "alphabetical order in decreasing order\n", 1); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)1); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } memset(&attr_info, 0, sizeof(attr_info)); if (H5Aget_info_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &attr_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get info for attribute at index %d using H5Aget_info_by_idx by " "alphabetical order in decreasing order\n", 0); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } if (attr_info.corder_valid && (attr_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value '%lld' did not match expected value '%lld'\n", (long long)attr_info.corder, (long long)2); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } /* Ensure that the cset field is at least set to a meaningful value */ if (attr_info.cset != H5T_CSET_ASCII && attr_info.cset != H5T_CSET_UTF8 && attr_info.cset != H5T_CSET_ERROR) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute info's 'cset' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Aget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Aget_info_by_idx_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_name_order_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -5409,7 +5409,7 @@ test_get_attribute_info(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5451,29 +5451,29 @@ test_get_attribute_info_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_GROUP_NAME); goto error; @@ -5488,31 +5488,31 @@ test_get_attribute_info_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_INFO_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aget_info_invalid_attr_id) { - TESTING_2_API("H5Aget_info with an invalid attr_id"); + TESTING_2("H5Aget_info with an invalid attr_id"); H5E_BEGIN_TRY { @@ -5521,18 +5521,18 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info with an invalid attr_id!\n"); - PART_ERROR_API(H5Aget_info_invalid_attr_id); + PART_ERROR(H5Aget_info_invalid_attr_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_invalid_attr_id); PART_BEGIN(H5Aget_info_invalid_attr_info_pointer) { - TESTING_2_API("H5Aget_info with an invalid attribute info pointer"); + TESTING_2("H5Aget_info with an invalid attribute info pointer"); H5E_BEGIN_TRY { @@ -5541,18 +5541,18 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info with an invalid attr_id!\n"); - PART_ERROR_API(H5Aget_info_invalid_attr_info_pointer); + PART_ERROR(H5Aget_info_invalid_attr_info_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_invalid_attr_info_pointer); PART_BEGIN(H5Aget_info_by_name_invalid_loc_id) { - TESTING_2_API("H5Aget_info_by_name with an invalid loc_id"); + TESTING_2("H5Aget_info_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -5563,18 +5563,18 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_name with an invalid loc_id!\n"); - PART_ERROR_API(H5Aget_info_by_name_invalid_loc_id); + PART_ERROR(H5Aget_info_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_name_invalid_loc_id); PART_BEGIN(H5Aget_info_by_name_invalid_obj_name) { - TESTING_2_API("H5Aget_info_by_name with an invalid object name"); + TESTING_2("H5Aget_info_by_name with an invalid object name"); H5E_BEGIN_TRY { @@ -5585,9 +5585,9 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_name with a NULL object name!\n"); - PART_ERROR_API(H5Aget_info_by_name_invalid_obj_name); + PART_ERROR(H5Aget_info_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -5598,19 +5598,19 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_name with an invalid object name " "of ''!\n"); - PART_ERROR_API(H5Aget_info_by_name_invalid_obj_name); + PART_ERROR(H5Aget_info_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_name_invalid_obj_name); PART_BEGIN(H5Aget_info_by_name_invalid_attr_name) { - TESTING_2_API("H5Aget_info_by_name with an invalid attribute name"); + TESTING_2("H5Aget_info_by_name with an invalid attribute name"); H5E_BEGIN_TRY { @@ -5619,10 +5619,10 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " retrieved attribute info using H5Aget_info_by_name with a NULL attribute name!\n"); - PART_ERROR_API(H5Aget_info_by_name_invalid_attr_name); + PART_ERROR(H5Aget_info_by_name_invalid_attr_name); } H5E_BEGIN_TRY @@ -5632,19 +5632,19 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_name with an invalid attribute " "name of ''!\n"); - PART_ERROR_API(H5Aget_info_by_name_invalid_attr_name); + PART_ERROR(H5Aget_info_by_name_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_name_invalid_attr_name); PART_BEGIN(H5Aget_info_by_name_invalid_attr_info_pointer) { - TESTING_2_API("H5Aget_info_by_name with an invalid attribute info pointer"); + TESTING_2("H5Aget_info_by_name with an invalid attribute info pointer"); H5E_BEGIN_TRY { @@ -5654,19 +5654,19 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_name with an invalid attribute " "info pointer!\n"); - PART_ERROR_API(H5Aget_info_by_name_invalid_attr_info_pointer); + PART_ERROR(H5Aget_info_by_name_invalid_attr_info_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_name_invalid_attr_info_pointer); PART_BEGIN(H5Aget_info_by_name_invalid_lapl) { - TESTING_2_API("H5Aget_info_by_name with an invalid LAPL"); + TESTING_2("H5Aget_info_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -5676,18 +5676,18 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_name with an invalid LAPL!\n"); - PART_ERROR_API(H5Aget_info_by_name_invalid_lapl); + PART_ERROR(H5Aget_info_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_name_invalid_lapl); PART_BEGIN(H5Aget_info_by_idx_invalid_loc_id) { - TESTING_2_API("H5Aget_info_by_idx with an invalid loc_id"); + TESTING_2("H5Aget_info_by_idx with an invalid loc_id"); H5E_BEGIN_TRY { @@ -5697,18 +5697,18 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid loc_id!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_loc_id); + PART_ERROR(H5Aget_info_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_invalid_loc_id); PART_BEGIN(H5Aget_info_by_idx_invalid_obj_name) { - TESTING_2_API("H5Aget_info_by_idx with an invalid object name"); + TESTING_2("H5Aget_info_by_idx with an invalid object name"); H5E_BEGIN_TRY { @@ -5718,9 +5718,9 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with a NULL object name!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_obj_name); + PART_ERROR(H5Aget_info_by_idx_invalid_obj_name); } H5E_BEGIN_TRY @@ -5731,19 +5731,19 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid object name " "of ''!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_obj_name); + PART_ERROR(H5Aget_info_by_idx_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_invalid_obj_name); PART_BEGIN(H5Aget_info_by_idx_invalid_index_type) { - TESTING_2_API("H5Aget_info_by_idx with an invalid index type"); + TESTING_2("H5Aget_info_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -5753,10 +5753,10 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with invalid index type " "H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_index_type); + PART_ERROR(H5Aget_info_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -5767,19 +5767,19 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with invalid index type " "H5_INDEX_N!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_index_type); + PART_ERROR(H5Aget_info_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_invalid_index_type); PART_BEGIN(H5Aget_info_by_idx_invalid_iter_order) { - TESTING_2_API("H5Aget_info_by_idx with an invalid iteration order"); + TESTING_2("H5Aget_info_by_idx with an invalid iteration order"); H5E_BEGIN_TRY { @@ -5789,10 +5789,10 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with invalid iteration order " "H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_iter_order); + PART_ERROR(H5Aget_info_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -5803,19 +5803,19 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with invalid iteration order " "H5_ITER_N!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_iter_order); + PART_ERROR(H5Aget_info_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_invalid_iter_order); PART_BEGIN(H5Aget_info_by_idx_invalid_attr_info_pointer) { - TESTING_2_API("H5Aget_info_by_idx with an invalid attribute info pointer"); + TESTING_2("H5Aget_info_by_idx with an invalid attribute info pointer"); H5E_BEGIN_TRY { @@ -5824,19 +5824,19 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid attribute " "info pointer!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_attr_info_pointer); + PART_ERROR(H5Aget_info_by_idx_invalid_attr_info_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_invalid_attr_info_pointer); PART_BEGIN(H5Aget_info_by_idx_invalid_lapl) { - TESTING_2_API("H5Aget_info_by_idx with an invalid LAPL"); + TESTING_2("H5Aget_info_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -5846,18 +5846,18 @@ test_get_attribute_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved attribute info using H5Aget_info_by_idx with an invalid LAPL!\n"); - PART_ERROR_API(H5Aget_info_by_idx_invalid_lapl); + PART_ERROR(H5Aget_info_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aget_info_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -5872,7 +5872,7 @@ test_get_attribute_info_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5911,29 +5911,29 @@ test_rename_attribute(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_RENAME_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_RENAME_TEST_GROUP_NAME); goto error; } @@ -5946,132 +5946,132 @@ test_rename_attribute(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Arename) { - TESTING_2_API("H5Arename"); + TESTING_2("H5Arename"); if (H5Arename(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't rename attribute '%s' to '%s' using H5Arename\n", ATTRIBUTE_RENAME_TEST_ATTR_NAME, ATTRIBUTE_RENAME_TEST_NEW_NAME); - PART_ERROR_API(H5Arename); + PART_ERROR(H5Arename); } /* Verify the attribute has been renamed */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); - PART_ERROR_API(H5Arename); + PART_ERROR(H5Arename); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not get renamed!\n"); - PART_ERROR_API(H5Arename); + PART_ERROR(H5Arename); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_NEW_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); - PART_ERROR_API(H5Arename); + PART_ERROR(H5Arename); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not get renamed!\n"); - PART_ERROR_API(H5Arename); + PART_ERROR(H5Arename); } - PASSED_API(); + PASSED(); } PART_END(H5Arename); PART_BEGIN(H5Arename_by_name) { - TESTING_2_API("H5Arename_by_name"); + TESTING_2("H5Arename_by_name"); if (H5Arename_by_name(container_group, ATTRIBUTE_RENAME_TEST_GROUP_NAME, ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't rename attribute '%s' to '%s' using H5Arename_by_name\n", ATTRIBUTE_RENAME_TEST_ATTR_NAME2, ATTRIBUTE_RENAME_TEST_NEW_NAME2); - PART_ERROR_API(H5Arename_by_name); + PART_ERROR(H5Arename_by_name); } /* Verify the attribute has been renamed */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); - PART_ERROR_API(H5Arename_by_name); + PART_ERROR(H5Arename_by_name); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not get renamed!\n"); - PART_ERROR_API(H5Arename_by_name); + PART_ERROR(H5Arename_by_name); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_TEST_NEW_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); - PART_ERROR_API(H5Arename_by_name); + PART_ERROR(H5Arename_by_name); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not get renamed!\n"); - PART_ERROR_API(H5Arename_by_name); + PART_ERROR(H5Arename_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_by_name); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -6088,7 +6088,7 @@ test_rename_attribute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6129,29 +6129,29 @@ test_rename_attribute_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_MORE)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -6165,50 +6165,50 @@ test_rename_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME2, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_RENAME_INVALID_PARAMS_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Arename_invalid_loc_id) { - TESTING_2_API("H5Arename with an invalid loc_id"); + TESTING_2("H5Arename with an invalid loc_id"); H5E_BEGIN_TRY { @@ -6218,18 +6218,18 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename with an invalid loc_id!\n"); - PART_ERROR_API(H5Arename_invalid_loc_id); + PART_ERROR(H5Arename_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_invalid_loc_id); PART_BEGIN(H5Arename_invalid_old_attr_name) { - TESTING_2_API("H5Arename with an invalid old attribute name"); + TESTING_2("H5Arename with an invalid old attribute name"); H5E_BEGIN_TRY { @@ -6238,9 +6238,9 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename with a NULL old attribute name!\n"); - PART_ERROR_API(H5Arename_invalid_old_attr_name); + PART_ERROR(H5Arename_invalid_old_attr_name); } H5E_BEGIN_TRY @@ -6250,18 +6250,18 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename with an invalid old attribute name of ''!\n"); - PART_ERROR_API(H5Arename_invalid_old_attr_name); + PART_ERROR(H5Arename_invalid_old_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_invalid_old_attr_name); PART_BEGIN(H5Arename_invalid_new_attr_name) { - TESTING_2_API("H5Arename with an invalid new attribute name"); + TESTING_2("H5Arename with an invalid new attribute name"); H5E_BEGIN_TRY { @@ -6270,9 +6270,9 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename with a NULL new attribute name!\n"); - PART_ERROR_API(H5Arename_invalid_new_attr_name); + PART_ERROR(H5Arename_invalid_new_attr_name); } H5E_BEGIN_TRY @@ -6282,18 +6282,18 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename with an invalid new attribute name of ''!\n"); - PART_ERROR_API(H5Arename_invalid_new_attr_name); + PART_ERROR(H5Arename_invalid_new_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_invalid_new_attr_name); PART_BEGIN(H5Arename_by_name_invalid_loc_id) { - TESTING_2_API("H5Arename_by_name with an invalid loc_id"); + TESTING_2("H5Arename_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -6304,18 +6304,18 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with an invalid loc_id!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_loc_id); + PART_ERROR(H5Arename_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_by_name_invalid_loc_id); PART_BEGIN(H5Arename_by_name_invalid_obj_name) { - TESTING_2_API("H5Arename_by_name with an invalid object name"); + TESTING_2("H5Arename_by_name with an invalid object name"); H5E_BEGIN_TRY { @@ -6325,9 +6325,9 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with a NULL object name!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_obj_name); + PART_ERROR(H5Arename_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -6338,18 +6338,18 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with an invalid object name of ''!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_obj_name); + PART_ERROR(H5Arename_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_by_name_invalid_obj_name); PART_BEGIN(H5Arename_by_name_invalid_old_attr_name) { - TESTING_2_API("H5Arename_by_name with an invalid old attribute name"); + TESTING_2("H5Arename_by_name with an invalid old attribute name"); H5E_BEGIN_TRY { @@ -6359,9 +6359,9 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with a NULL old attribute name!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_old_attr_name); + PART_ERROR(H5Arename_by_name_invalid_old_attr_name); } H5E_BEGIN_TRY @@ -6372,19 +6372,19 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with an invalid old attribute name " "of ''!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_old_attr_name); + PART_ERROR(H5Arename_by_name_invalid_old_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_by_name_invalid_old_attr_name); PART_BEGIN(H5Arename_by_name_invalid_new_attr_name) { - TESTING_2_API("H5Arename_by_name with an invalid new attribute name"); + TESTING_2("H5Arename_by_name with an invalid new attribute name"); H5E_BEGIN_TRY { @@ -6394,9 +6394,9 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with a NULL new attribute name!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_new_attr_name); + PART_ERROR(H5Arename_by_name_invalid_new_attr_name); } H5E_BEGIN_TRY @@ -6407,19 +6407,19 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with an invalid new attribute name " "of ''!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_new_attr_name); + PART_ERROR(H5Arename_by_name_invalid_new_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_by_name_invalid_new_attr_name); PART_BEGIN(H5Arename_by_name_invalid_lapl) { - TESTING_2_API("H5Arename_by_name with an invalid LAPL"); + TESTING_2("H5Arename_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -6429,18 +6429,18 @@ test_rename_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed attribute using H5Arename_by_name with an invalid LAPL!\n"); - PART_ERROR_API(H5Arename_by_name_invalid_lapl); + PART_ERROR(H5Arename_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Arename_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -6457,7 +6457,7 @@ test_rename_attribute_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6502,35 +6502,35 @@ test_attribute_iterate_group(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or iterate aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order tracking\n"); goto error; } @@ -6538,7 +6538,7 @@ test_attribute_iterate_group(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME); goto error; } @@ -6558,32 +6558,32 @@ test_attribute_iterate_group(void) if ((attr_id = H5Acreate2(group_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", attr_name); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, attr_name)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", attr_name); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", attr_name); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", attr_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -6597,61 +6597,61 @@ test_attribute_iterate_group(void) PART_BEGIN(H5Aiterate2_name_increasing) { - TESTING_2_API("H5Aiterate by attribute name in increasing order"); + TESTING_2("H5Aiterate by attribute name in increasing order"); link_counter = 0; /* Test basic attribute iteration capability using both index types and both index orders */ if (H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Aiterate2_name_increasing); + PART_ERROR(H5Aiterate2_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_name_increasing); + PART_ERROR(H5Aiterate2_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_name_increasing); PART_BEGIN(H5Aiterate2_name_decreasing) { - TESTING_2_API("H5Aiterate by attribute name in decreasing order"); + TESTING_2("H5Aiterate by attribute name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = ATTRIBUTE_ITERATE_TEST_NUM_ATTRS; if (H5Aiterate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate2_name_decreasing); + PART_ERROR(H5Aiterate2_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_name_decreasing); + PART_ERROR(H5Aiterate2_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_name_decreasing); PART_BEGIN(H5Aiterate2_creation_increasing) { - TESTING_2_API("H5Aiterate by creation order in increasing order"); + TESTING_2("H5Aiterate by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_increasing); } @@ -6661,29 +6661,29 @@ test_attribute_iterate_group(void) if (H5Aiterate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Aiterate2_creation_increasing); + PART_ERROR(H5Aiterate2_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_creation_increasing); + PART_ERROR(H5Aiterate2_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_creation_increasing); PART_BEGIN(H5Aiterate2_creation_decreasing) { - TESTING_2_API("H5Aiterate by creation order in decreasing order"); + TESTING_2("H5Aiterate by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_decreasing); } @@ -6693,26 +6693,26 @@ test_attribute_iterate_group(void) if (H5Aiterate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate2_creation_decreasing); + PART_ERROR(H5Aiterate2_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_creation_decreasing); + PART_ERROR(H5Aiterate2_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_creation_decreasing); PART_BEGIN(H5Aiterate_by_name_name_increasing) { - TESTING_2_API("H5Aiterate_by_name by attribute name in increasing order"); + TESTING_2("H5Aiterate_by_name by attribute name in increasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = 0; @@ -6720,26 +6720,26 @@ test_attribute_iterate_group(void) if (H5Aiterate_by_name( file_id, "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type name in increasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_name_increasing); + PART_ERROR(H5Aiterate_by_name_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_name_increasing); + PART_ERROR(H5Aiterate_by_name_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_name_increasing); PART_BEGIN(H5Aiterate_by_name_name_decreasing) { - TESTING_2_API("H5Aiterate_by_name by attribute name in decreasing order"); + TESTING_2("H5Aiterate_by_name by attribute name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = ATTRIBUTE_ITERATE_TEST_NUM_ATTRS; @@ -6747,29 +6747,29 @@ test_attribute_iterate_group(void) if (H5Aiterate_by_name( file_id, "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_name_decreasing); + PART_ERROR(H5Aiterate_by_name_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_name_decreasing); + PART_ERROR(H5Aiterate_by_name_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_name_decreasing); PART_BEGIN(H5Aiterate_by_name_creation_increasing) { - TESTING_2_API("H5Aiterate_by_name by creation order in increasing order"); + TESTING_2("H5Aiterate_by_name by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_increasing); } @@ -6781,29 +6781,29 @@ test_attribute_iterate_group(void) "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_increasing); + PART_ERROR(H5Aiterate_by_name_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_increasing); + PART_ERROR(H5Aiterate_by_name_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_creation_increasing); PART_BEGIN(H5Aiterate_by_name_creation_decreasing) { - TESTING_2_API("H5Aiterate_by_name by creation order in decreasing order"); + TESTING_2("H5Aiterate_by_name by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_decreasing); } @@ -6815,26 +6815,26 @@ test_attribute_iterate_group(void) "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_GRP_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_decreasing); + PART_ERROR(H5Aiterate_by_name_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_decreasing); + PART_ERROR(H5Aiterate_by_name_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -6849,7 +6849,7 @@ test_attribute_iterate_group(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6898,42 +6898,42 @@ test_attribute_iterate_dataset(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, attribute, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_SUBGROUP_NAME); goto error; } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(dcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order tracking\n"); goto error; } @@ -6953,7 +6953,7 @@ test_attribute_iterate_dataset(void) if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", ATTRIBUTE_ITERATE_TEST_DSET_NAME); goto error; } @@ -6967,32 +6967,32 @@ test_attribute_iterate_dataset(void) if ((attr_id = H5Acreate2(dset_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", attr_name); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(dset_id, attr_name)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", attr_name); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", attr_name); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", attr_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -7006,61 +7006,61 @@ test_attribute_iterate_dataset(void) PART_BEGIN(H5Aiterate2_name_increasing) { - TESTING_2_API("H5Aiterate by attribute name in increasing order"); + TESTING_2("H5Aiterate by attribute name in increasing order"); link_counter = 0; /* Test basic attribute iteration capability using both index types and both index orders */ if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Aiterate2_name_increasing); + PART_ERROR(H5Aiterate2_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_name_increasing); + PART_ERROR(H5Aiterate2_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_name_increasing); PART_BEGIN(H5Aiterate2_name_decreasing) { - TESTING_2_API("H5Aiterate by attribute name in decreasing order"); + TESTING_2("H5Aiterate by attribute name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = ATTRIBUTE_ITERATE_TEST_NUM_ATTRS; if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate2_name_decreasing); + PART_ERROR(H5Aiterate2_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_name_decreasing); + PART_ERROR(H5Aiterate2_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_name_decreasing); PART_BEGIN(H5Aiterate2_creation_increasing) { - TESTING_2_API("H5Aiterate by creation order in increasing order"); + TESTING_2("H5Aiterate by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_increasing); } @@ -7070,29 +7070,29 @@ test_attribute_iterate_dataset(void) if (H5Aiterate2(dset_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Aiterate2_creation_increasing); + PART_ERROR(H5Aiterate2_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_creation_increasing); + PART_ERROR(H5Aiterate2_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_creation_increasing); PART_BEGIN(H5Aiterate2_creation_decreasing) { - TESTING_2_API("H5Aiterate by creation order in decreasing order"); + TESTING_2("H5Aiterate by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_decreasing); } @@ -7102,26 +7102,26 @@ test_attribute_iterate_dataset(void) if (H5Aiterate2(dset_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate2_creation_decreasing); + PART_ERROR(H5Aiterate2_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_creation_decreasing); + PART_ERROR(H5Aiterate2_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_creation_decreasing); PART_BEGIN(H5Aiterate_by_name_name_increasing) { - TESTING_2_API("H5Aiterate_by_name by attribute name in increasing order"); + TESTING_2("H5Aiterate_by_name by attribute name in increasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = 0; @@ -7131,26 +7131,26 @@ test_attribute_iterate_dataset(void) "/" ATTRIBUTE_ITERATE_TEST_DSET_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type name in increasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_name_increasing); + PART_ERROR(H5Aiterate_by_name_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_name_increasing); + PART_ERROR(H5Aiterate_by_name_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_name_increasing); PART_BEGIN(H5Aiterate_by_name_name_decreasing) { - TESTING_2_API("H5Aiterate_by_name by attribute name in decreasing order"); + TESTING_2("H5Aiterate_by_name by attribute name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = ATTRIBUTE_ITERATE_TEST_NUM_ATTRS; @@ -7160,29 +7160,29 @@ test_attribute_iterate_dataset(void) "/" ATTRIBUTE_ITERATE_TEST_DSET_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_name_decreasing); + PART_ERROR(H5Aiterate_by_name_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_name_decreasing); + PART_ERROR(H5Aiterate_by_name_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_name_decreasing); PART_BEGIN(H5Aiterate_by_name_creation_increasing) { - TESTING_2_API("H5Aiterate_by_name by creation order in increasing order"); + TESTING_2("H5Aiterate_by_name by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_increasing); } @@ -7195,29 +7195,29 @@ test_attribute_iterate_dataset(void) "/" ATTRIBUTE_ITERATE_TEST_DSET_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_increasing); + PART_ERROR(H5Aiterate_by_name_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_increasing); + PART_ERROR(H5Aiterate_by_name_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_creation_increasing); PART_BEGIN(H5Aiterate_by_name_creation_decreasing) { - TESTING_2_API("H5Aiterate_by_name by creation order in decreasing order"); + TESTING_2("H5Aiterate_by_name by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_decreasing); } @@ -7230,26 +7230,26 @@ test_attribute_iterate_dataset(void) "/" ATTRIBUTE_ITERATE_TEST_DSET_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_decreasing); + PART_ERROR(H5Aiterate_by_name_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_decreasing); + PART_ERROR(H5Aiterate_by_name_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(dcpl_id) < 0) TEST_ERROR; @@ -7270,7 +7270,7 @@ test_attribute_iterate_dataset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7320,42 +7320,42 @@ test_attribute_iterate_datatype(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, stored datatype, attribute, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME); goto error; } if ((tcpl_id = H5Pcreate(H5P_DATATYPE_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create TCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(tcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order tracking\n"); goto error; } @@ -7372,7 +7372,7 @@ test_attribute_iterate_datatype(void) if (H5Tcommit2(group_id, ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, tcpl_id, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", ATTRIBUTE_ITERATE_TEST_DTYPE_NAME); goto error; } @@ -7386,32 +7386,32 @@ test_attribute_iterate_datatype(void) if ((attr_id = H5Acreate2(type_id, attr_name, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", attr_name); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(type_id, attr_name)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", attr_name); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", attr_name); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", attr_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -7425,61 +7425,61 @@ test_attribute_iterate_datatype(void) PART_BEGIN(H5Aiterate2_name_increasing) { - TESTING_2_API("H5Aiterate by attribute name in increasing order"); + TESTING_2("H5Aiterate by attribute name in increasing order"); link_counter = 0; /* Test basic attribute iteration capability using both index types and both index orders */ if (H5Aiterate2(type_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Aiterate2_name_increasing); + PART_ERROR(H5Aiterate2_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_name_increasing); + PART_ERROR(H5Aiterate2_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_name_increasing); PART_BEGIN(H5Aiterate2_name_decreasing) { - TESTING_2_API("H5Aiterate by attribute name in decreasing order"); + TESTING_2("H5Aiterate by attribute name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = ATTRIBUTE_ITERATE_TEST_NUM_ATTRS; if (H5Aiterate2(type_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate2_name_decreasing); + PART_ERROR(H5Aiterate2_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_name_decreasing); + PART_ERROR(H5Aiterate2_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_name_decreasing); PART_BEGIN(H5Aiterate2_creation_increasing) { - TESTING_2_API("H5Aiterate by creation order in increasing order"); + TESTING_2("H5Aiterate by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_increasing); } @@ -7489,29 +7489,29 @@ test_attribute_iterate_datatype(void) if (H5Aiterate2(type_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Aiterate2_creation_increasing); + PART_ERROR(H5Aiterate2_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_creation_increasing); + PART_ERROR(H5Aiterate2_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_creation_increasing); PART_BEGIN(H5Aiterate2_creation_decreasing) { - TESTING_2_API("H5Aiterate by creation order in decreasing order"); + TESTING_2("H5Aiterate by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate2_creation_decreasing); } @@ -7521,26 +7521,26 @@ test_attribute_iterate_datatype(void) if (H5Aiterate2(type_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate2_creation_decreasing); + PART_ERROR(H5Aiterate2_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate sentinel value is unchanged; supplied callback function must not " "have been called!\n"); - PART_ERROR_API(H5Aiterate2_creation_decreasing); + PART_ERROR(H5Aiterate2_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate2_creation_decreasing); PART_BEGIN(H5Aiterate_by_name_name_increasing) { - TESTING_2_API("H5Aiterate_by_name by attribute name in increasing order"); + TESTING_2("H5Aiterate_by_name by attribute name in increasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = 0; @@ -7550,26 +7550,26 @@ test_attribute_iterate_datatype(void) "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type name in increasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_name_increasing); + PART_ERROR(H5Aiterate_by_name_name_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_name_increasing); + PART_ERROR(H5Aiterate_by_name_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_name_increasing); PART_BEGIN(H5Aiterate_by_name_name_decreasing) { - TESTING_2_API("H5Aiterate_by_name by attribute name in decreasing order"); + TESTING_2("H5Aiterate_by_name by attribute name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ link_counter = ATTRIBUTE_ITERATE_TEST_NUM_ATTRS; @@ -7579,29 +7579,29 @@ test_attribute_iterate_datatype(void) "/" ATTRIBUTE_TEST_GROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_DTYPE_SUBGROUP_NAME "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_name_decreasing); + PART_ERROR(H5Aiterate_by_name_name_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_name_decreasing); + PART_ERROR(H5Aiterate_by_name_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_name_decreasing); PART_BEGIN(H5Aiterate_by_name_creation_increasing) { - TESTING_2_API("H5Aiterate_by_name by creation order in increasing order"); + TESTING_2("H5Aiterate_by_name by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_increasing); } @@ -7615,29 +7615,29 @@ test_attribute_iterate_datatype(void) "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_increasing); + PART_ERROR(H5Aiterate_by_name_creation_increasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 2 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_increasing); + PART_ERROR(H5Aiterate_by_name_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_creation_increasing); PART_BEGIN(H5Aiterate_by_name_creation_decreasing) { - TESTING_2_API("H5Aiterate_by_name by creation order in decreasing order"); + TESTING_2("H5Aiterate_by_name by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Aiterate_by_name_creation_decreasing); } @@ -7651,26 +7651,26 @@ test_attribute_iterate_datatype(void) "/" ATTRIBUTE_ITERATE_TEST_DTYPE_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, attr_iter_callback1, &link_counter, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_decreasing); + PART_ERROR(H5Aiterate_by_name_creation_decreasing); } /* Make sure that the attribute iteration callback was actually called */ if (link_counter == 3 * ATTRIBUTE_ITERATE_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name sentinel value is unchanged; supplied callback function " "must not have been called!\n"); - PART_ERROR_API(H5Aiterate_by_name_creation_decreasing); + PART_ERROR(H5Aiterate_by_name_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(tcpl_id) < 0) TEST_ERROR; @@ -7687,7 +7687,7 @@ test_attribute_iterate_datatype(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7718,9 +7718,9 @@ test_attribute_iterate_datatype(void) static int test_attribute_iterate_index_saving(void) { - TESTING_API("attribute iteration index saving capability"); + TESTING("attribute iteration index saving capability"); - SKIPPED_API(); + SKIPPED(); return 1; } @@ -7747,29 +7747,29 @@ test_attribute_iterate_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or iterate aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup\n"); goto error; } @@ -7783,88 +7783,88 @@ test_attribute_iterate_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } if ((attr_id2 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME2, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } if ((attr_id3 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME3, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } if ((attr_id4 = H5Acreate2(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME4, attr_dtype, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_ITERATE_INVALID_PARAMS_TEST_ATTR_NAME4)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aiterate_invalid_loc_id) { - TESTING_2_API("H5Aiterate with an invalid loc_id"); + TESTING_2("H5Aiterate with an invalid loc_id"); H5E_BEGIN_TRY { @@ -7874,18 +7874,18 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate with an invalid loc_id!\n"); - PART_ERROR_API(H5Aiterate_invalid_loc_id); + PART_ERROR(H5Aiterate_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_invalid_loc_id); PART_BEGIN(H5Aiterate_invalid_index_type) { - TESTING_2_API("H5Aiterate with an invalid index type"); + TESTING_2("H5Aiterate with an invalid index type"); H5E_BEGIN_TRY { @@ -7895,10 +7895,10 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate with invalid index type " "H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Aiterate_invalid_index_type); + PART_ERROR(H5Aiterate_invalid_index_type); } H5E_BEGIN_TRY @@ -7908,18 +7908,18 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Aiterate_invalid_index_type); + PART_ERROR(H5Aiterate_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_invalid_index_type); PART_BEGIN(H5Aiterate_invalid_index_order) { - TESTING_2_API("H5Aiterate with an invalid index ordering"); + TESTING_2("H5Aiterate with an invalid index ordering"); H5E_BEGIN_TRY { @@ -7929,10 +7929,10 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate with invalid index ordering " "H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Aiterate_invalid_index_order); + PART_ERROR(H5Aiterate_invalid_index_order); } H5E_BEGIN_TRY @@ -7942,19 +7942,19 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " iterated over attributes using H5Aiterate with invalid index ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Aiterate_invalid_index_order); + PART_ERROR(H5Aiterate_invalid_index_order); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_invalid_index_order); PART_BEGIN(H5Aiterate_by_name_invalid_loc_id) { - TESTING_2_API("H5Aiterate_by_name with an invalid loc_id"); + TESTING_2("H5Aiterate_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -7964,18 +7964,18 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with an invalid loc_id!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_loc_id); + PART_ERROR(H5Aiterate_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_invalid_loc_id); PART_BEGIN(H5Aiterate_by_name_invalid_obj_name) { - TESTING_2_API("H5Aiterate_by_name with an invalid object name"); + TESTING_2("H5Aiterate_by_name with an invalid object name"); H5E_BEGIN_TRY { @@ -7985,9 +7985,9 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with a NULL object name!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_obj_name); + PART_ERROR(H5Aiterate_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -7998,19 +7998,19 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with an invalid object name " "of ''!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_obj_name); + PART_ERROR(H5Aiterate_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_invalid_obj_name); PART_BEGIN(H5Aiterate_by_name_invalid_index_type) { - TESTING_2_API("H5Aiterate_by_name with an invalid index type"); + TESTING_2("H5Aiterate_by_name with an invalid index type"); H5E_BEGIN_TRY { @@ -8020,10 +8020,10 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with invalid index type " "H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_index_type); + PART_ERROR(H5Aiterate_by_name_invalid_index_type); } H5E_BEGIN_TRY @@ -8034,19 +8034,19 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with invalid index type " "H5_INDEX_N!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_index_type); + PART_ERROR(H5Aiterate_by_name_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_invalid_index_type); PART_BEGIN(H5Aiterate_by_name_invalid_index_order) { - TESTING_2_API("H5Aiterate_by_name with an invalid index ordering"); + TESTING_2("H5Aiterate_by_name with an invalid index ordering"); H5E_BEGIN_TRY { @@ -8056,10 +8056,10 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with invalid index ordering " "H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_index_order); + PART_ERROR(H5Aiterate_by_name_invalid_index_order); } H5E_BEGIN_TRY @@ -8070,19 +8070,19 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with invalid index ordering " "H5_ITER_N!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_index_order); + PART_ERROR(H5Aiterate_by_name_invalid_index_order); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_invalid_index_order); PART_BEGIN(H5Aiterate_by_name_invalid_lapl) { - TESTING_2_API("H5Aiterate_by_name with an invalid LAPL"); + TESTING_2("H5Aiterate_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -8092,18 +8092,18 @@ test_attribute_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" iterated over attributes using H5Aiterate_by_name with an invalid LAPL!\n"); - PART_ERROR_API(H5Aiterate_by_name_invalid_lapl); + PART_ERROR(H5Aiterate_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -8124,7 +8124,7 @@ test_attribute_iterate_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -8166,29 +8166,29 @@ test_attribute_iterate_0_attributes(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, attribute, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup\n"); goto error; } @@ -8202,104 +8202,104 @@ test_attribute_iterate_0_attributes(void) if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aiterate_0_attributes_native) { - TESTING_2_API("H5Aiterate (native order)"); + TESTING_2("H5Aiterate (native order)"); if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, attr_iter_callback2, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 on object with 0 attributes failed\n"); - PART_ERROR_API(H5Aiterate_0_attributes_native); + PART_ERROR(H5Aiterate_0_attributes_native); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_0_attributes_native); PART_BEGIN(H5Aiterate_0_attributes_inc) { - TESTING_2_API("H5Aiterate (increasing order)"); + TESTING_2("H5Aiterate (increasing order)"); if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 on object with 0 attributes failed\n"); - PART_ERROR_API(H5Aiterate_0_attributes_inc); + PART_ERROR(H5Aiterate_0_attributes_inc); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_0_attributes_inc); PART_BEGIN(H5Aiterate_0_attributes_dec) { - TESTING_2_API("H5Aiterate (decreasing order)"); + TESTING_2("H5Aiterate (decreasing order)"); if (H5Aiterate2(dset_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback2, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate2 on object with 0 attributes failed\n"); - PART_ERROR_API(H5Aiterate_0_attributes_dec); + PART_ERROR(H5Aiterate_0_attributes_dec); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_0_attributes_dec); PART_BEGIN(H5Aiterate_by_name_0_attributes_native) { - TESTING_2_API("H5Aiterate_by_name (native order)"); + TESTING_2("H5Aiterate_by_name (native order)"); if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME, H5_ITER_NATIVE, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name on object with 0 attributes failed\n"); - PART_ERROR_API(H5Aiterate_by_name_0_attributes_native); + PART_ERROR(H5Aiterate_by_name_0_attributes_native); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_0_attributes_native); PART_BEGIN(H5Aiterate_by_name_0_attributes_inc) { - TESTING_2_API("H5Aiterate_by_name (increasing order)"); + TESTING_2("H5Aiterate_by_name (increasing order)"); if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name on object with 0 attributes failed\n"); - PART_ERROR_API(H5Aiterate_by_name_0_attributes_inc); + PART_ERROR(H5Aiterate_by_name_0_attributes_inc); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_0_attributes_inc); PART_BEGIN(H5Aiterate_by_name_0_attributes_dec) { - TESTING_2_API("H5Aiterate_by_name (decreasing order)"); + TESTING_2("H5Aiterate_by_name (decreasing order)"); if (H5Aiterate_by_name(group_id, ATTRIBUTE_ITERATE_TEST_0_ATTRIBUTES_DSET_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, attr_iter_callback2, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aiterate_by_name on object with 0 attributes failed\n"); - PART_ERROR_API(H5Aiterate_by_name_0_attributes_dec); + PART_ERROR(H5Aiterate_by_name_0_attributes_dec); } - PASSED_API(); + PASSED(); } PART_END(H5Aiterate_by_name_0_attributes_dec); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dset_space_id) < 0) TEST_ERROR; @@ -8314,7 +8314,7 @@ test_attribute_iterate_0_attributes(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -8354,35 +8354,35 @@ test_delete_attribute(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or attribute aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for attribute creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_attr_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order tracking\n"); goto error; } @@ -8390,7 +8390,7 @@ test_delete_attribute(void) if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_DELETION_TEST_GROUP_NAME); goto error; } @@ -8401,65 +8401,65 @@ test_delete_attribute(void) if ((attr_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Adelete) { - TESTING_2_API("H5Adelete"); + TESTING_2("H5Adelete"); /* Test H5Adelete */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete); + PART_ERROR(H5Adelete); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete); + PART_ERROR(H5Adelete); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete); + PART_ERROR(H5Adelete); } /* Delete the attribute */ if (H5Adelete(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete); + PART_ERROR(H5Adelete); } /* Verify the attribute has been deleted */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete); + PART_ERROR(H5Adelete); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete); + PART_ERROR(H5Adelete); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete); + PART_ERROR(H5Adelete); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete); @@ -8472,60 +8472,60 @@ test_delete_attribute(void) PART_BEGIN(H5Adelete_by_name) { - TESTING_2_API("H5Adelete_by_name"); + TESTING_2("H5Adelete_by_name"); /* Test H5Adelete_by_name */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_name); + PART_ERROR(H5Adelete_by_name); } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_name); + PART_ERROR(H5Adelete_by_name); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_name); + PART_ERROR(H5Adelete_by_name); } /* Delete the attribute */ if (H5Adelete_by_name(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, ATTRIBUTE_DELETION_TEST_ATTR_NAME, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_name); + PART_ERROR(H5Adelete_by_name); } /* Verify the attribute has been deleted */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_name); + PART_ERROR(H5Adelete_by_name); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_name); + PART_ERROR(H5Adelete_by_name); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_name); + PART_ERROR(H5Adelete_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_name); @@ -8538,10 +8538,10 @@ test_delete_attribute(void) PART_BEGIN(H5Adelete_by_idx_crt_order_increasing) { - TESTING_2_API("H5Adelete_by_idx by creation order in increasing order"); + TESTING_2("H5Adelete_by_idx by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Adelete_by_idx_crt_order_increasing); } @@ -8549,234 +8549,234 @@ test_delete_attribute(void) /* Create several attributes */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } /* Delete an attribute */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " "increasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } /* Repeat until all attributes have been deleted */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " "increasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " "increasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_increasing); + PART_ERROR(H5Adelete_by_idx_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_crt_order_increasing); @@ -8789,10 +8789,10 @@ test_delete_attribute(void) PART_BEGIN(H5Adelete_by_idx_crt_order_decreasing) { - TESTING_2_API("H5Adelete_by_idx by creation order in decreasing order"); + TESTING_2("H5Adelete_by_idx by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Adelete_by_idx_crt_order_decreasing); } @@ -8800,234 +8800,234 @@ test_delete_attribute(void) /* Create several attributes */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } /* Delete an attribute */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " "decreasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } /* Repeat until all attributes have been deleted */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " "decreasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by creation order in " "decreasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_crt_order_decreasing); + PART_ERROR(H5Adelete_by_idx_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_crt_order_decreasing); @@ -9040,239 +9040,239 @@ test_delete_attribute(void) PART_BEGIN(H5Adelete_by_idx_name_order_increasing) { - TESTING_2_API("H5Adelete_by_idx by alphabetical order in increasing order"); + TESTING_2("H5Adelete_by_idx by alphabetical order in increasing order"); /* Create several attributes */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } /* Delete an attribute */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " "increasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } /* Repeat until all attributes have been deleted */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " "increasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " "increasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_increasing); + PART_ERROR(H5Adelete_by_idx_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_name_order_increasing); @@ -9285,239 +9285,239 @@ test_delete_attribute(void) PART_BEGIN(H5Adelete_by_idx_name_order_decreasing) { - TESTING_2_API("H5Adelete_by_idx by alphabetical order in decreasing order"); + TESTING_2("H5Adelete_by_idx by alphabetical order in decreasing order"); /* Create several attributes */ if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close attribute '%s'\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } /* Verify the attributes have been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' didn't exist before deletion\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } /* Delete an attribute */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " "decreasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } /* Ensure that the attribute is gone and others remain */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } /* Repeat until all attributes have been deleted */ if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " "decreasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' doesn't exist after deletion of a different attribute!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (H5Adelete_by_idx(container_group, ATTRIBUTE_DELETION_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete attribute using H5Adelete_by_idx by alphabetical order in " "decreasing order\n"); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME2); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_TEST_ATTR_NAME3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } if (attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' exists after deletion!\n", ATTRIBUTE_DELETION_TEST_ATTR_NAME3); - PART_ERROR_API(H5Adelete_by_idx_name_order_decreasing); + PART_ERROR(H5Adelete_by_idx_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_name_order_decreasing); @@ -9530,7 +9530,7 @@ test_delete_attribute(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -9545,7 +9545,7 @@ test_delete_attribute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -9587,29 +9587,29 @@ test_delete_attribute_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_GROUP_NAME); goto error; @@ -9624,31 +9624,31 @@ test_delete_attribute_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DELETION_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute didn't exists\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Adelete_invalid_loc_id) { - TESTING_2_API("H5Adelete with an invalid loc_id"); + TESTING_2("H5Adelete with an invalid loc_id"); H5E_BEGIN_TRY { @@ -9657,18 +9657,18 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete with an invalid loc_id!\n"); - PART_ERROR_API(H5Adelete_invalid_loc_id); + PART_ERROR(H5Adelete_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_invalid_loc_id); PART_BEGIN(H5Adelete_invalid_attr_name) { - TESTING_2_API("H5Adelete with an invalid attribute name"); + TESTING_2("H5Adelete with an invalid attribute name"); H5E_BEGIN_TRY { @@ -9677,9 +9677,9 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete with a NULL attribute name!\n"); - PART_ERROR_API(H5Adelete_invalid_attr_name); + PART_ERROR(H5Adelete_invalid_attr_name); } H5E_BEGIN_TRY @@ -9689,18 +9689,18 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete with an invalid attribute name of ''!\n"); - PART_ERROR_API(H5Adelete_invalid_attr_name); + PART_ERROR(H5Adelete_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_invalid_attr_name); PART_BEGIN(H5Adelete_by_name_invalid_loc_id) { - TESTING_2_API("H5Adelete_by_name with an invalid loc_id"); + TESTING_2("H5Adelete_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -9710,18 +9710,18 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_name with an invalid loc_id!\n"); - PART_ERROR_API(H5Adelete_by_name_invalid_loc_id); + PART_ERROR(H5Adelete_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_name_invalid_loc_id); PART_BEGIN(H5Adelete_by_name_invalid_obj_name) { - TESTING_2_API("H5Adelete_by_name with an invalid object name"); + TESTING_2("H5Adelete_by_name with an invalid object name"); H5E_BEGIN_TRY { @@ -9731,9 +9731,9 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_name with a NULL object name!\n"); - PART_ERROR_API(H5Adelete_by_name_invalid_obj_name); + PART_ERROR(H5Adelete_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -9744,19 +9744,19 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " deleted an attribute using H5Adelete_by_name with an invalid object name of ''!\n"); - PART_ERROR_API(H5Adelete_by_name_invalid_obj_name); + PART_ERROR(H5Adelete_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_name_invalid_obj_name); PART_BEGIN(H5Adelete_by_name_invalid_attr_name) { - TESTING_2_API("H5Adelete_by_name with an invalid attribute name"); + TESTING_2("H5Adelete_by_name with an invalid attribute name"); H5E_BEGIN_TRY { @@ -9765,9 +9765,9 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_name with a NULL attribute name!\n"); - PART_ERROR_API(H5Adelete_by_name_invalid_attr_name); + PART_ERROR(H5Adelete_by_name_invalid_attr_name); } H5E_BEGIN_TRY @@ -9777,19 +9777,19 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_name with an invalid attribute name of " "''!\n"); - PART_ERROR_API(H5Adelete_by_name_invalid_attr_name); + PART_ERROR(H5Adelete_by_name_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_name_invalid_attr_name); PART_BEGIN(H5Adelete_by_name_invalid_lapl) { - TESTING_2_API("H5Adelete_by_name with an invalid LAPL"); + TESTING_2("H5Adelete_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -9799,18 +9799,18 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_name with an invalid LAPL!\n"); - PART_ERROR_API(H5Adelete_by_name_invalid_lapl); + PART_ERROR(H5Adelete_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_name_invalid_lapl); PART_BEGIN(H5Adelete_by_idx_invalid_loc_id) { - TESTING_2_API("H5Adelete_by_idx with an invalid loc_id"); + TESTING_2("H5Adelete_by_idx with an invalid loc_id"); H5E_BEGIN_TRY { @@ -9819,18 +9819,18 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_idx with an invalid loc_id!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_loc_id); + PART_ERROR(H5Adelete_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_invalid_loc_id); PART_BEGIN(H5Adelete_by_idx_invalid_obj_name) { - TESTING_2_API("H5Adelete_by_idx with an invalid object name"); + TESTING_2("H5Adelete_by_idx with an invalid object name"); H5E_BEGIN_TRY { @@ -9839,9 +9839,9 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_idx with a NULL object name!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_obj_name); + PART_ERROR(H5Adelete_by_idx_invalid_obj_name); } H5E_BEGIN_TRY @@ -9851,19 +9851,19 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " deleted an attribute using H5Adelete_by_idx with an invalid object name of ''!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_obj_name); + PART_ERROR(H5Adelete_by_idx_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_invalid_obj_name); PART_BEGIN(H5Adelete_by_idx_invalid_index_type) { - TESTING_2_API("H5Adelete_by_idx with an invalid index type"); + TESTING_2("H5Adelete_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -9872,10 +9872,10 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_idx with invalid index type " "H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_index_type); + PART_ERROR(H5Adelete_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -9885,19 +9885,19 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " deleted an attribute using H5Adelete_by_idx with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_index_type); + PART_ERROR(H5Adelete_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_invalid_index_type); PART_BEGIN(H5Adelete_by_idx_invalid_index_order) { - TESTING_2_API("H5Adelete_by_idx with an invalid index ordering"); + TESTING_2("H5Adelete_by_idx with an invalid index ordering"); H5E_BEGIN_TRY { @@ -9906,10 +9906,10 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_idx with invalid index ordering " "H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_index_order); + PART_ERROR(H5Adelete_by_idx_invalid_index_order); } H5E_BEGIN_TRY @@ -9919,19 +9919,19 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_idx with invalid index ordering " "H5_ITER_N!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_index_order); + PART_ERROR(H5Adelete_by_idx_invalid_index_order); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_invalid_index_order); PART_BEGIN(H5Adelete_by_idx_invalid_lapl) { - TESTING_2_API("H5Adelete_by_idx with an invalid LAPL"); + TESTING_2("H5Adelete_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -9940,18 +9940,18 @@ test_delete_attribute_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted an attribute using H5Adelete_by_idx with an invalid LAPL!\n"); - PART_ERROR_API(H5Adelete_by_idx_invalid_lapl); + PART_ERROR(H5Adelete_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Adelete_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -9966,7 +9966,7 @@ test_delete_attribute_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10004,29 +10004,29 @@ test_attribute_exists(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_EXISTS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_TEST_GROUP_NAME); goto error; } @@ -10039,59 +10039,59 @@ test_attribute_exists(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aexists) { - TESTING_2_API("H5Aexists"); + TESTING_2("H5Aexists"); if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_EXISTS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); - PART_ERROR_API(H5Aexists); + PART_ERROR(H5Aexists); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME); - PART_ERROR_API(H5Aexists); + PART_ERROR(H5Aexists); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists); PART_BEGIN(H5Aexists_by_name) { - TESTING_2_API("H5Aexists_by_name"); + TESTING_2("H5Aexists_by_name"); if ((attr_exists = H5Aexists_by_name(container_group, ATTRIBUTE_EXISTS_TEST_GROUP_NAME, ATTRIBUTE_EXISTS_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists by name\n"); - PART_ERROR_API(H5Aexists_by_name); + PART_ERROR(H5Aexists_by_name); } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute '%s' did not exist by name\n", ATTRIBUTE_EXISTS_TEST_ATTR_NAME); - PART_ERROR_API(H5Aexists_by_name); + PART_ERROR(H5Aexists_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists_by_name); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Aclose(attr_id) < 0) TEST_ERROR; @@ -10106,7 +10106,7 @@ test_attribute_exists(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10146,29 +10146,29 @@ test_attribute_exists_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -10182,31 +10182,31 @@ test_attribute_exists_invalid_params(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_EXISTS_INVALID_PARAMS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute didn't exists\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Aexists_invalid_loc_id) { - TESTING_2_API("H5Aexists with an invalid loc_id"); + TESTING_2("H5Aexists with an invalid loc_id"); H5E_BEGIN_TRY { @@ -10215,18 +10215,18 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists with an invalid loc_id succeeded!\n"); - PART_ERROR_API(H5Aexists_invalid_loc_id); + PART_ERROR(H5Aexists_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists_invalid_loc_id); PART_BEGIN(H5Aexists_invalid_attr_name) { - TESTING_2_API("H5Aexists with invalid attribute name"); + TESTING_2("H5Aexists with invalid attribute name"); H5E_BEGIN_TRY { @@ -10235,9 +10235,9 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists with a NULL attribute name succeeded!\n"); - PART_ERROR_API(H5Aexists_invalid_attr_name); + PART_ERROR(H5Aexists_invalid_attr_name); } H5E_BEGIN_TRY @@ -10247,18 +10247,18 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists with an invalid attribute name of '' succeeded!\n"); - PART_ERROR_API(H5Aexists_invalid_attr_name); + PART_ERROR(H5Aexists_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists_invalid_attr_name); PART_BEGIN(H5Aexists_by_name_invalid_loc_id) { - TESTING_2_API("H5Aexists_by_name with an invalid loc_id"); + TESTING_2("H5Aexists_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -10268,18 +10268,18 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists_by_name with an invalid loc_id succeeded!\n"); - PART_ERROR_API(H5Aexists_by_name_invalid_loc_id); + PART_ERROR(H5Aexists_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists_by_name_invalid_loc_id); PART_BEGIN(H5Aexists_by_name_invalid_obj_name) { - TESTING_2_API("H5Aexists_by_name with invalid object name"); + TESTING_2("H5Aexists_by_name with invalid object name"); H5E_BEGIN_TRY { @@ -10289,9 +10289,9 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists_by_name with a NULL object name succeeded!\n"); - PART_ERROR_API(H5Aexists_by_name_invalid_obj_name); + PART_ERROR(H5Aexists_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -10302,18 +10302,18 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists_by_name with an invalid object name of '' succeeded!\n"); - PART_ERROR_API(H5Aexists_by_name_invalid_obj_name); + PART_ERROR(H5Aexists_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists_by_name_invalid_obj_name); PART_BEGIN(H5Aexists_by_name_invalid_attr_name) { - TESTING_2_API("H5Aexists_by_name with invalid attribute name"); + TESTING_2("H5Aexists_by_name with invalid attribute name"); H5E_BEGIN_TRY { @@ -10323,9 +10323,9 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists_by_name with a NULL attribute name succeeded!\n"); - PART_ERROR_API(H5Aexists_by_name_invalid_attr_name); + PART_ERROR(H5Aexists_by_name_invalid_attr_name); } H5E_BEGIN_TRY @@ -10336,18 +10336,18 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists_by_name with an invalid attribute name of '' succeeded!\n"); - PART_ERROR_API(H5Aexists_by_name_invalid_attr_name); + PART_ERROR(H5Aexists_by_name_invalid_attr_name); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists_by_name_invalid_attr_name); PART_BEGIN(H5Aexists_by_name_invalid_lapl) { - TESTING_2_API("H5Aexists_by_name with an invalid link access property list"); + TESTING_2("H5Aexists_by_name with an invalid link access property list"); H5E_BEGIN_TRY { @@ -10357,18 +10357,18 @@ test_attribute_exists_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Aexists_by_name with an invalid link access property list succeeded!\n"); - PART_ERROR_API(H5Aexists_by_name_invalid_lapl); + PART_ERROR(H5Aexists_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Aexists_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Aclose(attr_id) < 0) TEST_ERROR; @@ -10383,7 +10383,7 @@ test_attribute_exists_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10419,32 +10419,32 @@ test_attribute_many(void) hid_t space_id = H5I_INVALID_HID; char attrname[ATTRIBUTE_MANY_NAME_BUF_SIZE]; /* Name of attribute */ - TESTING_API("creating many attributes"); + TESTING("creating many attributes"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_MANY_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the group '%s'\n", ATTRIBUTE_MANY_GROUP_NAME); goto error; } @@ -10460,20 +10460,20 @@ test_attribute_many(void) sprintf(attrname, "many-%06u", u); if ((attr_id = H5Acreate2(group_id, attrname, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, attrname)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -10493,7 +10493,7 @@ test_attribute_many(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10527,32 +10527,32 @@ test_attribute_duplicate_id(void) hid_t attr_dtype = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - TESTING_API("duplicated IDs for an attribute"); + TESTING("duplicated IDs for an attribute"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or attribute aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_DUPLICATE_ID_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the group '%s'\n", ATTRIBUTE_DUPLICATE_ID_GRP_NAME); goto error; } @@ -10565,27 +10565,27 @@ test_attribute_duplicate_id(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } /* Open the attribute just created and get a second ID */ if ((attr_id2 = H5Aopen(group_id, ATTRIBUTE_DUPLICATE_ID_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute can't be opened for a second time\n"); goto error; } @@ -10605,7 +10605,7 @@ test_attribute_duplicate_id(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10648,29 +10648,29 @@ test_get_number_attributes(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or object aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the group '%s'\n", ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME); goto error; } @@ -10683,94 +10683,94 @@ test_get_number_attributes(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_GET_NUM_ATTRS_TEST_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_GET_NUM_ATTRS_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Oget_info) { - TESTING_2_API("H5Oget_info"); + TESTING_2("H5Oget_info"); /* Now get the number of attributes from the group */ if (H5Oget_info3(group_id, &obj_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve group info using H5Oget_info3\n"); - PART_ERROR_API(H5Oget_info); + PART_ERROR(H5Oget_info); } if (obj_info.num_attrs != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" invalid number of attributes received\n"); - PART_ERROR_API(H5Oget_info); + PART_ERROR(H5Oget_info); } - PASSED_API(); + PASSED(); } PART_END(H5Oget_info); PART_BEGIN(H5Oget_info_by_name) { - TESTING_2_API("H5Oget_info_by_name"); + TESTING_2("H5Oget_info_by_name"); if (H5Oget_info_by_name3(container_group, ATTRIBUTE_GET_NUM_ATTRS_TEST_GRP_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve group info using H5Oget_info_by_name3\n"); - PART_ERROR_API(H5Oget_info_by_name); + PART_ERROR(H5Oget_info_by_name); } if (obj_info.num_attrs != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" invalid number of attributes received\n"); - PART_ERROR_API(H5Oget_info_by_name); + PART_ERROR(H5Oget_info_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Oget_info_by_name); PART_BEGIN(H5Oget_info_by_idx) { - TESTING_2_API("H5Oget_info_by_idx"); + TESTING_2("H5Oget_info_by_idx"); if (H5Oget_info_by_idx3(container_group, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve group info using H5Oget_info_by_idx3\n"); - PART_ERROR_API(H5Oget_info_by_idx); + PART_ERROR(H5Oget_info_by_idx); } if (obj_info.num_attrs != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" invalid number of attributes received\n"); - PART_ERROR_API(H5Oget_info_by_idx); + PART_ERROR(H5Oget_info_by_idx); } - PASSED_API(); + PASSED(); } PART_END(H5Oget_info_by_idx); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -10785,7 +10785,7 @@ test_get_number_attributes(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10823,34 +10823,34 @@ test_attr_shared_dtype(void) hid_t space_id = H5I_INVALID_HID; hid_t dset_id = H5I_INVALID_HID; - TESTING_API("shared datatype for attributes"); + TESTING("shared datatype for attributes"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, stored datatype, or object aren't " "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_SHARED_DTYPE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the group '%s'\n", ATTRIBUTE_SHARED_DTYPE_GROUP_NAME); goto error; } @@ -10864,73 +10864,73 @@ test_attr_shared_dtype(void) /* Commit datatype to file */ if (H5Tcommit2(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, attr_dtype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype\n"); goto error; } if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); goto error; } if (obj_info.rc != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); goto error; } if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_SHARED_DTYPE_ATTR_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute\n"); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_SHARED_DTYPE_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute exists\n"); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); goto error; } if (obj_info.rc != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); goto error; } if ((dset_id = H5Dcreate2(group_id, ATTRIBUTE_SHARED_DTYPE_DSET_NAME, attr_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); goto error; } if (H5Oget_info_by_name3(group_id, ATTRIBUTE_SHARED_DTYPE_NAME, &obj_info, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve root group info using H5Oget_info_by_name3\n"); goto error; } if (obj_info.rc != 3) { - H5_FAILED_API(); + H5_FAILED(); printf(" reference count of the named datatype is wrong: %u\n", obj_info.rc); goto error; } @@ -10946,7 +10946,7 @@ test_attr_shared_dtype(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -11028,7 +11028,7 @@ attr_iter_callback1(hid_t location_id, const char *attr_name, const H5A_info_t * expected_crt_order = (H5O_msg_crt_idx_t)(counter_val % ATTRIBUTE_ITERATE_TEST_NUM_ATTRS); if (ainfo->corder != expected_crt_order) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute's creation order value of %lld didn't match expected value of %lld\n", (long long)ainfo->corder, (long long)expected_crt_order); ret_val = H5_ITER_ERROR; diff --git a/test/API/H5_api_dataset_test.c b/test/API/H5_api_dataset_test.c index 74a04bb472a..b74187bb2a5 100644 --- a/test/API/H5_api_dataset_test.c +++ b/test/API/H5_api_dataset_test.c @@ -164,17 +164,17 @@ test_create_dataset_under_root(void) hid_t dset_dtype = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("dataset creation under root group"); + TESTING("dataset creation under root group"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } @@ -188,7 +188,7 @@ test_create_dataset_under_root(void) /* Create the Dataset under the root group of the file */ if ((dset_id = H5Dcreate2(file_id, DATASET_CREATE_UNDER_ROOT_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_ROOT_DSET_NAME); goto error; } @@ -202,7 +202,7 @@ test_create_dataset_under_root(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -232,31 +232,31 @@ test_create_dataset_under_existing_group(void) hid_t dset_dtype = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("dataset creation under an existing group"); + TESTING("dataset creation under an existing group"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_UNDER_EXISTING_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_CREATE_UNDER_EXISTING_GROUP_NAME); goto error; } @@ -270,7 +270,7 @@ test_create_dataset_under_existing_group(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_UNDER_EXISTING_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATE_UNDER_EXISTING_DSET_NAME); goto error; } @@ -288,7 +288,7 @@ test_create_dataset_under_existing_group(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -325,28 +325,28 @@ test_create_dataset_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_CREATE_INVALID_PARAMS_GROUP_NAME); goto error; } @@ -358,13 +358,13 @@ test_create_dataset_invalid_params(void) if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dcreate_invalid_loc_id) { - TESTING_2_API("H5Dcreate with an invalid loc_id"); + TESTING_2("H5Dcreate with an invalid loc_id"); H5E_BEGIN_TRY { @@ -374,19 +374,19 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with an invalid loc_id!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_loc_id); + PART_ERROR(H5Dcreate_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_invalid_loc_id); PART_BEGIN(H5Dcreate_invalid_dataset_name) { - TESTING_2_API("H5Dcreate with an invalid dataset name"); + TESTING_2("H5Dcreate with an invalid dataset name"); H5E_BEGIN_TRY { @@ -396,10 +396,10 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with a NULL dataset name!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_dataset_name); + PART_ERROR(H5Dcreate_invalid_dataset_name); } H5E_BEGIN_TRY @@ -410,19 +410,19 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with an invalid dataset name of ''!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_dataset_name); + PART_ERROR(H5Dcreate_invalid_dataset_name); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_invalid_dataset_name); PART_BEGIN(H5Dcreate_invalid_datatype) { - TESTING_2_API("H5Dcreate with an invalid datatype"); + TESTING_2("H5Dcreate with an invalid datatype"); H5E_BEGIN_TRY { @@ -432,19 +432,19 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with an invalid datatype!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_datatype); + PART_ERROR(H5Dcreate_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_invalid_datatype); PART_BEGIN(H5Dcreate_invalid_dataspace) { - TESTING_2_API("H5Dcreate with an invalid dataspace"); + TESTING_2("H5Dcreate with an invalid dataspace"); H5E_BEGIN_TRY { @@ -454,19 +454,19 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with an invalid dataspace!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_dataspace); + PART_ERROR(H5Dcreate_invalid_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_invalid_dataspace); PART_BEGIN(H5Dcreate_invalid_lcpl) { - TESTING_2_API("H5Dcreate with an invalid LCPL"); + TESTING_2("H5Dcreate with an invalid LCPL"); H5E_BEGIN_TRY { @@ -476,19 +476,19 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with an invalid LCPL!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_lcpl); + PART_ERROR(H5Dcreate_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_invalid_lcpl); PART_BEGIN(H5Dcreate_invalid_dcpl) { - TESTING_2_API("H5Dcreate with an invalid DCPL"); + TESTING_2("H5Dcreate with an invalid DCPL"); H5E_BEGIN_TRY { @@ -498,19 +498,19 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with an invalid DCPL!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_dcpl); + PART_ERROR(H5Dcreate_invalid_dcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_invalid_dcpl); PART_BEGIN(H5Dcreate_invalid_dapl) { - TESTING_2_API("H5Dcreate with an invalid DAPL"); + TESTING_2("H5Dcreate with an invalid DAPL"); H5E_BEGIN_TRY { @@ -520,19 +520,19 @@ test_create_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created dataset using H5Dcreate with an invalid DAPL!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_invalid_dapl); + PART_ERROR(H5Dcreate_invalid_dapl); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_invalid_dapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -545,7 +545,7 @@ test_create_dataset_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -576,31 +576,31 @@ test_create_anonymous_dataset(void) hid_t dset_dtype = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("anonymous dataset creation"); + TESTING("anonymous dataset creation"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_ANONYMOUS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_CREATE_ANONYMOUS_GROUP_NAME); goto error; } @@ -612,7 +612,7 @@ test_create_anonymous_dataset(void) TEST_ERROR; if ((dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create anonymous dataset\n"); goto error; } @@ -630,7 +630,7 @@ test_create_anonymous_dataset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -668,28 +668,28 @@ test_create_anonymous_dataset_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME); goto error; @@ -702,13 +702,13 @@ test_create_anonymous_dataset_invalid_params(void) if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dcreate_anon_invalid_loc_id) { - TESTING_2_API("H5Dcreate_anon with an invalid loc_id"); + TESTING_2("H5Dcreate_anon with an invalid loc_id"); H5E_BEGIN_TRY { @@ -717,19 +717,19 @@ test_create_anonymous_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous dataset using an invalid loc_id!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_anon_invalid_loc_id); + PART_ERROR(H5Dcreate_anon_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_anon_invalid_loc_id); PART_BEGIN(H5Dcreate_anon_invalid_datatype) { - TESTING_2_API("H5Dcreate_anon with an invalid dataset datatype"); + TESTING_2("H5Dcreate_anon with an invalid dataset datatype"); H5E_BEGIN_TRY { @@ -738,19 +738,19 @@ test_create_anonymous_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous dataset using an invalid dataset datatype!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_anon_invalid_datatype); + PART_ERROR(H5Dcreate_anon_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_anon_invalid_datatype); PART_BEGIN(H5Dcreate_anon_invalid_dataspace) { - TESTING_2_API("H5Dcreate_anon with an invalid dataset dataspace"); + TESTING_2("H5Dcreate_anon with an invalid dataset dataspace"); H5E_BEGIN_TRY { @@ -759,19 +759,19 @@ test_create_anonymous_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous dataset using an invalid dataset dataspace!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_anon_invalid_dataspace); + PART_ERROR(H5Dcreate_anon_invalid_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_anon_invalid_dataspace); PART_BEGIN(H5Dcreate_anon_invalid_dcpl) { - TESTING_2_API("H5Dcreate_anon with an invalid DCPL"); + TESTING_2("H5Dcreate_anon with an invalid DCPL"); H5E_BEGIN_TRY { @@ -780,19 +780,19 @@ test_create_anonymous_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous dataset using an invalid DCPL!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_anon_invalid_dcpl); + PART_ERROR(H5Dcreate_anon_invalid_dcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_anon_invalid_dcpl); PART_BEGIN(H5Dcreate_anon_invalid_dapl) { - TESTING_2_API("H5Dcreate_anon with an invalid DAPL"); + TESTING_2("H5Dcreate_anon with an invalid DAPL"); H5E_BEGIN_TRY { @@ -801,19 +801,19 @@ test_create_anonymous_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous dataset using an invalid DAPL!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dcreate_anon_invalid_dapl); + PART_ERROR(H5Dcreate_anon_invalid_dapl); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_anon_invalid_dapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -826,7 +826,7 @@ test_create_anonymous_dataset_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -858,31 +858,31 @@ test_create_dataset_null_space(void) hid_t dset_dtype = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("dataset creation with a NULL dataspace"); + TESTING("dataset creation with a NULL dataspace"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_SUBGROUP_NAME); goto error; @@ -896,7 +896,7 @@ test_create_dataset_null_space(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME); goto error; } @@ -905,7 +905,7 @@ test_create_dataset_null_space(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_CREATE_NULL_DATASPACE_TEST_DSET_NAME); goto error; } @@ -923,7 +923,7 @@ test_create_dataset_null_space(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -955,31 +955,31 @@ test_create_dataset_scalar_space(void) hid_t dset_dtype = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("dataset creation with a SCALAR dataspace"); + TESTING("dataset creation with a SCALAR dataspace"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_SUBGROUP_NAME); goto error; @@ -993,7 +993,7 @@ test_create_dataset_scalar_space(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME); goto error; } @@ -1002,7 +1002,7 @@ test_create_dataset_scalar_space(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_CREATE_SCALAR_DATASPACE_TEST_DSET_NAME); goto error; } @@ -1020,7 +1020,7 @@ test_create_dataset_scalar_space(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1054,31 +1054,31 @@ test_create_zero_dim_dset(void) hid_t fspace_id = H5I_INVALID_HID; int data[1]; - TESTING_API("creation of 0-sized dataset"); + TESTING("creation of 0-sized dataset"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ZERO_DIM_DSET_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", ZERO_DIM_DSET_TEST_GROUP_NAME); goto error; } @@ -1088,27 +1088,27 @@ test_create_zero_dim_dset(void) if ((dset_id = H5Dcreate2(group_id, ZERO_DIM_DSET_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create 0-sized dataset\n"); goto error; } if (H5Sselect_none(fspace_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set none selection in dataset's file dataspace\n"); goto error; } /* Attempt to write 0 elements to dataset */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to write 0 elements to 0-sized dataset\n"); goto error; } /* Attempt to read 0 elements from dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to read 0 elements from 0-sized dataset\n"); goto error; } @@ -1124,7 +1124,7 @@ test_create_zero_dim_dset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1155,31 +1155,31 @@ test_create_dataset_random_shapes(void) hid_t dset_id = H5I_INVALID_HID, space_id = H5I_INVALID_HID; hid_t dset_dtype = H5I_INVALID_HID; - TESTING_API("dataset creation with random dimension sizes"); + TESTING("dataset creation with random dimension sizes"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SHAPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group\n"); goto error; } @@ -1192,7 +1192,7 @@ test_create_dataset_random_shapes(void) int ndims = rand() % DATASET_SHAPE_TEST_MAX_DIMS + 1; if ((space_id = generate_random_dataspace(ndims, NULL, NULL, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataspace\n"); goto error; } @@ -1201,7 +1201,7 @@ test_create_dataset_random_shapes(void) if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); goto error; } @@ -1221,7 +1221,7 @@ test_create_dataset_random_shapes(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1259,31 +1259,31 @@ test_create_dataset_predefined_types(void) H5T_STD_U64LE, H5T_STD_U64BE, H5T_STD_I64LE, H5T_STD_I64BE, H5T_IEEE_F32LE, H5T_IEEE_F32BE, H5T_IEEE_F64LE, H5T_IEEE_F64BE}; - TESTING_API("dataset creation with predefined datatypes"); + TESTING("dataset creation with predefined datatypes"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create sub-container group '%s'\n", DATASET_PREDEFINED_TYPE_TEST_SUBGROUP_NAME); goto error; } @@ -1299,7 +1299,7 @@ test_create_dataset_predefined_types(void) if ((dset_id = H5Dcreate2(group_id, name, predefined_type_test_table[i], fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", name); goto error; } @@ -1310,7 +1310,7 @@ test_create_dataset_predefined_types(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", name); goto error; } @@ -1326,7 +1326,7 @@ test_create_dataset_predefined_types(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1362,40 +1362,40 @@ test_create_dataset_string_types(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_STRING_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_STRING_TYPE_TEST_SUBGROUP_NAME); goto error; } if ((type_id_fixed = H5Tcreate(H5T_STRING, DATASET_STRING_TYPE_TEST_STRING_LENGTH)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create fixed-length string type\n"); goto error; } if ((type_id_variable = H5Tcreate(H5T_STRING, H5T_VARIABLE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create variable-length string type\n"); goto error; } @@ -1403,20 +1403,20 @@ test_create_dataset_string_types(void) if ((fspace_id = generate_random_dataspace(DATASET_STRING_TYPE_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dcreate_fixed_string_type) { - TESTING_2_API("creation of fixed-size string dataset"); + TESTING_2("creation of fixed-size string dataset"); if ((dset_id_fixed = H5Dcreate2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME1, type_id_fixed, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create fixed-length string dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME1); - PART_ERROR_API(H5Dcreate_fixed_string_type); + PART_ERROR(H5Dcreate_fixed_string_type); } if (dset_id_fixed >= 0) { @@ -1429,26 +1429,26 @@ test_create_dataset_string_types(void) } if ((dset_id_fixed = H5Dopen2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME1); - PART_ERROR_API(H5Dcreate_fixed_string_type); + PART_ERROR(H5Dcreate_fixed_string_type); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_fixed_string_type); PART_BEGIN(H5Dcreate_variable_string_type) { - TESTING_2_API("creation of variable-length string dataset"); + TESTING_2("creation of variable-length string dataset"); if ((dset_id_variable = H5Dcreate2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME2, type_id_variable, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create variable-length string dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME2); - PART_ERROR_API(H5Dcreate_variable_string_type); + PART_ERROR(H5Dcreate_variable_string_type); } if (dset_id_variable >= 0) { @@ -1462,18 +1462,18 @@ test_create_dataset_string_types(void) if ((dset_id_variable = H5Dopen2(group_id, DATASET_STRING_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_STRING_TYPE_TEST_DSET_NAME2); - PART_ERROR_API(H5Dcreate_variable_string_type); + PART_ERROR(H5Dcreate_variable_string_type); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_variable_string_type); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Tclose(type_id_fixed) < 0) TEST_ERROR; @@ -1492,7 +1492,7 @@ test_create_dataset_string_types(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1529,12 +1529,12 @@ test_create_dataset_compound_types(void) hid_t type_pool[DATASET_COMPOUND_TYPE_TEST_MAX_SUBTYPES]; int num_passes; - TESTING_API("dataset creation with compound datatypes"); + TESTING("dataset creation with compound datatypes"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -1548,20 +1548,20 @@ test_create_dataset_compound_types(void) type_pool[j] = H5I_INVALID_HID; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_COMPOUND_TYPE_TEST_SUBGROUP_NAME); goto error; } @@ -1588,7 +1588,7 @@ test_create_dataset_compound_types(void) num_subtypes = (size_t)(rand() % DATASET_COMPOUND_TYPE_TEST_MAX_SUBTYPES) + 1; if ((compound_type = H5Tcreate(H5T_COMPOUND, 1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create compound datatype\n"); goto error; } @@ -1601,13 +1601,13 @@ test_create_dataset_compound_types(void) HDsnprintf(member_name, 256, "member%zu", j); if ((type_pool[j] = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create compound datatype member %zu\n", j); goto error; } if (!(member_size = H5Tget_size(type_pool[j]))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get compound member %zu size\n", j); goto error; } @@ -1630,7 +1630,7 @@ test_create_dataset_compound_types(void) if ((dset_id = H5Dcreate2(group_id, dset_name, compound_type, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", dset_name); goto error; } @@ -1639,7 +1639,7 @@ test_create_dataset_compound_types(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, dset_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", dset_name); goto error; } @@ -1662,7 +1662,7 @@ test_create_dataset_compound_types(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1699,37 +1699,37 @@ test_create_dataset_enum_types(void) const char *enum_type_test_table[] = {"RED", "GREEN", "BLUE", "BLACK", "WHITE", "PURPLE", "ORANGE", "YELLOW", "BROWN"}; - TESTING_API("dataset creation with enum types"); + TESTING("dataset creation with enum types"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_ENUM_TYPE_TEST_SUBGROUP_NAME); goto error; } if ((enum_native = H5Tcreate(H5T_ENUM, sizeof(int))) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create native enum type\n"); goto error; } @@ -1739,7 +1739,7 @@ test_create_dataset_enum_types(void) TEST_ERROR; if ((enum_non_native = H5Tenum_create(H5T_STD_U32LE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create non-native enum type\n"); goto error; } @@ -1758,14 +1758,14 @@ test_create_dataset_enum_types(void) if ((dset_id_native = H5Dcreate2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME1, enum_native, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id_non_native = H5Dcreate2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME2, enum_non_native, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create non-native enum dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2); goto error; } @@ -1776,13 +1776,13 @@ test_create_dataset_enum_types(void) TEST_ERROR; if ((dset_id_native = H5Dopen2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id_non_native = H5Dopen2(group_id, DATASET_ENUM_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_ENUM_TYPE_TEST_DSET_NAME2); goto error; } @@ -1804,7 +1804,7 @@ test_create_dataset_enum_types(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1846,31 +1846,31 @@ test_create_dataset_array_types(void) array_base_type_id3 = H5I_INVALID_HID; hid_t nested_type_id = H5I_INVALID_HID; - TESTING_API("dataset creation with array types"); + TESTING("dataset creation with array types"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_ARRAY_TYPE_TEST_SUBGROUP_NAME); goto error; } @@ -1884,7 +1884,7 @@ test_create_dataset_array_types(void) if ((array_type_id1 = H5Tarray_create2(array_base_type_id1, DATASET_ARRAY_TYPE_TEST_RANK1, array_dims1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first array type\n"); goto error; } @@ -1897,7 +1897,7 @@ test_create_dataset_array_types(void) if ((array_type_id2 = H5Tarray_create2(array_base_type_id2, DATASET_ARRAY_TYPE_TEST_RANK2, array_dims2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second array type\n"); goto error; } @@ -1911,13 +1911,13 @@ test_create_dataset_array_types(void) if ((nested_type_id = H5Tarray_create2(array_base_type_id3, DATASET_ARRAY_TYPE_TEST_RANK3, array_dims3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create nested array base type\n"); goto error; } if ((array_type_id3 = H5Tarray_create2(nested_type_id, DATASET_ARRAY_TYPE_TEST_RANK3, array_dims3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create nested array type\n"); goto error; } @@ -1927,21 +1927,21 @@ test_create_dataset_array_types(void) if ((dset_id1 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME1, array_type_id1, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id2 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME2, array_type_id2, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2); goto error; } if ((dset_id3 = H5Dcreate2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME3, array_type_id3, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create nested array type dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3); goto error; } @@ -1954,19 +1954,19 @@ test_create_dataset_array_types(void) TEST_ERROR; if ((dset_id1 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME1); goto error; } if ((dset_id2 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME2); goto error; } if ((dset_id3 = H5Dopen2(group_id, DATASET_ARRAY_TYPE_TEST_DSET_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_ARRAY_TYPE_TEST_DSET_NAME3); goto error; } @@ -2000,7 +2000,7 @@ test_create_dataset_array_types(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2048,29 +2048,29 @@ test_create_dataset_creation_properties(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", DATASET_CREATION_PROPERTIES_TEST_GROUP_NAME); goto error; } @@ -2091,7 +2091,7 @@ test_create_dataset_creation_properties(void) if ((compact_dtype = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -2101,30 +2101,30 @@ test_create_dataset_creation_properties(void) H5D_alloc_time_t alloc_times[] = {H5D_ALLOC_TIME_DEFAULT, H5D_ALLOC_TIME_EARLY, H5D_ALLOC_TIME_INCR, H5D_ALLOC_TIME_LATE}; - TESTING_2_API("dataset storage space allocation time property"); + TESTING_2("dataset storage space allocation time property"); if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); - PART_ERROR_API(DCPL_alloc_time_test); + PART_ERROR(DCPL_alloc_time_test); } for (i = 0; i < ARRAY_LENGTH(alloc_times); i++) { char name[100]; if (H5Pset_alloc_time(dcpl_id, alloc_times[i]) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set alloc time property value\n"); - PART_ERROR_API(DCPL_alloc_time_test); + PART_ERROR(DCPL_alloc_time_test); } HDsprintf(name, "%s%zu", DATASET_CREATION_PROPERTIES_TEST_ALLOC_TIMES_BASE_NAME, i); if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", name); - PART_ERROR_API(DCPL_alloc_time_test); + PART_ERROR(DCPL_alloc_time_test); } if (dset_id >= 0) { @@ -2137,9 +2137,9 @@ test_create_dataset_creation_properties(void) } if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", name); - PART_ERROR_API(DCPL_alloc_time_test); + PART_ERROR(DCPL_alloc_time_test); } if (dset_id >= 0) { @@ -2161,7 +2161,7 @@ test_create_dataset_creation_properties(void) dcpl_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(DCPL_alloc_time_test); @@ -2171,36 +2171,36 @@ test_create_dataset_creation_properties(void) unsigned creation_orders[] = {H5P_CRT_ORDER_TRACKED, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED}; - TESTING_2_API("attribute creation order property for DCPL"); + TESTING_2("attribute creation order property for DCPL"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking is not supported by this VOL connector\n"); PART_EMPTY(DCPL_attr_crt_order_test); } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); - PART_ERROR_API(DCPL_attr_crt_order_test); + PART_ERROR(DCPL_attr_crt_order_test); } for (i = 0; i < ARRAY_LENGTH(creation_orders); i++) { char name[100]; if (H5Pset_attr_creation_order(dcpl_id, creation_orders[i]) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute creation order property\n"); - PART_ERROR_API(DCPL_attr_crt_order_test); + PART_ERROR(DCPL_attr_crt_order_test); } HDsprintf(name, "%s%zu", DATASET_CREATION_PROPERTIES_TEST_CRT_ORDER_BASE_NAME, i); if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", name); - PART_ERROR_API(DCPL_attr_crt_order_test); + PART_ERROR(DCPL_attr_crt_order_test); } if (dset_id >= 0) { @@ -2213,9 +2213,9 @@ test_create_dataset_creation_properties(void) } if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", name); - PART_ERROR_API(DCPL_attr_crt_order_test); + PART_ERROR(DCPL_attr_crt_order_test); } if (dset_id >= 0) { @@ -2237,34 +2237,34 @@ test_create_dataset_creation_properties(void) dcpl_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(DCPL_attr_crt_order_test); /* Test the attribute phase change property */ PART_BEGIN(DCPL_attr_phase_change_test) { - TESTING_2_API("attribute phase change property for DCPL"); + TESTING_2("attribute phase change property for DCPL"); if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); - PART_ERROR_API(DCPL_attr_phase_change_test); + PART_ERROR(DCPL_attr_phase_change_test); } if (H5Pset_attr_phase_change(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_MAX_COMPACT, DATASET_CREATION_PROPERTIES_TEST_MIN_DENSE) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set attribute phase change property\n"); - PART_ERROR_API(DCPL_attr_phase_change_test); + PART_ERROR(DCPL_attr_phase_change_test); } if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME); - PART_ERROR_API(DCPL_attr_phase_change_test); + PART_ERROR(DCPL_attr_phase_change_test); } if (dset_id >= 0) { @@ -2278,10 +2278,10 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_PHASE_CHANGE_DSET_NAME); - PART_ERROR_API(DCPL_attr_phase_change_test); + PART_ERROR(DCPL_attr_phase_change_test); } if (dset_id >= 0) { @@ -2301,7 +2301,7 @@ test_create_dataset_creation_properties(void) dcpl_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(DCPL_attr_phase_change_test); @@ -2310,30 +2310,30 @@ test_create_dataset_creation_properties(void) { H5D_fill_time_t fill_times[] = {H5D_FILL_TIME_IFSET, H5D_FILL_TIME_ALLOC, H5D_FILL_TIME_NEVER}; - TESTING_2_API("dataset fill time property"); + TESTING_2("dataset fill time property"); if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); - PART_ERROR_API(DCPL_fill_time_property_test); + PART_ERROR(DCPL_fill_time_property_test); } for (i = 0; i < ARRAY_LENGTH(fill_times); i++) { char name[100]; if (H5Pset_fill_time(dcpl_id, fill_times[i]) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set dataset fill time property\n"); - PART_ERROR_API(DCPL_fill_time_property_test); + PART_ERROR(DCPL_fill_time_property_test); } HDsprintf(name, "%s%zu", DATASET_CREATION_PROPERTIES_TEST_FILL_TIMES_BASE_NAME, i); if ((dset_id = H5Dcreate2(group_id, name, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", name); - PART_ERROR_API(DCPL_fill_time_property_test); + PART_ERROR(DCPL_fill_time_property_test); } if (dset_id >= 0) { @@ -2346,9 +2346,9 @@ test_create_dataset_creation_properties(void) } if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", name); - PART_ERROR_API(DCPL_fill_time_property_test); + PART_ERROR(DCPL_fill_time_property_test); } if (dset_id >= 0) { @@ -2370,7 +2370,7 @@ test_create_dataset_creation_properties(void) dcpl_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(DCPL_fill_time_property_test); @@ -2379,51 +2379,51 @@ test_create_dataset_creation_properties(void) /* Test filters */ PART_BEGIN(DCPL_filters_test) { - TESTING_2_API("dataset filters"); + TESTING_2("dataset filters"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILTERS)) { - SKIPPED_API(); + SKIPPED(); printf(" dataset filters are not supported by this VOL connector\n"); PART_EMPTY(DCPL_filters_test); } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } if (H5Pset_chunk(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_SHAPE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set chunking on DCPL\n"); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } /* Set all of the available filters on the DCPL */ if (H5Pset_deflate(dcpl_id, 7) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set deflate filter on DCPL\n"); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } if (H5Pset_shuffle(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set shuffle filter on DCPL\n"); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } if (H5Pset_fletcher32(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set fletcher32 filter on DCPL\n"); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } if (H5Pset_nbit(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set nbit filter on DCPL\n"); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } if (H5Pset_scaleoffset(dcpl_id, H5Z_SO_FLOAT_ESCALE, 2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set scaleoffset filter on DCPL\n"); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } /* @@ -2431,10 +2431,10 @@ test_create_dataset_creation_properties(void) */ if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } if (dset_id >= 0) { @@ -2448,10 +2448,10 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_FILTERS_DSET_NAME); - PART_ERROR_API(DCPL_filters_test); + PART_ERROR(DCPL_filters_test); } if (dset_id >= 0) { @@ -2472,7 +2472,7 @@ test_create_dataset_creation_properties(void) dcpl_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(DCPL_filters_test); @@ -2481,21 +2481,21 @@ test_create_dataset_creation_properties(void) { H5D_layout_t layouts[] = {H5D_COMPACT, H5D_CONTIGUOUS, H5D_CHUNKED}; - TESTING_2_API("dataset storage layouts"); + TESTING_2("dataset storage layouts"); if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); - PART_ERROR_API(DCPL_storage_layout_test); + PART_ERROR(DCPL_storage_layout_test); } for (i = 0; i < ARRAY_LENGTH(layouts); i++) { char name[100]; if (H5Pset_layout(dcpl_id, layouts[i]) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set storage layout property\n"); - PART_ERROR_API(DCPL_storage_layout_test); + PART_ERROR(DCPL_storage_layout_test); } if (H5D_CHUNKED == layouts[i]) { @@ -2507,9 +2507,9 @@ test_create_dataset_creation_properties(void) if (H5Pset_chunk(dcpl_id, DATASET_CREATION_PROPERTIES_TEST_CHUNK_DIM_RANK, local_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set chunk dimensionality\n"); - PART_ERROR_API(DCPL_storage_layout_test); + PART_ERROR(DCPL_storage_layout_test); } } @@ -2519,9 +2519,9 @@ test_create_dataset_creation_properties(void) H5Dcreate2(group_id, name, (H5D_COMPACT == layouts[i]) ? compact_dtype : dset_dtype, (H5D_COMPACT == layouts[i]) ? compact_fspace_id : fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", name); - PART_ERROR_API(DCPL_storage_layout_test); + PART_ERROR(DCPL_storage_layout_test); } if (dset_id >= 0) { @@ -2534,9 +2534,9 @@ test_create_dataset_creation_properties(void) } if ((dset_id = H5Dopen2(group_id, name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", name); - PART_ERROR_API(DCPL_storage_layout_test); + PART_ERROR(DCPL_storage_layout_test); } if (dset_id >= 0) { @@ -2558,39 +2558,39 @@ test_create_dataset_creation_properties(void) dcpl_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(DCPL_storage_layout_test); /* Test the "track object times" property */ PART_BEGIN(DCPL_track_obj_times_test) { - TESTING_2_API("object time tracking property for DCPL"); + TESTING_2("object time tracking property for DCPL"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_TRACK_TIMES)) { - SKIPPED_API(); + SKIPPED(); printf(" object time tracking is not supported by this VOL connector\n"); PART_EMPTY(DCPL_track_obj_times_test); } if ((dcpl_id = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); - PART_ERROR_API(DCPL_track_obj_times_test); + PART_ERROR(DCPL_track_obj_times_test); } if (H5Pset_obj_track_times(dcpl_id, true) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set object time tracking property\n"); - PART_ERROR_API(DCPL_track_obj_times_test); + PART_ERROR(DCPL_track_obj_times_test); } if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME); - PART_ERROR_API(DCPL_track_obj_times_test); + PART_ERROR(DCPL_track_obj_times_test); } if (dset_id >= 0) { @@ -2604,10 +2604,10 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_YES_DSET_NAME); - PART_ERROR_API(DCPL_track_obj_times_test); + PART_ERROR(DCPL_track_obj_times_test); } if (dset_id >= 0) { @@ -2620,17 +2620,17 @@ test_create_dataset_creation_properties(void) } if (H5Pset_obj_track_times(dcpl_id, false) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set object time tracking property\n"); - PART_ERROR_API(DCPL_track_obj_times_test); + PART_ERROR(DCPL_track_obj_times_test); } if ((dset_id = H5Dcreate2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME); - PART_ERROR_API(DCPL_track_obj_times_test); + PART_ERROR(DCPL_track_obj_times_test); } if (dset_id >= 0) { @@ -2644,10 +2644,10 @@ test_create_dataset_creation_properties(void) if ((dset_id = H5Dopen2(group_id, DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_CREATION_PROPERTIES_TEST_TRACK_TIMES_NO_DSET_NAME); - PART_ERROR_API(DCPL_track_obj_times_test); + PART_ERROR(DCPL_track_obj_times_test); } if (dset_id >= 0) { @@ -2667,13 +2667,13 @@ test_create_dataset_creation_properties(void) dcpl_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(DCPL_track_obj_times_test); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(compact_fspace_id) < 0) TEST_ERROR; @@ -2690,7 +2690,7 @@ test_create_dataset_creation_properties(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2726,37 +2726,37 @@ test_create_many_dataset(void) unsigned char data; unsigned int i; - TESTING_API("creating many datasets"); + TESTING("creating many datasets"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MANY_CREATE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_MANY_CREATE_GROUP_NAME); goto error; } if ((dataspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create scalar data space\n"); goto error; } @@ -2769,19 +2769,19 @@ test_create_many_dataset(void) if ((dset_id = H5Dcreate2(group_id, dset_name, H5T_NATIVE_UCHAR, dataspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", dset_name); goto error; } if (H5Dwrite(dset_id, H5T_NATIVE_UCHAR, H5S_ALL, H5S_ALL, H5P_DEFAULT, &data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", dset_name); goto error; } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close dataset '%s'\n", dset_name); goto error; } @@ -2796,7 +2796,7 @@ test_create_many_dataset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2821,9 +2821,9 @@ test_create_many_dataset(void) static int test_open_dataset(void) { - TESTING_API("H5Dopen"); + TESTING("H5Dopen"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -2846,28 +2846,28 @@ test_open_dataset_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_OPEN_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_OPEN_INVALID_PARAMS_GROUP_NAME); goto error; } @@ -2881,7 +2881,7 @@ test_open_dataset_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, DATASET_OPEN_INVALID_PARAMS_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_OPEN_INVALID_PARAMS_DSET_NAME); goto error; } @@ -2889,13 +2889,13 @@ test_open_dataset_invalid_params(void) if (H5Dclose(dset_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dopen_invalid_loc_id) { - TESTING_2_API("H5Dopen with an invalid loc_id"); + TESTING_2("H5Dopen with an invalid loc_id"); H5E_BEGIN_TRY { @@ -2904,19 +2904,19 @@ test_open_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened dataset using H5Dopen2 with an invalid loc_id!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dopen_invalid_loc_id); + PART_ERROR(H5Dopen_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dopen_invalid_loc_id); PART_BEGIN(H5Dopen_invalid_dataset_name) { - TESTING_2_API("H5Dopen with an invalid dataset name"); + TESTING_2("H5Dopen with an invalid dataset name"); H5E_BEGIN_TRY { @@ -2925,10 +2925,10 @@ test_open_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened dataset using H5Dopen2 with a NULL dataset name!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dopen_invalid_dataset_name); + PART_ERROR(H5Dopen_invalid_dataset_name); } H5E_BEGIN_TRY @@ -2938,19 +2938,19 @@ test_open_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened dataset using H5Dopen2 with an invalid dataset name of ''!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dopen_invalid_dataset_name); + PART_ERROR(H5Dopen_invalid_dataset_name); } - PASSED_API(); + PASSED(); } PART_END(H5Dopen_invalid_dataset_name); PART_BEGIN(H5Dopen_invalid_dapl) { - TESTING_2_API("H5Dopen with an invalid DAPL"); + TESTING_2("H5Dopen with an invalid DAPL"); H5E_BEGIN_TRY { @@ -2959,19 +2959,19 @@ test_open_dataset_invalid_params(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened dataset using H5Dopen2 with an invalid DAPL!\n"); H5Dclose(dset_id); - PART_ERROR_API(H5Dopen_invalid_dapl); + PART_ERROR(H5Dopen_invalid_dapl); } - PASSED_API(); + PASSED(); } PART_END(H5Dopen_invalid_dapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -2984,7 +2984,7 @@ test_open_dataset_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3013,17 +3013,17 @@ test_close_dataset_invalid_params(void) herr_t err_ret = -1; hid_t file_id = H5I_INVALID_HID; - TESTING_API("H5Dclose with an invalid dataset ID"); + TESTING("H5Dclose with an invalid dataset ID"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } @@ -3035,7 +3035,7 @@ test_close_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Dclose succeeded with an invalid dataset ID!\n"); goto error; } @@ -3043,7 +3043,7 @@ test_close_dataset_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3081,28 +3081,28 @@ test_get_dataset_space_and_type(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_GET_SPACE_TYPE_TEST_GROUP_NAME); goto error; } @@ -3116,74 +3116,74 @@ test_get_dataset_space_and_type(void) if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { /* Retrieve the dataset's datatype and dataspace and verify them */ PART_BEGIN(H5Dget_type) { - TESTING_2_API("H5Dget_type"); + TESTING_2("H5Dget_type"); if ((tmp_type_id = H5Dget_type(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dataset's datatype\n"); - PART_ERROR_API(H5Dget_type); + PART_ERROR(H5Dget_type); } { htri_t types_equal = H5Tequal(tmp_type_id, dset_dtype); if (types_equal < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" datatype was invalid\n"); - PART_ERROR_API(H5Dget_type); + PART_ERROR(H5Dget_type); } if (!types_equal) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset's datatype did not match\n"); - PART_ERROR_API(H5Dget_type); + PART_ERROR(H5Dget_type); } } - PASSED_API(); + PASSED(); } PART_END(H5Dget_type); PART_BEGIN(H5Dget_space) { - TESTING_2_API("H5Dget_space"); + TESTING_2("H5Dget_space"); if ((tmp_space_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dataset's dataspace\n"); - PART_ERROR_API(H5Dget_space); + PART_ERROR(H5Dget_space); } { hsize_t space_dims[DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK]; if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dataspace dimensions\n"); - PART_ERROR_API(H5Dget_space); + PART_ERROR(H5Dget_space); } for (i = 0; i < DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) if (space_dims[i] != dset_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset's dataspace dims didn't match\n"); - PART_ERROR_API(H5Dget_space); + PART_ERROR(H5Dget_space); } } - PASSED_API(); + PASSED(); } PART_END(H5Dget_space); @@ -3217,33 +3217,33 @@ test_get_dataset_space_and_type(void) PART_BEGIN(H5Dget_type_reopened) { - TESTING_2_API("H5Dget_type after re-opening a dataset"); + TESTING_2("H5Dget_type after re-opening a dataset"); if ((dset_id = H5Dopen2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); - PART_ERROR_API(H5Dget_type_reopened); + PART_ERROR(H5Dget_type_reopened); } if ((tmp_type_id = H5Dget_type(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dataset's datatype\n"); - PART_ERROR_API(H5Dget_type_reopened); + PART_ERROR(H5Dget_type_reopened); } { htri_t types_equal = H5Tequal(tmp_type_id, dset_dtype); if (types_equal < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" datatype was invalid\n"); - PART_ERROR_API(H5Dget_type_reopened); + PART_ERROR(H5Dget_type_reopened); } if (!types_equal) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset's datatype did not match\n"); - PART_ERROR_API(H5Dget_type_reopened); + PART_ERROR(H5Dget_type_reopened); } } @@ -3256,40 +3256,40 @@ test_get_dataset_space_and_type(void) dset_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Dget_type_reopened); PART_BEGIN(H5Dget_space_reopened) { - TESTING_2_API("H5Dget_space after re-opening a dataset"); + TESTING_2("H5Dget_space after re-opening a dataset"); if ((dset_id = H5Dopen2(group_id, DATASET_GET_SPACE_TYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_GET_SPACE_TYPE_TEST_DSET_NAME); - PART_ERROR_API(H5Dget_space_reopened); + PART_ERROR(H5Dget_space_reopened); } if ((tmp_space_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dataset's dataspace\n"); - PART_ERROR_API(H5Dget_space_reopened); + PART_ERROR(H5Dget_space_reopened); } { hsize_t space_dims[DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK]; if (H5Sget_simple_extent_dims(tmp_space_id, space_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve dataspace dimensions\n"); - PART_ERROR_API(H5Dget_space_reopened); + PART_ERROR(H5Dget_space_reopened); } for (i = 0; i < DATASET_GET_SPACE_TYPE_TEST_SPACE_RANK; i++) { if (space_dims[i] != dset_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset's dataspace dims didn't match!\n"); - PART_ERROR_API(H5Dget_space_reopened); + PART_ERROR(H5Dget_space_reopened); } } } @@ -3303,13 +3303,13 @@ test_get_dataset_space_and_type(void) dset_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Dget_space_reopened); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(tmp_space_id) < 0) TEST_ERROR; @@ -3326,7 +3326,7 @@ test_get_dataset_space_and_type(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3369,28 +3369,28 @@ test_get_dataset_space_and_type_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, ATTRIBUTE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", ATTRIBUTE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; @@ -3405,18 +3405,18 @@ test_get_dataset_space_and_type_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, dset_space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_GET_SPACE_TYPE_INVALID_PARAMS_TEST_DSET_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dget_type_invalid_dset_id) { - TESTING_2_API("H5Dget_type with an invalid dset_id"); + TESTING_2("H5Dget_type with an invalid dset_id"); H5E_BEGIN_TRY { @@ -3425,18 +3425,18 @@ test_get_dataset_space_and_type_invalid_params(void) H5E_END_TRY if (tmp_type_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved copy of dataset's datatype using an invalid dataset ID!\n"); - PART_ERROR_API(H5Dget_type_invalid_dset_id); + PART_ERROR(H5Dget_type_invalid_dset_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dget_type_invalid_dset_id); PART_BEGIN(H5Dget_space_invalid_dset_id) { - TESTING_2_API("H5Dget_space with an invalid dset_id"); + TESTING_2("H5Dget_space with an invalid dset_id"); H5E_BEGIN_TRY { @@ -3445,18 +3445,18 @@ test_get_dataset_space_and_type_invalid_params(void) H5E_END_TRY if (tmp_space_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved copy of dataset's dataspace using an invalid dataset ID!\n"); - PART_ERROR_API(H5Dget_space_invalid_dset_id); + PART_ERROR(H5Dget_space_invalid_dset_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dget_space_invalid_dset_id); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dset_space_id) < 0) TEST_ERROR; @@ -3471,7 +3471,7 @@ test_get_dataset_space_and_type_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3498,9 +3498,9 @@ test_get_dataset_space_and_type_invalid_params(void) static int test_get_dataset_space_status(void) { - TESTING_API("H5Dget_space_status"); + TESTING("H5Dget_space_status"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -3513,9 +3513,9 @@ test_get_dataset_space_status(void) static int test_get_dataset_space_status_invalid_params(void) { - TESTING_API("H5Dget_space_status with invalid parameters"); + TESTING("H5Dget_space_status with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -3552,36 +3552,36 @@ test_dataset_property_lists(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } /** for DAOS VOL, this test is problematic since auto chunking can be selected, so skip for now */ if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get VOL connector name\n"); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_PROPERTY_LIST_TEST_SUBGROUP_NAME); goto error; } @@ -3602,27 +3602,27 @@ test_dataset_property_lists(void) TEST_ERROR; if ((dcpl_id1 = H5Pcreate(H5P_DATASET_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DCPL\n"); goto error; } if (H5Pset_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set DCPL property\n"); goto error; } if ((dset_id1 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME1, dset_dtype1, space_id, H5P_DEFAULT, dcpl_id1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1); goto error; } if ((dset_id2 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME2, dset_dtype2, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2); goto error; } @@ -3630,26 +3630,26 @@ test_dataset_property_lists(void) if (H5Pclose(dcpl_id1) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dget_create_plist) { - TESTING_2_API("H5Dget_create_plist"); + TESTING_2("H5Dget_create_plist"); /* Try to receive copies of the two property lists, one which has the property set and one which * does not */ if ((dcpl_id1 = H5Dget_create_plist(dset_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Dget_create_plist); + PART_ERROR(H5Dget_create_plist); } if ((dcpl_id2 = H5Dget_create_plist(dset_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Dget_create_plist); + PART_ERROR(H5Dget_create_plist); } /* Ensure that property list 1 has the property set and property list 2 does not */ @@ -3659,16 +3659,16 @@ test_dataset_property_lists(void) memset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get DCPL property value\n"); - PART_ERROR_API(H5Dget_create_plist); + PART_ERROR(H5Dget_create_plist); } for (i = 0; i < DATASET_PROPERTY_LIST_TEST_SPACE_RANK; i++) if (tmp_chunk_dims[i] != chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" DCPL property values were incorrect\n"); - PART_ERROR_API(H5Dget_create_plist); + PART_ERROR(H5Dget_create_plist); } H5E_BEGIN_TRY @@ -3679,45 +3679,45 @@ test_dataset_property_lists(void) /* DAOS VOL can auto chunk, so don't fail */ if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" property list 2 shouldn't have had chunk dimensionality set (not a chunked " "layout)\n"); - PART_ERROR_API(H5Dget_create_plist); + PART_ERROR(H5Dget_create_plist); } } - PASSED_API(); + PASSED(); } PART_END(H5Dget_create_plist); PART_BEGIN(H5Dget_access_plist) { - TESTING_2_API("H5Dget_access_plist"); + TESTING_2("H5Dget_access_plist"); if ((dapl_id1 = H5Pcreate(H5P_DATASET_ACCESS)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create DAPL\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if (H5Pset_efile_prefix(dapl_id1, path_prefix) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set DAPL property\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if ((dset_id3 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME3, dset_dtype3, space_id, H5P_DEFAULT, H5P_DEFAULT, dapl_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if ((dset_id4 = H5Dcreate2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME4, dset_dtype4, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if (dapl_id1 >= 0) { @@ -3732,15 +3732,15 @@ test_dataset_property_lists(void) /* Try to receive copies of the two property lists, one which has the property set and one which * does not */ if ((dapl_id1 = H5Dget_access_plist(dset_id3)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if ((dapl_id2 = H5Dget_access_plist(dset_id4)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } /* Ensure that property list 1 has the property set and property list 2 does not */ @@ -3748,45 +3748,45 @@ test_dataset_property_lists(void) ssize_t buf_size = 0; if ((buf_size = H5Pget_efile_prefix(dapl_id1, NULL, 0)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve size for property value buffer\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if (NULL == (tmp_prefix = (char *)calloc(1, (size_t)buf_size + 1))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for property value\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if (H5Pget_efile_prefix(dapl_id1, tmp_prefix, (size_t)buf_size + 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve property list value\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if (HDstrncmp(tmp_prefix, path_prefix, (size_t)buf_size + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" DAPL values were incorrect!\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } memset(tmp_prefix, 0, (size_t)buf_size + 1); if (H5Pget_efile_prefix(dapl_id2, tmp_prefix, (size_t)buf_size) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve property list value\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } if (!HDstrncmp(tmp_prefix, path_prefix, (size_t)buf_size + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" DAPL property value was set!\n"); - PART_ERROR_API(H5Dget_access_plist); + PART_ERROR(H5Dget_access_plist); } } - PASSED_API(); + PASSED(); } PART_END(H5Dget_access_plist); @@ -3828,30 +3828,30 @@ test_dataset_property_lists(void) PART_BEGIN(H5Dget_create_plist_reopened) { - TESTING_2_API("H5Dget_create_plist after re-opening a dataset"); + TESTING_2("H5Dget_create_plist after re-opening a dataset"); if ((dset_id1 = H5Dopen2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME1); - PART_ERROR_API(H5Dget_create_plist_reopened); + PART_ERROR(H5Dget_create_plist_reopened); } if ((dset_id2 = H5Dopen2(group_id, DATASET_PROPERTY_LIST_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_PROPERTY_LIST_TEST_DSET_NAME2); - PART_ERROR_API(H5Dget_create_plist_reopened); + PART_ERROR(H5Dget_create_plist_reopened); } if ((dcpl_id1 = H5Dget_create_plist(dset_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Dget_create_plist_reopened); + PART_ERROR(H5Dget_create_plist_reopened); } if ((dcpl_id2 = H5Dget_create_plist(dset_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Dget_create_plist_reopened); + PART_ERROR(H5Dget_create_plist_reopened); } /* Ensure that property list 1 has the property set and property list 2 does not */ @@ -3861,16 +3861,16 @@ test_dataset_property_lists(void) memset(tmp_chunk_dims, 0, sizeof(tmp_chunk_dims)); if (H5Pget_chunk(dcpl_id1, DATASET_PROPERTY_LIST_TEST_SPACE_RANK, tmp_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get DCPL property value\n"); - PART_ERROR_API(H5Dget_create_plist_reopened); + PART_ERROR(H5Dget_create_plist_reopened); } for (i = 0; i < DATASET_PROPERTY_LIST_TEST_SPACE_RANK; i++) if (tmp_chunk_dims[i] != chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" DCPL property values were incorrect\n"); - PART_ERROR_API(H5Dget_create_plist_reopened); + PART_ERROR(H5Dget_create_plist_reopened); } H5E_BEGIN_TRY @@ -3881,20 +3881,20 @@ test_dataset_property_lists(void) /* DAOS VOL can auto chunk, so don't fail */ if (err_ret >= 0 && strcmp(vol_name, "daos") != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" property list 2 shouldn't have had chunk dimensionality set (not a chunked " "layout)\n"); - PART_ERROR_API(H5Dget_create_plist_reopened); + PART_ERROR(H5Dget_create_plist_reopened); } } - PASSED_API(); + PASSED(); } PART_END(H5Dget_create_plist_reopened); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (tmp_prefix) { free(tmp_prefix); @@ -3934,7 +3934,7 @@ test_dataset_property_lists(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3971,9 +3971,9 @@ test_dataset_property_lists(void) static int test_get_dataset_storage_size(void) { - TESTING_API("H5Dget_storage_size"); + TESTING("H5Dget_storage_size"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -3986,9 +3986,9 @@ test_get_dataset_storage_size(void) static int test_get_dataset_storage_size_invalid_params(void) { - TESTING_API("H5Dget_storage_size with invalid parameters"); + TESTING("H5Dget_storage_size with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -3999,9 +3999,9 @@ test_get_dataset_storage_size_invalid_params(void) static int test_get_dataset_chunk_storage_size(void) { - TESTING_API("H5Dget_chunk_storage_size"); + TESTING("H5Dget_chunk_storage_size"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -4014,9 +4014,9 @@ test_get_dataset_chunk_storage_size(void) static int test_get_dataset_chunk_storage_size_invalid_params(void) { - TESTING_API("H5Dget_chunk_storage_size with invalid parameters"); + TESTING("H5Dget_chunk_storage_size with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -4027,9 +4027,9 @@ test_get_dataset_chunk_storage_size_invalid_params(void) static int test_get_dataset_offset(void) { - TESTING_API("H5Dget_offset"); + TESTING("H5Dget_offset"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -4042,9 +4042,9 @@ test_get_dataset_offset(void) static int test_get_dataset_offset_invalid_params(void) { - TESTING_API("H5Dget_offset with invalid parameters"); + TESTING("H5Dget_offset with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -4064,31 +4064,31 @@ test_read_dataset_small_all(void) hid_t fspace_id = H5I_INVALID_HID; void *read_buf = NULL; - TESTING_API("small read from dataset with H5S_ALL"); + TESTING("small read from dataset with H5S_ALL"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_ALL_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_READ_TEST_ALL_GROUP_NAME); goto error; } @@ -4099,7 +4099,7 @@ test_read_dataset_small_all(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SMALL_READ_TEST_ALL_DSET_NAME, DATASET_SMALL_READ_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME); goto error; } @@ -4113,7 +4113,7 @@ test_read_dataset_small_all(void) if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_ALL_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_ALL_DSET_NAME); goto error; } @@ -4134,7 +4134,7 @@ test_read_dataset_small_all(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -4173,31 +4173,31 @@ test_read_dataset_small_hyperslab(void) hid_t mspace_id = H5I_INVALID_HID, fspace_id = H5I_INVALID_HID; void *read_buf = NULL; - TESTING_API("small read from dataset with a hyperslab selection"); + TESTING("small read from dataset with a hyperslab selection"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_GROUP_NAME); goto error; @@ -4211,7 +4211,7 @@ test_read_dataset_small_hyperslab(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME, DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME); goto error; } @@ -4237,7 +4237,7 @@ test_read_dataset_small_hyperslab(void) if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_HYPERSLAB_DSET_NAME); goto error; } @@ -4260,7 +4260,7 @@ test_read_dataset_small_hyperslab(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -4300,31 +4300,31 @@ test_read_dataset_small_point_selection(void) hid_t mspace_id = H5I_INVALID_HID; void *data = NULL; - TESTING_API("small read from dataset with a point selection"); + TESTING("small read from dataset with a point selection"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_GROUP_NAME); goto error; @@ -4339,7 +4339,7 @@ test_read_dataset_small_point_selection(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME, DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME); goto error; } @@ -4359,14 +4359,14 @@ test_read_dataset_small_point_selection(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_SMALL_READ_TEST_POINT_SELECTION_NUM_POINTS, points) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't select points\n"); goto error; } if (H5Dread(dset_id, DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_SMALL_READ_TEST_POINT_SELECTION_DSET_NAME); goto error; } @@ -4389,7 +4389,7 @@ test_read_dataset_small_point_selection(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -4454,12 +4454,12 @@ test_dataset_io_point_selections(void) hbool_t do_chunk; int i, j; - TESTING_API("point selection I/O with all selection in memory and points in file"); + TESTING("point selection I/O with all selection in memory and points in file"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -4494,7 +4494,7 @@ test_dataset_io_point_selections(void) /* Perform with and without chunking */ for (do_chunk = FALSE;; do_chunk = TRUE) { if (do_chunk) { - TESTING_API("point selection I/O with all selection in memory and points in file with chunking"); + TESTING("point selection I/O with all selection in memory and points in file with chunking"); /* Create chunked dataset */ if ((dset_id = H5Dcreate2(group_id, DATASET_IO_POINT_DSET_NAME_CHUNK, H5T_NATIVE_INT, fspace_id, @@ -4514,7 +4514,7 @@ test_dataset_io_point_selections(void) /* Write data */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to write entire dataset"); + FAIL_PUTS_ERROR("Failed to write entire dataset"); /* Update file_state */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) @@ -4533,12 +4533,12 @@ test_dataset_io_point_selections(void) /* Read points to "all" memory buffer */ if (H5Dread(dset_id, H5T_NATIVE_INT, mspace_id_all, fspace_id, H5P_DEFAULT, buf_point) < 0) - FAIL_PUTS_ERROR_API("Failed to read points from dataset to all memory buffer"); + FAIL_PUTS_ERROR("Failed to read points from dataset to all memory buffer"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_NPOINTS; i++) if (buf_point[i] != file_state[points[2 * i]][points[2 * i + 1]]) - FAIL_PUTS_ERROR_API("Incorrect data read from points to all memory buffer"); + FAIL_PUTS_ERROR("Incorrect data read from points to all memory buffer"); /* Generate points to write */ DATASET_IO_POINT_GEN_POINTS(points, i, j); @@ -4553,7 +4553,7 @@ test_dataset_io_point_selections(void) /* Write points from "all" memory buffer */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, mspace_id_all, fspace_id, H5P_DEFAULT, buf_point) < 0) - FAIL_PUTS_ERROR_API("Failed to write points to dataset from all memory buffer"); + FAIL_PUTS_ERROR("Failed to write points to dataset from all memory buffer"); /* Update file state */ for (i = 0; i < DATASET_IO_POINT_NPOINTS; i++) @@ -4564,20 +4564,20 @@ test_dataset_io_point_selections(void) /* Read entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read entire dataset"); + FAIL_PUTS_ERROR("Failed to read entire dataset"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != file_state[i][j]) - FAIL_PUTS_ERROR_API("Incorrect data found after writing from all memory buffer to points"); + FAIL_PUTS_ERROR("Incorrect data found after writing from all memory buffer to points"); - PASSED_API(); + PASSED(); if (do_chunk) - TESTING_API("point selection I/O with points in memory and file (same shape) with chunking"); + TESTING("point selection I/O with points in memory and file (same shape) with chunking"); else - TESTING_API("point selection I/O with points in memory and file (same shape)"); + TESTING("point selection I/O with points in memory and file (same shape)"); /* Generate points to read */ DATASET_IO_POINT_GEN_POINTS(points, i, j); @@ -4596,13 +4596,13 @@ test_dataset_io_point_selections(void) /* Read data points->points */ if (H5Dread(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read points from dataset to points in memory buffer"); + FAIL_PUTS_ERROR("Failed to read points from dataset to points in memory buffer"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != erbuf[i][j]) - FAIL_PUTS_ERROR_API("Incorrect data found read from points in file to points in memory"); + FAIL_PUTS_ERROR("Incorrect data found read from points in file to points in memory"); /* Generate points to write */ DATASET_IO_POINT_GEN_POINTS(points, i, j); @@ -4618,7 +4618,7 @@ test_dataset_io_point_selections(void) /* Write data points->points */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, fspace_id, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to write from in memory to points in dataset"); + FAIL_PUTS_ERROR("Failed to write from in memory to points in dataset"); /* Update file_state */ for (i = 0; i < DATASET_IO_POINT_NPOINTS; i++) @@ -4629,21 +4629,21 @@ test_dataset_io_point_selections(void) /* Read entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read entire dataset"); + FAIL_PUTS_ERROR("Failed to read entire dataset"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != file_state[i][j]) - FAIL_PUTS_ERROR_API( + FAIL_PUTS_ERROR( "Incorrect data found after writing from points in memory to points in dataset"); - PASSED_API(); + PASSED(); if (do_chunk) - TESTING_API("point selection I/O with points in memory and file (different shape) with chunking"); + TESTING("point selection I/O with points in memory and file (different shape) with chunking"); else - TESTING_API("point selection I/O with points in memory and file (different shape)"); + TESTING("point selection I/O with points in memory and file (different shape)"); /* Generate points to read */ DATASET_IO_POINT_GEN_POINTS(points, i, j); @@ -4665,13 +4665,13 @@ test_dataset_io_point_selections(void) /* Read data points->points */ if (H5Dread(dset_id, H5T_NATIVE_INT, mspace_id_full, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read points from dataset to points in memory buffer"); + FAIL_PUTS_ERROR("Failed to read points from dataset to points in memory buffer"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != erbuf[i][j]) - FAIL_PUTS_ERROR_API( + FAIL_PUTS_ERROR( "Incorrect data found after reading from points in file to points in memory"); /* Generate points to write */ @@ -4691,7 +4691,7 @@ test_dataset_io_point_selections(void) /* Write data points->points */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, mspace_id_full, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to write from points in memory to points in dataset"); + FAIL_PUTS_ERROR("Failed to write from points in memory to points in dataset"); /* Update file_state */ for (i = 0; i < DATASET_IO_POINT_NPOINTS; i++) @@ -4702,21 +4702,21 @@ test_dataset_io_point_selections(void) /* Read entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read entire dataset"); + FAIL_PUTS_ERROR("Failed to read entire dataset"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != file_state[i][j]) - FAIL_PUTS_ERROR_API( + FAIL_PUTS_ERROR( "Incorrect data found after writing from points in memory to points in dataset"); - PASSED_API(); + PASSED(); if (do_chunk) - TESTING_API("point selection I/O with hyperslab in memory and points in file with chunking"); + TESTING("point selection I/O with hyperslab in memory and points in file with chunking"); else - TESTING_API("point selection I/O with hyperslab in memory and points in file"); + TESTING("point selection I/O with hyperslab in memory and points in file"); /* Generate points to read */ DATASET_IO_POINT_GEN_POINTS(points, i, j); @@ -4740,13 +4740,13 @@ test_dataset_io_point_selections(void) /* Read data points->hslab */ if (H5Dread(dset_id, H5T_NATIVE_INT, mspace_id_full, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read points from dataset to hyperslab in memory buffer"); + FAIL_PUTS_ERROR("Failed to read points from dataset to hyperslab in memory buffer"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != erbuf[i][j]) - FAIL_PUTS_ERROR_API( + FAIL_PUTS_ERROR( "Incorrect data found after reading from points in file to hyperslab in memory"); /* Generate points to write */ @@ -4763,7 +4763,7 @@ test_dataset_io_point_selections(void) /* Write data hlsab->points */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, mspace_id_full, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to write from hyperslab in memory to points in dataset"); + FAIL_PUTS_ERROR("Failed to write from hyperslab in memory to points in dataset"); /* Update file_state */ for (i = 0; i < DATASET_IO_POINT_NPOINTS; i++) @@ -4775,21 +4775,21 @@ test_dataset_io_point_selections(void) /* Read entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read entire dataset"); + FAIL_PUTS_ERROR("Failed to read entire dataset"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != file_state[i][j]) - FAIL_PUTS_ERROR_API( + FAIL_PUTS_ERROR( "Incorrect data found after writing from hyperslab in memory to points in dataset"); - PASSED_API(); + PASSED(); if (do_chunk) - TESTING_API("point selection I/O with points in memory and hyperslab in file with chunking"); + TESTING("point selection I/O with points in memory and hyperslab in file with chunking"); else - TESTING_API("point selection I/O with points in memory and hyperslab in file"); + TESTING("point selection I/O with points in memory and hyperslab in file"); /* Generate points to read */ DATASET_IO_POINT_GEN_POINTS(points, i, j); @@ -4814,13 +4814,13 @@ test_dataset_io_point_selections(void) /* Read data hslab->points */ if (H5Dread(dset_id, H5T_NATIVE_INT, mspace_id_full, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read hyperslab from dataset to points in memory buffer"); + FAIL_PUTS_ERROR("Failed to read hyperslab from dataset to points in memory buffer"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != erbuf[i][j]) - FAIL_PUTS_ERROR_API( + FAIL_PUTS_ERROR( "Incorrect data found after reading from hyperslab in file to points in memory"); /* Generate points to write */ @@ -4837,7 +4837,7 @@ test_dataset_io_point_selections(void) /* Write data points->hslab */ if (H5Dwrite(dset_id, H5T_NATIVE_INT, mspace_id_full, fspace_id, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to write from points in memory to hyperslab in dataset"); + FAIL_PUTS_ERROR("Failed to write from points in memory to hyperslab in dataset"); /* Update file_state */ for (i = 0; i < DATASET_IO_POINT_NPOINTS; i++) @@ -4849,17 +4849,17 @@ test_dataset_io_point_selections(void) /* Read entire dataset */ if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_all) < 0) - FAIL_PUTS_ERROR_API("Failed to read entire dataset"); + FAIL_PUTS_ERROR("Failed to read entire dataset"); /* Verify data */ for (i = 0; i < DATASET_IO_POINT_DIM_0; i++) for (j = 0; j < DATASET_IO_POINT_DIM_1; j++) if (buf_all[i][j] != file_state[i][j]) - FAIL_PUTS_ERROR_API( + FAIL_PUTS_ERROR( "Incorrect data found after writing from points in memory to hyperslab in dataset"); if (!do_chunk) - PASSED_API(); + PASSED(); /* Close dataset */ if (H5Dclose(dset_id) < 0) @@ -4886,7 +4886,7 @@ test_dataset_io_point_selections(void) if (H5Sclose(fspace_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -4928,28 +4928,28 @@ test_read_dataset_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -4960,7 +4960,7 @@ test_read_dataset_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, DATASET_READ_INVALID_PARAMS_TEST_DSET_NAME, DATASET_READ_INVALID_PARAMS_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_READ_INVALID_PARAMS_TEST_DSET_NAME); goto error; } @@ -4972,13 +4972,13 @@ test_read_dataset_invalid_params(void) if (NULL == (read_buf = malloc(data_size))) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dread_invalid_dset_id) { - TESTING_2_API("H5Dread with an invalid dataset ID"); + TESTING_2("H5Dread with an invalid dataset ID"); H5E_BEGIN_TRY { @@ -4988,18 +4988,18 @@ test_read_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read from dataset using H5Dread with an invalid dataset ID!\n"); - PART_ERROR_API(H5Dread_invalid_dset_id); + PART_ERROR(H5Dread_invalid_dset_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dread_invalid_dset_id); PART_BEGIN(H5Dread_invalid_datatype) { - TESTING_2_API("H5Dread with an invalid memory datatype"); + TESTING_2("H5Dread with an invalid memory datatype"); H5E_BEGIN_TRY { @@ -5008,18 +5008,18 @@ test_read_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read from dataset using H5Dread with an invalid memory datatype!\n"); - PART_ERROR_API(H5Dread_invalid_datatype); + PART_ERROR(H5Dread_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Dread_invalid_datatype); PART_BEGIN(H5Dread_invalid_mem_dataspace) { - TESTING_2_API("H5Dread with an invalid memory dataspace"); + TESTING_2("H5Dread with an invalid memory dataspace"); H5E_BEGIN_TRY { @@ -5029,18 +5029,18 @@ test_read_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read from dataset using H5Dread with an invalid memory dataspace!\n"); - PART_ERROR_API(H5Dread_invalid_mem_dataspace); + PART_ERROR(H5Dread_invalid_mem_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Dread_invalid_mem_dataspace); PART_BEGIN(H5Dread_invalid_file_dataspace) { - TESTING_2_API("H5Dread with an invalid file dataspace"); + TESTING_2("H5Dread with an invalid file dataspace"); H5E_BEGIN_TRY { @@ -5050,18 +5050,18 @@ test_read_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read from dataset using H5Dread with an invalid file dataspace!\n"); - PART_ERROR_API(H5Dread_invalid_file_dataspace); + PART_ERROR(H5Dread_invalid_file_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Dread_invalid_file_dataspace); PART_BEGIN(H5Dread_invalid_dxpl) { - TESTING_2_API("H5Dread with an invalid DXPL"); + TESTING_2("H5Dread with an invalid DXPL"); H5E_BEGIN_TRY { @@ -5071,18 +5071,18 @@ test_read_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read from dataset using H5Dread with an invalid DXPL!\n"); - PART_ERROR_API(H5Dread_invalid_dxpl); + PART_ERROR(H5Dread_invalid_dxpl); } - PASSED_API(); + PASSED(); } PART_END(H5Dread_invalid_dxpl); PART_BEGIN(H5Dread_invalid_data_buf) { - TESTING_2_API("H5Dread with an invalid data buffer"); + TESTING_2("H5Dread with an invalid data buffer"); H5E_BEGIN_TRY { @@ -5092,18 +5092,18 @@ test_read_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" read from dataset using H5Dread with an invalid data buffer!\n"); - PART_ERROR_API(H5Dread_invalid_data_buf); + PART_ERROR(H5Dread_invalid_data_buf); } - PASSED_API(); + PASSED(); } PART_END(H5Dread_invalid_data_buf); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (read_buf) { free(read_buf); @@ -5121,7 +5121,7 @@ test_read_dataset_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5157,31 +5157,31 @@ test_write_dataset_small_all(void) hid_t fspace_id = H5I_INVALID_HID; void *data = NULL; - TESTING_API("small write to dataset with H5S_ALL"); + TESTING("small write to dataset with H5S_ALL"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_GROUP_NAME); goto error; } @@ -5192,7 +5192,7 @@ test_write_dataset_small_all(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME, DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); goto error; } @@ -5204,19 +5204,19 @@ test_write_dataset_small_all(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); goto error; } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); goto error; } @@ -5228,7 +5228,7 @@ test_write_dataset_small_all(void) ((int *)data)[i] = (int)i; if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_ALL_DSET_NAME); goto error; } @@ -5249,7 +5249,7 @@ test_write_dataset_small_all(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5288,31 +5288,31 @@ test_write_dataset_small_hyperslab(void) hid_t mspace_id = H5I_INVALID_HID, fspace_id = H5I_INVALID_HID; void *data = NULL; - TESTING_API("small write to dataset with a hyperslab selection"); + TESTING("small write to dataset with a hyperslab selection"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_GROUP_NAME); goto error; @@ -5327,7 +5327,7 @@ test_write_dataset_small_hyperslab(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME, DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME); goto error; } @@ -5356,7 +5356,7 @@ test_write_dataset_small_hyperslab(void) if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_HYPERSLAB_DSET_NAME); goto error; } @@ -5379,7 +5379,7 @@ test_write_dataset_small_hyperslab(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5419,31 +5419,31 @@ test_write_dataset_small_point_selection(void) hid_t mspace_id = H5I_INVALID_HID; void *data = NULL; - TESTING_API("small write to dataset with a point selection"); + TESTING("small write to dataset with a point selection"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_GROUP_NAME); goto error; @@ -5458,7 +5458,7 @@ test_write_dataset_small_point_selection(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME); goto error; } @@ -5481,14 +5481,14 @@ test_write_dataset_small_point_selection(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_NUM_POINTS, points) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't select points\n"); goto error; } if (H5Dwrite(dset_id, DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_SMALL_WRITE_TEST_POINT_SELECTION_DSET_NAME); goto error; } @@ -5511,7 +5511,7 @@ test_write_dataset_small_point_selection(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5562,29 +5562,29 @@ test_write_dataset_data_verification(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, basic or more dataset aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME); goto error; } @@ -5595,7 +5595,7 @@ test_write_dataset_data_verification(void) if ((dset_id = H5Dcreate2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); goto error; } @@ -5610,19 +5610,19 @@ test_write_dataset_data_verification(void) for (i = 0; i < data_size / DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; i++) ((int *)data)[i] = (int)i; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dwrite_all_read) { - TESTING_2_API("H5Dwrite using H5S_ALL then H5Dread"); + TESTING_2("H5Dwrite using H5S_ALL then H5Dread"); if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (data) { @@ -5648,42 +5648,42 @@ test_write_dataset_data_verification(void) } if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (NULL == (data = malloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } for (i = 0; i < (hsize_t)space_npoints; i++) if (((int *)data)[i] != (int)i) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5S_ALL selection data verification failed\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (data) { @@ -5691,20 +5691,20 @@ test_write_dataset_data_verification(void) data = NULL; } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_all_read); PART_BEGIN(H5Dwrite_hyperslab_read) { - TESTING_2_API("H5Dwrite using hyperslab selection then H5Dread"); + TESTING_2("H5Dwrite using hyperslab selection then H5Dread"); data_size = dims[1] * 2 * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; if (NULL == (write_buf = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset write\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } for (i = 0; i < data_size / DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; i++) @@ -5715,16 +5715,16 @@ test_write_dataset_data_verification(void) data_size *= DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; if (NULL == (data = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset data verification\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } for (i = 0; i < 2; i++) { @@ -5743,26 +5743,26 @@ test_write_dataset_data_verification(void) block[0] = block[1] = block[2] = 1; if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't select hyperslab for dataset write\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } { hsize_t mdims[] = {(hsize_t)2 * dims[1]}; if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create memory dataspace\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } } if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (mspace_id >= 0) { @@ -5791,41 +5791,41 @@ test_write_dataset_data_verification(void) } if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (NULL == (read_buf = malloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (memcmp(data, read_buf, data_size)) { - H5_FAILED_API(); + H5_FAILED(); printf(" hyperslab selection data verification failed\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (data) { @@ -5843,21 +5843,21 @@ test_write_dataset_data_verification(void) read_buf = NULL; } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_hyperslab_read); PART_BEGIN(H5Dwrite_point_sel_read) { - TESTING_2_API("H5Dwrite using point selection then H5Dread"); + TESTING_2("H5Dwrite using point selection then H5Dread"); data_size = DATASET_DATA_VERIFY_WRITE_TEST_NUM_POINTS * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; if (NULL == (write_buf = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset write\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } for (i = 0; i < data_size / DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; i++) @@ -5868,16 +5868,16 @@ test_write_dataset_data_verification(void) data_size *= DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE; if (NULL == (data = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset data verification\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } for (i = 0; i < dims[0]; i++) { @@ -5903,26 +5903,26 @@ test_write_dataset_data_verification(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_DATA_VERIFY_WRITE_TEST_NUM_POINTS, points) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't select elements in dataspace\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } { hsize_t mdims[] = {(hsize_t)DATASET_DATA_VERIFY_WRITE_TEST_NUM_POINTS}; if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create memory dataspace\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } } if (H5Dwrite(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (mspace_id >= 0) { @@ -5951,50 +5951,50 @@ test_write_dataset_data_verification(void) } if ((dset_id = H5Dopen2(group_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (NULL == (read_buf = malloc((hsize_t)space_npoints * DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPESIZE))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_VERIFY_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (memcmp(data, read_buf, data_size)) { - H5_FAILED_API(); + H5_FAILED(); printf(" point selection data verification failed\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_point_sel_read); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (data) { free(data); @@ -6022,7 +6022,7 @@ test_write_dataset_data_verification(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6069,28 +6069,28 @@ test_write_dataset_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_WRITE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; @@ -6102,13 +6102,13 @@ test_write_dataset_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, DATASET_WRITE_INVALID_PARAMS_TEST_DSET_NAME, DATASET_SMALL_WRITE_TEST_ALL_DSET_DTYPE, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_WRITE_INVALID_PARAMS_TEST_DSET_NAME); goto error; } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); goto error; } @@ -6119,13 +6119,13 @@ test_write_dataset_invalid_params(void) for (i = 0; i < (hsize_t)space_npoints; i++) ((int *)data)[i] = (int)i; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dwrite_invalid_dset_id) { - TESTING_2_API("H5Dwrite with an invalid dataset ID"); + TESTING_2("H5Dwrite with an invalid dataset ID"); H5E_BEGIN_TRY { @@ -6135,18 +6135,18 @@ test_write_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to dataset using H5Dwrite with an invalid dataset ID!\n"); - PART_ERROR_API(H5Dwrite_invalid_dset_id); + PART_ERROR(H5Dwrite_invalid_dset_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_invalid_dset_id); PART_BEGIN(H5Dwrite_invalid_datatype) { - TESTING_2_API("H5Dwrite with an invalid memory datatype"); + TESTING_2("H5Dwrite with an invalid memory datatype"); H5E_BEGIN_TRY { @@ -6155,18 +6155,18 @@ test_write_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to dataset using H5Dwrite with an invalid memory datatype!\n"); - PART_ERROR_API(H5Dwrite_invalid_datatype); + PART_ERROR(H5Dwrite_invalid_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_invalid_datatype); PART_BEGIN(H5Dwrite_invalid_mem_dataspace) { - TESTING_2_API("H5Dwrite with an invalid memory dataspace"); + TESTING_2("H5Dwrite with an invalid memory dataspace"); H5E_BEGIN_TRY { @@ -6176,18 +6176,18 @@ test_write_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to dataset using H5Dwrite with an invalid memory dataspace!\n"); - PART_ERROR_API(H5Dwrite_invalid_mem_dataspace); + PART_ERROR(H5Dwrite_invalid_mem_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_invalid_mem_dataspace); PART_BEGIN(H5Dwrite_invalid_file_dataspace) { - TESTING_2_API("H5Dwrite with an invalid file dataspace"); + TESTING_2("H5Dwrite with an invalid file dataspace"); H5E_BEGIN_TRY { @@ -6197,18 +6197,18 @@ test_write_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to dataset using H5Dwrite with an invalid file dataspace!\n"); - PART_ERROR_API(H5Dwrite_invalid_file_dataspace); + PART_ERROR(H5Dwrite_invalid_file_dataspace); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_invalid_file_dataspace); PART_BEGIN(H5Dwrite_invalid_dxpl) { - TESTING_2_API("H5Dwrite with an invalid DXPL"); + TESTING_2("H5Dwrite with an invalid DXPL"); H5E_BEGIN_TRY { @@ -6218,18 +6218,18 @@ test_write_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to dataset using H5Dwrite with an invalid DXPL!\n"); - PART_ERROR_API(H5Dwrite_invalid_dxpl); + PART_ERROR(H5Dwrite_invalid_dxpl); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_invalid_dxpl); PART_BEGIN(H5Dwrite_invalid_data_buf) { - TESTING_2_API("H5Dwrite with an invalid data buffer"); + TESTING_2("H5Dwrite with an invalid data buffer"); H5E_BEGIN_TRY { @@ -6239,18 +6239,18 @@ test_write_dataset_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrote to dataset using H5Dwrite with an invalid data buffer!\n"); - PART_ERROR_API(H5Dwrite_invalid_data_buf); + PART_ERROR(H5Dwrite_invalid_data_buf); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_invalid_data_buf); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (data) { free(data); @@ -6268,7 +6268,7 @@ test_write_dataset_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6321,16 +6321,16 @@ test_dataset_builtin_type_conversion(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, basic or more dataset aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((native_order = H5Tget_order(DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get native byte order\n"); goto error; } @@ -6340,20 +6340,20 @@ test_dataset_builtin_type_conversion(void) file_type_id = H5T_STD_I32LE; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_DATA_BUILTIN_CONVERSION_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_DATA_VERIFY_WRITE_TEST_GROUP_NAME); goto error; } @@ -6363,7 +6363,7 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dcreate2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, file_type_id, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); goto error; } @@ -6378,20 +6378,20 @@ test_dataset_builtin_type_conversion(void) for (i = 0; i < data_size / DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; i++) ((int *)data)[i] = (int)i; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dwrite_all_read) { - TESTING_2_API("H5Dwrite then H5Dread with H5S_ALL selection"); + TESTING_2("H5Dwrite then H5Dread with H5S_ALL selection"); if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (data) { @@ -6418,43 +6418,43 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (NULL == (data = malloc((hsize_t)space_npoints * DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } for (i = 0; i < (hsize_t)space_npoints; i++) if (((int *)data)[i] != (int)i) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5S_ALL selection data verification failed\n"); - PART_ERROR_API(H5Dwrite_all_read); + PART_ERROR(H5Dwrite_all_read); } if (data) { @@ -6462,20 +6462,20 @@ test_dataset_builtin_type_conversion(void) data = NULL; } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_all_read); PART_BEGIN(H5Dwrite_hyperslab_read) { - TESTING_2_API("H5Dwrite using hyperslab selection then H5Dread"); + TESTING_2("H5Dwrite using hyperslab selection then H5Dread"); data_size = dims[1] * 2 * DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; if (NULL == (write_buf = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset write\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } for (i = 0; i < data_size / DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; i++) @@ -6486,17 +6486,17 @@ test_dataset_builtin_type_conversion(void) data_size *= DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; if (NULL == (data = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset data verification\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } for (i = 0; i < 2; i++) { @@ -6515,27 +6515,27 @@ test_dataset_builtin_type_conversion(void) block[0] = block[1] = block[2] = 1; if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, stride, count, block) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't select hyperslab for dataset write\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } { hsize_t mdims[] = {(hsize_t)2 * dims[1]}; if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create memory dataspace\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } } if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (mspace_id >= 0) { @@ -6565,42 +6565,42 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (NULL == (read_buf = malloc((hsize_t)space_npoints * DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (memcmp(data, read_buf, data_size)) { - H5_FAILED_API(); + H5_FAILED(); printf(" hyperslab selection data verification failed\n"); - PART_ERROR_API(H5Dwrite_hyperslab_read); + PART_ERROR(H5Dwrite_hyperslab_read); } if (data) { @@ -6618,21 +6618,21 @@ test_dataset_builtin_type_conversion(void) read_buf = NULL; } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_hyperslab_read); PART_BEGIN(H5Dwrite_point_sel_read) { - TESTING_2_API("H5Dwrite using point selection then H5Dread"); + TESTING_2("H5Dwrite using point selection then H5Dread"); data_size = DATASET_DATA_BUILTIN_CONVERSION_TEST_NUM_POINTS * DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; if (NULL == (write_buf = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset write\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } for (i = 0; i < data_size / DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; i++) @@ -6643,17 +6643,17 @@ test_dataset_builtin_type_conversion(void) data_size *= DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE; if (NULL == (data = malloc(data_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset data verification\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, data) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } for (i = 0; i < dims[0]; i++) { @@ -6679,27 +6679,27 @@ test_dataset_builtin_type_conversion(void) if (H5Sselect_elements(fspace_id, H5S_SELECT_SET, DATASET_DATA_BUILTIN_CONVERSION_TEST_NUM_POINTS, points) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't select elements in dataspace\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } { hsize_t mdims[] = {(hsize_t)DATASET_DATA_BUILTIN_CONVERSION_TEST_NUM_POINTS}; if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create memory dataspace\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } } if (H5Dwrite(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (mspace_id >= 0) { @@ -6729,51 +6729,51 @@ test_dataset_builtin_type_conversion(void) if ((dset_id = H5Dopen2(group_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (NULL == (read_buf = malloc((hsize_t)space_npoints * DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPESIZE))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (H5Dread(dset_id, DATASET_DATA_BUILTIN_CONVERSION_TEST_MEM_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_DATA_BUILTIN_CONVERSION_TEST_DSET_NAME); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } if (memcmp(data, read_buf, data_size)) { - H5_FAILED_API(); + H5_FAILED(); printf(" point selection data verification failed\n"); - PART_ERROR_API(H5Dwrite_point_sel_read); + PART_ERROR(H5Dwrite_point_sel_read); } - PASSED_API(); + PASSED(); } PART_END(H5Dwrite_point_sel_read); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (data) { free(data); @@ -6801,7 +6801,7 @@ test_dataset_builtin_type_conversion(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6858,28 +6858,28 @@ test_dataset_compound_partial_io(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_GROUP_NAME); goto error; @@ -6907,18 +6907,18 @@ test_dataset_compound_partial_io(void) if ((dset_id = H5Dcreate2(group_id, DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME, full_type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_DATA_COMPOUND_PARTIAL_IO_TEST_DSET_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(write_full_read_full) { - TESTING_2_API("H5Dwrite then H5Dread with all compound members"); + TESTING_2("H5Dwrite then H5Dread with all compound members"); /* Initialize wbuf */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { @@ -6928,7 +6928,7 @@ test_dataset_compound_partial_io(void) /* Write data */ if (H5Dwrite(dset_id, full_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) - PART_TEST_ERROR_API(write_full_read_full); + PART_TEST_ERROR(write_full_read_full); /* Update fbuf to match file state */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { @@ -6951,23 +6951,23 @@ test_dataset_compound_partial_io(void) /* Read data */ if (H5Dread(dset_id, full_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) - PART_TEST_ERROR_API(write_full_read_full); + PART_TEST_ERROR(write_full_read_full); /* Verify data */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { if (rbuf[i].a != erbuf[i].a) - PART_TEST_ERROR_API(write_full_read_full); + PART_TEST_ERROR(write_full_read_full); if (rbuf[i].b != erbuf[i].b) - PART_TEST_ERROR_API(write_full_read_full); + PART_TEST_ERROR(write_full_read_full); } - PASSED_API(); + PASSED(); } PART_END(write_full_read_full); PART_BEGIN(read_a) { - TESTING_2_API("H5Dread with compound member a"); + TESTING_2("H5Dread with compound member a"); /* Initialize rbuf to -1 */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { @@ -6984,23 +6984,23 @@ test_dataset_compound_partial_io(void) /* Read data */ if (H5Dread(dset_id, a_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) - PART_TEST_ERROR_API(read_a); + PART_TEST_ERROR(read_a); /* Verify data */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { if (rbuf[i].a != erbuf[i].a) - PART_TEST_ERROR_API(read_a); + PART_TEST_ERROR(read_a); if (rbuf[i].b != erbuf[i].b) - PART_TEST_ERROR_API(read_a); + PART_TEST_ERROR(read_a); } - PASSED_API(); + PASSED(); } PART_END(read_a); PART_BEGIN(write_b_read_full) { - TESTING_2_API("H5Dwrite with compound member b then H5Dread with all compound members"); + TESTING_2("H5Dwrite with compound member b then H5Dread with all compound members"); /* Initialize wbuf */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { @@ -7010,7 +7010,7 @@ test_dataset_compound_partial_io(void) /* Write data */ if (H5Dwrite(dset_id, b_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, wbuf) < 0) - PART_TEST_ERROR_API(write_full_read_full); + PART_TEST_ERROR(write_full_read_full); /* Update fbuf to match file state - only element b was updated */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { @@ -7032,23 +7032,23 @@ test_dataset_compound_partial_io(void) /* Read data */ if (H5Dread(dset_id, full_type_id, H5S_ALL, H5S_ALL, H5P_DEFAULT, rbuf) < 0) - PART_TEST_ERROR_API(write_b_read_full); + PART_TEST_ERROR(write_b_read_full); /* Verify data */ for (i = 0; i < DATASET_COMPOUND_PARTIAL_IO_DSET_DIMS; i++) { if (rbuf[i].a != erbuf[i].a) - PART_TEST_ERROR_API(write_b_read_full); + PART_TEST_ERROR(write_b_read_full); if (rbuf[i].b != erbuf[i].b) - PART_TEST_ERROR_API(write_b_read_full); + PART_TEST_ERROR(write_b_read_full); } - PASSED_API(); + PASSED(); } PART_END(write_b_read_full); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -7067,7 +7067,7 @@ test_dataset_compound_partial_io(void) if (H5Tclose(b_type_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7109,32 +7109,32 @@ test_dataset_set_extent_chunked_unlimited(void) hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("H5Dset_extent on chunked dataset with unlimited dimensions"); + TESTING("H5Dset_extent on chunked dataset with unlimited dimensions"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, basic or more dataset aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_GROUP_NAME); goto error; @@ -7156,14 +7156,14 @@ test_dataset_set_extent_chunked_unlimited(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to set dataset chunk dimensionality\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME); goto error; } @@ -7179,7 +7179,7 @@ test_dataset_set_extent_chunked_unlimited(void) } if (H5Dset_extent(dset_id, new_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set dataset extent\n"); goto error; } @@ -7191,13 +7191,13 @@ test_dataset_set_extent_chunked_unlimited(void) TEST_ERROR; if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7207,7 +7207,7 @@ test_dataset_set_extent_chunked_unlimited(void) */ for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK; j++) { if (dims[j] == new_dims[j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } @@ -7235,7 +7235,7 @@ test_dataset_set_extent_chunked_unlimited(void) } if (H5Dset_extent(dset_id, new_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set dataset extent\n"); goto error; } @@ -7250,19 +7250,19 @@ test_dataset_set_extent_chunked_unlimited(void) if ((dset_id = H5Dopen2(group_id, DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7272,7 +7272,7 @@ test_dataset_set_extent_chunked_unlimited(void) */ for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_UNLIMITED_TEST_SPACE_RANK; j++) { if (dims[j] == new_dims[j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } @@ -7300,7 +7300,7 @@ test_dataset_set_extent_chunked_unlimited(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7341,32 +7341,32 @@ test_dataset_set_extent_chunked_fixed(void) hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID, fspace_id2 = H5I_INVALID_HID; - TESTING_API("H5Dset_extent on chunked dataset with fixed dimensions"); + TESTING("H5Dset_extent on chunked dataset with fixed dimensions"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, basic or more dataset aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_GROUP_NAME); goto error; @@ -7392,7 +7392,7 @@ test_dataset_set_extent_chunked_fixed(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to set dataset chunk dimensionality\n"); goto error; } @@ -7404,14 +7404,14 @@ test_dataset_set_extent_chunked_fixed(void) */ if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME); goto error; } if ((dset_id2 = H5Dcreate2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2, dset_dtype, fspace_id2, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2); goto error; } @@ -7440,7 +7440,7 @@ test_dataset_set_extent_chunked_fixed(void) break; if (H5Dset_extent(dset_id, new_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set dataset extent\n"); goto error; } @@ -7452,13 +7452,13 @@ test_dataset_set_extent_chunked_fixed(void) TEST_ERROR; if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id, new_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7468,7 +7468,7 @@ test_dataset_set_extent_chunked_fixed(void) */ for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) { if (dims[j] == new_dims[j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } @@ -7509,7 +7509,7 @@ test_dataset_set_extent_chunked_fixed(void) break; if (H5Dset_extent(dset_id2, new_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set dataset extent2\n"); goto error; } @@ -7524,19 +7524,19 @@ test_dataset_set_extent_chunked_fixed(void) if ((dset_id2 = H5Dopen2(group_id, DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_DSET_NAME2); goto error; } if ((fspace_id2 = H5Dget_space(dset_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset's dataspace\n"); goto error; } if (H5Sget_simple_extent_dims(fspace_id2, new_dims, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataset dimensionality\n"); goto error; } @@ -7546,7 +7546,7 @@ test_dataset_set_extent_chunked_fixed(void) */ for (j = 0; j < DATASET_SET_EXTENT_CHUNKED_FIXED_TEST_SPACE_RANK; j++) { if (dims2[j] == new_dims[j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset dimension %llu wasn't changed!\n", (unsigned long long)j); goto error; } @@ -7578,7 +7578,7 @@ test_dataset_set_extent_chunked_fixed(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7635,29 +7635,29 @@ test_dataset_set_extent_data(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, basic or more dataset aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME); goto error; } @@ -7669,14 +7669,14 @@ test_dataset_set_extent_data(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_DATA_TEST_SPACE_RANK, dims_chunk) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to set dataset chunk dimensionality\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_DATA_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DATA_TEST_DSET_NAME); goto error; } @@ -7698,13 +7698,13 @@ test_dataset_set_extent_data(void) if (H5Dwrite(dset_id, H5T_NATIVE_INT, fspace_id, H5S_ALL, H5P_DEFAULT, buf_origin) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dset_extent_data_expand) { - TESTING_2_API("H5Dset_extent for data expansion"); + TESTING_2("H5Dset_extent for data expansion"); /* Expand the dataset. The extended space should be initialized with the * the default value (0) @@ -7725,39 +7725,39 @@ test_dataset_set_extent_data(void) * 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 */ if (H5Dset_extent(dset_id, dims_expand) < 0) - PART_ERROR_API(H5Dset_extent_data_expand); + PART_ERROR(H5Dset_extent_data_expand); if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_expand) < 0) - PART_ERROR_API(H5Dset_extent_data_expand); + PART_ERROR(H5Dset_extent_data_expand); /* compare the expanded data */ for (i = 0; i < (int)dims_expand[0]; i++) { for (j = 0; j < (int)dims_expand[1]; j++) { if (i >= (int)dims_origin[0] || j >= (int)dims_origin[1]) { if (buf_expand[i][j] != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" buf_expand[%d][%d] = %d. It should be 0\n", i, j, buf_expand[i][j]); - PART_ERROR_API(H5Dset_extent_data_expand); + PART_ERROR(H5Dset_extent_data_expand); } } else { if (buf_expand[i][j] != buf_origin[i][j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" buf_expand[%d][%d] = %d. It should be %d\n", i, j, buf_expand[i][j], buf_origin[i][j]); - PART_ERROR_API(H5Dset_extent_data_expand); + PART_ERROR(H5Dset_extent_data_expand); } } } } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_data_expand); PART_BEGIN(H5Dset_extent_data_shrink) { - TESTING_2_API("H5Dset_extent for data shrinking"); + TESTING_2("H5Dset_extent for data shrinking"); /* Shrink the dataset. * X X X X X @@ -7767,30 +7767,30 @@ test_dataset_set_extent_data(void) * X X X X X */ if (H5Dset_extent(dset_id, dims_shrink) < 0) - PART_ERROR_API(H5Dset_extent_data_shrink); + PART_ERROR(H5Dset_extent_data_shrink); if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_shrink) < 0) - PART_ERROR_API(H5Dset_extent_data_shrink); + PART_ERROR(H5Dset_extent_data_shrink); /* compare the shrunk data */ for (i = 0; i < (int)dims_shrink[0]; i++) { for (j = 0; j < (int)dims_shrink[1]; j++) { if (buf_shrink[i][j] != buf_origin[i][j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" buf_shrink[%d][%d] = %d. It should be %d\n", i, j, buf_shrink[i][j], buf_origin[i][j]); - PART_ERROR_API(H5Dset_extent_data_shrink); + PART_ERROR(H5Dset_extent_data_shrink); } } } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_data_shrink); PART_BEGIN(H5Dset_extent_data_expand_to_origin) { - TESTING_2_API("H5Dset_extent for data back to the original size"); + TESTING_2("H5Dset_extent for data back to the original size"); /* Expand the dataset back to the original size. The data should look like this: * X X X X X 0 0 0 @@ -7803,73 +7803,73 @@ test_dataset_set_extent_data(void) * 0 0 0 0 0 0 0 0 */ if (H5Dset_extent(dset_id, dims_origin) < 0) - PART_ERROR_API(H5Dset_extent_data_expand_to_origin); + PART_ERROR(H5Dset_extent_data_expand_to_origin); if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_expand2) < 0) - PART_ERROR_API(H5Dset_extent_data_expand_to_origin); + PART_ERROR(H5Dset_extent_data_expand_to_origin); /* compare the expanded data */ for (i = 0; i < (int)dims_origin[0]; i++) { for (j = 0; j < (int)dims_origin[1]; j++) { if (i >= (int)dims_shrink[0] || j >= (int)dims_shrink[1]) { if (buf_expand2[i][j] != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" buf_expand2[%d][%d] = %d. It should be 0\n", i, j, buf_expand2[i][j]); - PART_ERROR_API(H5Dset_extent_data_expand_to_origin); + PART_ERROR(H5Dset_extent_data_expand_to_origin); } } else { if (buf_expand2[i][j] != buf_origin[i][j]) { - H5_FAILED_API(); + H5_FAILED(); printf(" buf_expand2[%d][%d] = %d. It should be %d.\n", i, j, buf_expand2[i][j], buf_origin[i][j]); - PART_ERROR_API(H5Dset_extent_data_expand_to_origin); + PART_ERROR(H5Dset_extent_data_expand_to_origin); } } } } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_data_expand_to_origin); PART_BEGIN(H5Dset_extent_data_shrink_to_zero) { - TESTING_2_API("H5Dset_extent for data shrink to zero size"); + TESTING_2("H5Dset_extent for data shrink to zero size"); /* Shrink the dimensions to 0 and verify it */ dims_shrink[0] = dims_shrink[1] = 0; if (H5Dset_extent(dset_id, dims_shrink) < 0) - PART_ERROR_API(H5Dset_extent_data_shrink_to_zero); + PART_ERROR(H5Dset_extent_data_shrink_to_zero); /* get the space */ if ((dset_space_id = H5Dget_space(dset_id)) < 0) - PART_ERROR_API(H5Dset_extent_data_shrink_to_zero); + PART_ERROR(H5Dset_extent_data_shrink_to_zero); /* get dimensions */ if (H5Sget_simple_extent_dims(dset_space_id, dims_out, NULL) < 0) - PART_ERROR_API(H5Dset_extent_data_shrink_to_zero); + PART_ERROR(H5Dset_extent_data_shrink_to_zero); if (H5Sclose(dset_space_id) < 0) - PART_ERROR_API(H5Dset_extent_data_shrink_to_zero); + PART_ERROR(H5Dset_extent_data_shrink_to_zero); /* Verify the dimensions are 0 */ for (i = 0; i < DATASET_SET_EXTENT_DATA_TEST_SPACE_RANK; i++) if (dims_out[i] != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" dims_out[%d] = %llu. It should be 0.\n", i, (long long unsigned int)dims_out[i]); - PART_ERROR_API(H5Dset_extent_data_shrink_to_zero); + PART_ERROR(H5Dset_extent_data_shrink_to_zero); } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_data_shrink_to_zero); PART_BEGIN(H5Dset_extent_data_expand_to_origin_again) { - TESTING_2_API("H5Dset_extent for data expansion back to the original again"); + TESTING_2("H5Dset_extent for data expansion back to the original again"); /* Expand the dataset back to the original size. The data should look like this: * 0 0 0 0 0 0 0 0 @@ -7882,29 +7882,29 @@ test_dataset_set_extent_data(void) * 0 0 0 0 0 0 0 0 */ if (H5Dset_extent(dset_id, dims_origin) < 0) - PART_ERROR_API(H5Dset_extent_data_expand_to_origin_again); + PART_ERROR(H5Dset_extent_data_expand_to_origin_again); if (H5Dread(dset_id, H5T_NATIVE_INT, H5S_ALL, H5S_ALL, H5P_DEFAULT, buf_expand2) < 0) - PART_ERROR_API(H5Dset_extent_data_expand_to_origin_again); + PART_ERROR(H5Dset_extent_data_expand_to_origin_again); /* The data should be all zeros */ for (i = 0; i < (int)dims_origin[0]; i++) { for (j = 0; j < (int)dims_origin[1]; j++) { if (buf_expand2[i][j] != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" buf_expand2[%d][%d] = %d. It should be 0.\n", i, j, buf_expand2[i][j]); - PART_ERROR_API(H5Dset_extent_data_expand_to_origin_again); + PART_ERROR(H5Dset_extent_data_expand_to_origin_again); } } } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_data_expand_to_origin_again); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(dcpl_id) < 0) TEST_ERROR; @@ -7919,7 +7919,7 @@ test_dataset_set_extent_data(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7964,32 +7964,32 @@ test_dataset_set_extent_double_handles(void) hid_t fspace_id = H5I_INVALID_HID, dset_space_id = H5I_INVALID_HID; int i; - TESTING_API("H5Dset_extent on double dataset handles"); + TESTING("H5Dset_extent on double dataset handles"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, basic or more dataset aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_DATA_TEST_GROUP_NAME); goto error; } @@ -8002,7 +8002,7 @@ test_dataset_set_extent_double_handles(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_RANK, dims_chunk) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to set dataset chunk dimensionality\n"); goto error; } @@ -8010,14 +8010,14 @@ test_dataset_set_extent_double_handles(void) /* Create the dataset */ if ((dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME, H5T_NATIVE_INT, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME); goto error; } /* Open the same dataset again */ if ((dset_id2 = H5Dopen2(group_id, DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_DSET_NAME); goto error; } @@ -8039,7 +8039,7 @@ test_dataset_set_extent_double_handles(void) for (i = 0; i < DATASET_SET_EXTENT_DOUBLE_HANDLES_TEST_SPACE_RANK; i++) if (dims_out[i] != dims_expand[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" dims_out[%d] = %" PRIuHSIZE ". It should be %" PRIuHSIZE ".\n", i, dims_out[i], dims_expand[i]); goto error; @@ -8060,7 +8060,7 @@ test_dataset_set_extent_double_handles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -8109,42 +8109,42 @@ test_dataset_set_extent_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, basic or more dataset aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } /** for DAOS VOL, this test is problematic since auto chunking can be selected, so skip for now */ if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get VOL connector name\n"); goto error; } if (strcmp(vol_name, "daos") == 0) { if (H5Fclose(file_id) < 0) TEST_ERROR; - SKIPPED_API(); + SKIPPED(); return 0; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SET_EXTENT_INVALID_PARAMS_TEST_GROUP_NAME); goto error; @@ -8181,7 +8181,7 @@ test_dataset_set_extent_invalid_params(void) if ((compact_dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME, H5T_NATIVE_INT, compact_fspace_id, H5P_DEFAULT, compact_dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_COMPACT_DSET_NAME); goto error; @@ -8197,7 +8197,7 @@ test_dataset_set_extent_invalid_params(void) if ((contiguous_dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, contiguous_dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_INVALID_LAYOUT_TEST_CONTIGUOUS_DSET_NAME); goto error; @@ -8208,25 +8208,25 @@ test_dataset_set_extent_invalid_params(void) TEST_ERROR; if (H5Pset_chunk(chunked_dcpl_id, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to set dataset chunk dimensionality\n"); goto error; } if ((chunked_dset_id = H5Dcreate2(group_id, DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, chunked_dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SET_EXTENT_INVALID_PARAMS_TEST_DSET_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dset_extent_invalid_layout_compact) { - TESTING_2_API("H5Dset_extent with an invalid dataset layout (compact)"); + TESTING_2("H5Dset_extent with an invalid dataset layout (compact)"); H5E_BEGIN_TRY { @@ -8235,18 +8235,18 @@ test_dataset_set_extent_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" setting dataset extent succeeded with an invalid layout (compact)\n"); - PART_ERROR_API(H5Dset_extent_invalid_layout_compact); + PART_ERROR(H5Dset_extent_invalid_layout_compact); } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_invalid_layout_compact); PART_BEGIN(H5Dset_extent_invalid_layout_contiguous) { - TESTING_2_API("H5Dset_extent with an invalid dataset layout (contiguous)"); + TESTING_2("H5Dset_extent with an invalid dataset layout (contiguous)"); H5E_BEGIN_TRY { @@ -8255,18 +8255,18 @@ test_dataset_set_extent_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" setting dataset extent succeeded with an invalid layout (contiguous)\n"); - PART_ERROR_API(H5Dset_extent_invalid_layout_contiguous); + PART_ERROR(H5Dset_extent_invalid_layout_contiguous); } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_invalid_layout_contiguous); PART_BEGIN(H5Dset_extent_invalid_dset_id) { - TESTING_2_API("H5Dset_extent with an invalid dataset ID"); + TESTING_2("H5Dset_extent with an invalid dataset ID"); H5E_BEGIN_TRY { @@ -8275,18 +8275,18 @@ test_dataset_set_extent_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" setting dataset extent succeeded with an invalid dataset ID\n"); - PART_ERROR_API(H5Dset_extent_invalid_dset_id); + PART_ERROR(H5Dset_extent_invalid_dset_id); } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_invalid_dset_id); PART_BEGIN(H5Dset_extent_null_dim_pointer) { - TESTING_2_API("H5Dset_extent with NULL dimension pointer"); + TESTING_2("H5Dset_extent with NULL dimension pointer"); H5E_BEGIN_TRY { @@ -8295,18 +8295,18 @@ test_dataset_set_extent_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" setting dataset extent succeeded with a NULL dimension pointer\n"); - PART_ERROR_API(H5Dset_extent_null_dim_pointer); + PART_ERROR(H5Dset_extent_null_dim_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Dset_extent_null_dim_pointer); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(chunked_dcpl_id) < 0) TEST_ERROR; @@ -8333,7 +8333,7 @@ test_dataset_set_extent_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -8364,9 +8364,9 @@ test_dataset_set_extent_invalid_params(void) static int test_flush_dataset(void) { - TESTING_API("H5Dflush"); + TESTING("H5Dflush"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -8378,9 +8378,9 @@ test_flush_dataset(void) static int test_flush_dataset_invalid_params(void) { - TESTING_API("H5Dflush with invalid parameters"); + TESTING("H5Dflush with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -8391,9 +8391,9 @@ test_flush_dataset_invalid_params(void) static int test_refresh_dataset(void) { - TESTING_API("H5Drefresh"); + TESTING("H5Drefresh"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -8405,9 +8405,9 @@ test_refresh_dataset(void) static int test_refresh_dataset_invalid_params(void) { - TESTING_API("H5Drefresh"); + TESTING("H5Drefresh"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -8428,32 +8428,32 @@ test_create_single_chunk_dataset(void) hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("creation of dataset with single chunk"); + TESTING("creation of dataset with single chunk"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SINGLE_CHUNK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_TEST_GROUP_NAME); goto error; } @@ -8467,14 +8467,14 @@ test_create_single_chunk_dataset(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_SINGLE_CHUNK_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_TEST_DSET_NAME); goto error; } @@ -8483,27 +8483,27 @@ test_create_single_chunk_dataset(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_SINGLE_CHUNK_TEST_SPACE_RANK; i++) { if (dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -8515,39 +8515,39 @@ test_create_single_chunk_dataset(void) * of the DCPL after re-opening it. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close dataset\n"); goto error; } if ((dset_id = H5Dopen2(group_id, DATASET_SINGLE_CHUNK_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open dataset\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_SINGLE_CHUNK_TEST_SPACE_RANK; i++) { if (dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -8569,7 +8569,7 @@ test_create_single_chunk_dataset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -8608,33 +8608,33 @@ test_write_single_chunk_dataset(void) void *write_buf = NULL; void *read_buf = NULL; - TESTING_API("write to dataset with single chunk"); + TESTING("write to dataset with single chunk"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_GROUP_NAME); goto error; } @@ -8647,7 +8647,7 @@ test_write_single_chunk_dataset(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK, dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } @@ -8655,7 +8655,7 @@ test_write_single_chunk_dataset(void) if ((dset_id = H5Dcreate2(group_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } @@ -8664,27 +8664,27 @@ test_write_single_chunk_dataset(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_SPACE_RANK; i++) { if (dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -8703,7 +8703,7 @@ test_write_single_chunk_dataset(void) if (H5Dwrite(dset_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } @@ -8731,40 +8731,40 @@ test_write_single_chunk_dataset(void) } if ((dset_id = H5Dopen2(group_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); goto error; } if ((space_npoints = H5Sget_simple_extent_npoints(fspace_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataspace num points\n"); goto error; } if (NULL == (read_buf = malloc((hsize_t)space_npoints * DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPESIZE))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); goto error; } if (H5Dread(dset_id, DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_SINGLE_CHUNK_WRITE_TEST_DSET_NAME); goto error; } for (i = 0; i < (hsize_t)space_npoints; i++) if (((int *)read_buf)[i] != (int)i) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed\n"); goto error; } @@ -8787,7 +8787,7 @@ test_write_single_chunk_dataset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -8827,32 +8827,32 @@ test_create_multi_chunk_dataset(void) hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("creation of dataset with multiple chunks"); + TESTING("creation of dataset with multiple chunks"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_TEST_GROUP_NAME); goto error; } @@ -8866,14 +8866,14 @@ test_create_multi_chunk_dataset(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } if ((dset_id = H5Dcreate2(group_id, DATASET_MULTI_CHUNK_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_TEST_DSET_NAME); goto error; } @@ -8882,27 +8882,27 @@ test_create_multi_chunk_dataset(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_TEST_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -8914,39 +8914,39 @@ test_create_multi_chunk_dataset(void) * of the DCPL after re-opening it. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close dataset\n"); goto error; } if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open dataset\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_TEST_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_TEST_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -8968,7 +8968,7 @@ test_create_multi_chunk_dataset(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -9012,33 +9012,33 @@ test_write_multi_chunk_dataset_same_shape_read(void) void *write_buf = NULL; int read_buf[10][10]; - TESTING_API("write to dataset with multiple chunks using same shaped dataspaces"); + TESTING("write to dataset with multiple chunks using same shaped dataspaces"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_GROUP_NAME); goto error; @@ -9053,7 +9053,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } @@ -9061,7 +9061,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) if ((dset_id = H5Dcreate2(group_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9071,13 +9071,13 @@ test_write_multi_chunk_dataset_same_shape_read(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -9085,14 +9085,14 @@ test_write_multi_chunk_dataset_same_shape_read(void) memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -9169,7 +9169,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) */ if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9199,13 +9199,13 @@ test_write_multi_chunk_dataset_same_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); goto error; } @@ -9217,7 +9217,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) hsize_t mdims[] = {chunk_dims[0], chunk_dims[1]}; if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create memory dataspace\n"); goto error; } @@ -9248,7 +9248,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) * Adjust file dataspace selection for next chunk. */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set hyperslab selection\n"); goto error; } @@ -9259,7 +9259,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9268,7 +9268,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) for (j = 0; j < chunk_dims[0]; j++) { for (k = 0; k < chunk_dims[1]; k++) { if (read_buf[j][k] != (int)((j * chunk_dims[0]) + k + i)) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } @@ -9291,7 +9291,7 @@ test_write_multi_chunk_dataset_same_shape_read(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -9337,32 +9337,32 @@ test_write_multi_chunk_dataset_diff_shape_read(void) void *write_buf = NULL; void *read_buf = NULL; - TESTING_API("write to dataset with multiple chunks using differently shaped dataspaces"); + TESTING("write to dataset with multiple chunks using differently shaped dataspaces"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_GROUP_NAME); goto error; @@ -9377,7 +9377,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } @@ -9385,7 +9385,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if ((dset_id = H5Dcreate2(group_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9395,13 +9395,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -9409,14 +9409,14 @@ test_write_multi_chunk_dataset_diff_shape_read(void) memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -9493,7 +9493,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) */ if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9523,13 +9523,13 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); goto error; } @@ -9538,7 +9538,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) * Allocate single chunk-sized read buffer. */ if (NULL == (read_buf = malloc(chunk_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); goto error; } @@ -9550,7 +9550,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) hsize_t mdims[] = {chunk_size / DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPESIZE}; if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create memory dataspace\n"); goto error; } @@ -9581,7 +9581,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) * Adjust file dataspace selection for next chunk. */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set hyperslab selection\n"); goto error; } @@ -9589,7 +9589,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) memset(read_buf, 0, chunk_size); if (H5Dread(dset_id, DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9598,7 +9598,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) for (j = 0; j < (hsize_t)chunk_size / DATASET_MULTI_CHUNK_WRITE_DIFF_SPACE_READ_TEST_DSET_DTYPESIZE; j++) if (((int *)read_buf)[j] != (int)(j + i)) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } @@ -9624,7 +9624,7 @@ test_write_multi_chunk_dataset_diff_shape_read(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -9673,32 +9673,32 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) void *write_buf = NULL; int read_buf[10][10]; - TESTING_API("several overwrites to dataset with multiple chunks using same shaped dataspaces"); + TESTING("several overwrites to dataset with multiple chunks using same shaped dataspaces"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_GROUP_NAME); goto error; @@ -9713,7 +9713,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } @@ -9721,7 +9721,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if ((dset_id = H5Dcreate2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9731,13 +9731,13 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -9745,14 +9745,14 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -9777,7 +9777,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) hsize_t mdims[] = {chunk_dims[0], chunk_dims[1]}; if ((mspace_id = H5Screate_simple(2, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create memory dataspace\n"); goto error; } @@ -9853,7 +9853,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) */ if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9878,14 +9878,14 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); goto error; } @@ -9911,7 +9911,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) * Adjust file dataspace selection for next chunk. */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set hyperslab selection\n"); goto error; } @@ -9922,7 +9922,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_SAME_SPACE_READ_TEST_DSET_NAME); goto error; @@ -9931,7 +9931,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) for (j = 0; j < chunk_dims[0]; j++) { for (k = 0; k < chunk_dims[1]; k++) { if (read_buf[j][k] != (int)((j * chunk_dims[0]) + k + i + niter)) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } @@ -9960,7 +9960,7 @@ test_overwrite_multi_chunk_dataset_same_shape_read(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10007,32 +10007,32 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) void *write_buf = NULL; void *read_buf = NULL; - TESTING_API("several overwrites to dataset with multiple chunks using differently shaped dataspaces"); + TESTING("several overwrites to dataset with multiple chunks using differently shaped dataspaces"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_GROUP_NAME); goto error; @@ -10047,7 +10047,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if (H5Pset_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } @@ -10055,7 +10055,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if ((dset_id = H5Dcreate2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; @@ -10065,13 +10065,13 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -10079,14 +10079,14 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -10108,7 +10108,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) * Allocate single chunk-sized read buffer. */ if (NULL == (read_buf = malloc(chunk_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for dataset read\n"); goto error; } @@ -10120,7 +10120,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) hsize_t mdims[] = {chunk_size / DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPESIZE}; if ((mspace_id = H5Screate_simple(1, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create memory dataspace\n"); goto error; } @@ -10196,7 +10196,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) */ if (H5Dwrite(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't write to dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; @@ -10221,14 +10221,14 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if ((dset_id = H5Dopen2(group_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get dataset dataspace\n"); goto error; } @@ -10253,7 +10253,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) * Adjust file dataspace selection for next chunk. */ if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set hyperslab selection\n"); goto error; } @@ -10261,7 +10261,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) memset(read_buf, 0, chunk_size); if (H5Dread(dset_id, DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't read from dataset '%s'\n", DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_NAME); goto error; @@ -10271,7 +10271,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) j < (hsize_t)chunk_size / DATASET_MULTI_CHUNK_OVERWRITE_DIFF_SPACE_READ_TEST_DSET_DTYPESIZE; j++) if (((int *)read_buf)[j] != (int)(j + i + niter)) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed for chunk %lld\n", (long long)i); goto error; } @@ -10303,7 +10303,7 @@ test_overwrite_multi_chunk_dataset_diff_shape_read(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10350,32 +10350,32 @@ test_read_partial_chunk_all_selection(void) hid_t dcpl_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("reading a partial chunk using H5S_ALL for file dataspace"); + TESTING("reading a partial chunk using H5S_ALL for file dataspace"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_GROUP_NAME); goto error; @@ -10389,7 +10389,7 @@ test_read_partial_chunk_all_selection(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } @@ -10397,7 +10397,7 @@ test_read_partial_chunk_all_selection(void) if ((dset_id = H5Dcreate2(group_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME); goto error; } @@ -10406,13 +10406,13 @@ test_read_partial_chunk_all_selection(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -10420,14 +10420,14 @@ test_read_partial_chunk_all_selection(void) memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -10444,7 +10444,7 @@ test_read_partial_chunk_all_selection(void) if (H5Dwrite(dset_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to write to dataset\n"); goto error; } @@ -10455,14 +10455,14 @@ test_read_partial_chunk_all_selection(void) if (H5Dclose(dset_id) < 0) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open dataset\n"); goto error; } if (H5Dread(dset_id, DATASET_PARTIAL_CHUNK_READ_ALL_SEL_TEST_DSET_DTYPE, H5S_ALL, H5S_ALL, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to read from dataset\n"); goto error; } @@ -10470,7 +10470,7 @@ test_read_partial_chunk_all_selection(void) for (i = 0; i < FIXED_DIMSIZE; i++) for (j = 0; j < FIXED_DIMSIZE; j++) if (read_buf[i][j] != (int)((i * FIXED_DIMSIZE) + j)) { - H5_FAILED_API(); + H5_FAILED(); printf( " data verification failed for read buffer element %lld: expected %lld but was %lld\n", (long long)((i * FIXED_DIMSIZE) + j), (long long)((i * FIXED_DIMSIZE) + j), @@ -10491,7 +10491,7 @@ test_read_partial_chunk_all_selection(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10537,32 +10537,32 @@ test_read_partial_chunk_hyperslab_selection(void) hid_t mspace_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("reading a partial chunk using a hyperslab selection in file dataspace"); + TESTING("reading a partial chunk using a hyperslab selection in file dataspace"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or get property list aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_GROUP_NAME); goto error; @@ -10576,7 +10576,7 @@ test_read_partial_chunk_hyperslab_selection(void) TEST_ERROR; if (H5Pset_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set chunking on DCPL\n"); goto error; } @@ -10584,7 +10584,7 @@ test_read_partial_chunk_hyperslab_selection(void) if ((dset_id = H5Dcreate2(group_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, fspace_id, H5P_DEFAULT, dcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME); goto error; } @@ -10593,13 +10593,13 @@ test_read_partial_chunk_hyperslab_selection(void) * See if a copy of the DCPL reports the correct chunking. */ if (H5Pclose(dcpl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close DCPL\n"); goto error; } if ((dcpl_id = H5Dget_create_plist(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve copy of DCPL\n"); goto error; } @@ -10607,14 +10607,14 @@ test_read_partial_chunk_hyperslab_selection(void) memset(retrieved_chunk_dims, 0, sizeof(retrieved_chunk_dims)); if (H5Pget_chunk(dcpl_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, retrieved_chunk_dims) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve chunking info\n"); goto error; } for (i = 0; i < DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK; i++) { if (chunk_dims[i] != retrieved_chunk_dims[i]) { - H5_FAILED_API(); + H5_FAILED(); printf(" chunk dimensionality retrieved from DCPL didn't match originally specified " "dimensionality\n"); goto error; @@ -10639,7 +10639,7 @@ test_read_partial_chunk_hyperslab_selection(void) if ((mspace_id = H5Screate_simple(DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK, mdims, NULL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create memory dataspace\n"); goto error; } @@ -10692,21 +10692,21 @@ test_read_partial_chunk_hyperslab_selection(void) hsize_t m_start[DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_SPACE_RANK] = {0, 0}; if (H5Sselect_hyperslab(mspace_id, H5S_SELECT_SET, m_start, NULL, count, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to select hyperslab in memory dataspace\n"); goto error; } } else { if (H5Sselect_all(mspace_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to select entire memory dataspace\n"); goto error; } } if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to select hyperslab\n"); goto error; } @@ -10715,7 +10715,7 @@ test_read_partial_chunk_hyperslab_selection(void) if (H5Dwrite(dset_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, write_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to write to dataset\n"); goto error; } @@ -10729,26 +10729,26 @@ test_read_partial_chunk_hyperslab_selection(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open dataset\n"); goto error; } if ((fspace_id = H5Dget_space(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve dataspace from dataset\n"); goto error; } if (H5Sselect_hyperslab(fspace_id, H5S_SELECT_SET, start, NULL, count, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to select hyperslab\n"); goto error; } if (H5Dread(dset_id, DATASET_PARTIAL_CHUNK_READ_HYPER_SEL_TEST_DSET_DTYPE, mspace_id, fspace_id, H5P_DEFAULT, read_buf) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to read from dataset\n"); goto error; } @@ -10756,7 +10756,7 @@ test_read_partial_chunk_hyperslab_selection(void) for (j = 0; j < FIXED_CHUNK_DIMSIZE; j++) for (k = 0; k < FIXED_CHUNK_DIMSIZE; k++) if (read_buf[j][k] != (int)((j * FIXED_CHUNK_DIMSIZE) + k)) { - H5_FAILED_API(); + H5_FAILED(); printf(" data verification failed for read buffer element %lld: expected %lld but " "was %lld\n", (long long)((j * FIXED_CHUNK_DIMSIZE) + k), @@ -10780,7 +10780,7 @@ test_read_partial_chunk_hyperslab_selection(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10813,8 +10813,8 @@ test_read_partial_chunk_hyperslab_selection(void) static int test_read_partial_chunk_point_selection(void) { - TESTING_API("reading a partial chunk using a point selection in file dataspace"); - SKIPPED_API(); + TESTING("reading a partial chunk using a point selection in file dataspace"); + SKIPPED(); return 1; } @@ -10840,12 +10840,12 @@ test_get_vlen_buf_size(void) hsize_t size; /* Number of bytes which will be used */ unsigned i, j; - TESTING_API("H5Dvlen_get_buf_size"); + TESTING("H5Dvlen_get_buf_size"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this " "connector\n"); return 0; @@ -10861,20 +10861,20 @@ test_get_vlen_buf_size(void) /* Open the file */ if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATASET_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATASET_GET_VLEN_BUF_SIZE_GROUP_NAME); goto error; } @@ -10904,7 +10904,7 @@ test_get_vlen_buf_size(void) if (size != ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) / 2) * sizeof(unsigned int)) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Dvlen_get_buf_size returned wrong size (%lu), compared to the correct size (%lu)\n", size, ((DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM * (DATASET_GET_VLEN_BUF_SIZE_DSET_SPACE_DIM + 1)) / @@ -10935,7 +10935,7 @@ test_get_vlen_buf_size(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; diff --git a/test/API/H5_api_datatype_test.c b/test/API/H5_api_datatype_test.c index 9e295f5955f..7afcdbe28dd 100644 --- a/test/API/H5_api_datatype_test.c +++ b/test/API/H5_api_datatype_test.c @@ -84,45 +84,45 @@ test_create_committed_datatype(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - TESTING_API("creation of a committed datatype"); + TESTING("creation of a committed datatype"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_CREATE_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", DATATYPE_CREATE_TEST_TYPE_NAME); goto error; } @@ -136,7 +136,7 @@ test_create_committed_datatype(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -170,47 +170,47 @@ test_create_committed_datatype_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Tcommit2_invalid_loc_id) { - TESTING_2_API("H5Tcommit2 with an invalid loc_id"); + TESTING_2("H5Tcommit2 with an invalid loc_id"); H5E_BEGIN_TRY { @@ -220,18 +220,18 @@ test_create_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit2 succeeded with an invalid loc_id!\n"); - PART_ERROR_API(H5Tcommit2_invalid_loc_id); + PART_ERROR(H5Tcommit2_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit2_invalid_loc_id); PART_BEGIN(H5Tcommit2_invalid_type_name) { - TESTING_2_API("H5Tcommit2 with an invalid datatype name"); + TESTING_2("H5Tcommit2 with an invalid datatype name"); H5E_BEGIN_TRY { @@ -240,9 +240,9 @@ test_create_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit2 succeeded with an invalid datatype name!\n"); - PART_ERROR_API(H5Tcommit2_invalid_type_name); + PART_ERROR(H5Tcommit2_invalid_type_name); } H5E_BEGIN_TRY @@ -252,18 +252,18 @@ test_create_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit2 succeeded with an invalid datatype name!\n"); - PART_ERROR_API(H5Tcommit2_invalid_type_name); + PART_ERROR(H5Tcommit2_invalid_type_name); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit2_invalid_type_name); PART_BEGIN(H5Tcommit2_invalid_type_id) { - TESTING_2_API("H5Tcommit2 with an invalid datatype ID"); + TESTING_2("H5Tcommit2 with an invalid datatype ID"); H5E_BEGIN_TRY { @@ -273,18 +273,18 @@ test_create_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit2 succeeded with an invalid datatype ID!\n"); - PART_ERROR_API(H5Tcommit2_invalid_type_id); + PART_ERROR(H5Tcommit2_invalid_type_id); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit2_invalid_type_id); PART_BEGIN(H5Tcommit2_invalid_lcpl) { - TESTING_2_API("H5Tcommit2 with an invalid LCPL"); + TESTING_2("H5Tcommit2 with an invalid LCPL"); H5E_BEGIN_TRY { @@ -294,18 +294,18 @@ test_create_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit2 succeeded with an invalid LCPL!\n"); - PART_ERROR_API(H5Tcommit2_invalid_lcpl); + PART_ERROR(H5Tcommit2_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit2_invalid_lcpl); PART_BEGIN(H5Tcommit2_invalid_tcpl) { - TESTING_2_API("H5Tcommit2 with an invalid TCPL"); + TESTING_2("H5Tcommit2 with an invalid TCPL"); H5E_BEGIN_TRY { @@ -315,18 +315,18 @@ test_create_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit2 succeeded with an invalid TCPL!\n"); - PART_ERROR_API(H5Tcommit2_invalid_tcpl); + PART_ERROR(H5Tcommit2_invalid_tcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit2_invalid_tcpl); PART_BEGIN(H5Tcommit2_invalid_tapl) { - TESTING_2_API("H5Tcommit2 with an invalid TAPL"); + TESTING_2("H5Tcommit2 with an invalid TAPL"); H5E_BEGIN_TRY { @@ -336,18 +336,18 @@ test_create_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit2 succeeded with an invalid TAPL!\n"); - PART_ERROR_API(H5Tcommit2_invalid_tapl); + PART_ERROR(H5Tcommit2_invalid_tapl); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit2_invalid_tapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Tclose(type_id) < 0) TEST_ERROR; @@ -358,7 +358,7 @@ test_create_committed_datatype_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -386,44 +386,44 @@ test_create_anonymous_committed_datatype(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - TESTING_API("creation of anonymous committed datatype"); + TESTING("creation of anonymous committed datatype"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_ANONYMOUS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_ANONYMOUS_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit_anon(group_id, type_id, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit anonymous datatype\n"); goto error; } @@ -437,7 +437,7 @@ test_create_anonymous_committed_datatype(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -471,47 +471,47 @@ test_create_anonymous_committed_datatype_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_ANONYMOUS_INVALID_PARAMS_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Tcommit_anon_invalid_loc_id) { - TESTING_2_API("H5Tcommit_anon with an invalid loc_id"); + TESTING_2("H5Tcommit_anon with an invalid loc_id"); H5E_BEGIN_TRY { @@ -520,18 +520,18 @@ test_create_anonymous_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit_anon succeeded with an invalid loc_id!\n"); - PART_ERROR_API(H5Tcommit_anon_invalid_loc_id); + PART_ERROR(H5Tcommit_anon_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_anon_invalid_loc_id); PART_BEGIN(H5Tcommit_anon_invalid_type_id) { - TESTING_2_API("H5Tcommit_anon with an invalid datatype ID"); + TESTING_2("H5Tcommit_anon with an invalid datatype ID"); H5E_BEGIN_TRY { @@ -540,18 +540,18 @@ test_create_anonymous_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit_anon succeeded with an invalid datatype ID!\n"); - PART_ERROR_API(H5Tcommit_anon_invalid_type_id); + PART_ERROR(H5Tcommit_anon_invalid_type_id); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_anon_invalid_type_id); PART_BEGIN(H5Tcommit_anon_invalid_tcpl) { - TESTING_2_API("H5Tcommit_anon with an invalid TCPL"); + TESTING_2("H5Tcommit_anon with an invalid TCPL"); H5E_BEGIN_TRY { @@ -560,18 +560,18 @@ test_create_anonymous_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit_anon succeeded with an invalid TCPL!\n"); - PART_ERROR_API(H5Tcommit_anon_invalid_tcpl); + PART_ERROR(H5Tcommit_anon_invalid_tcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_anon_invalid_tcpl); PART_BEGIN(H5Tcommit_anon_invalid_tapl) { - TESTING_2_API("H5Tcommit_anon with an invalid TAPL"); + TESTING_2("H5Tcommit_anon with an invalid TAPL"); H5E_BEGIN_TRY { @@ -580,18 +580,18 @@ test_create_anonymous_committed_datatype_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommit_anon succeeded with an invalid TAPL!\n"); - PART_ERROR_API(H5Tcommit_anon_invalid_tapl); + PART_ERROR(H5Tcommit_anon_invalid_tapl); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_anon_invalid_tapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Tclose(type_id) < 0) TEST_ERROR; @@ -602,7 +602,7 @@ test_create_anonymous_committed_datatype_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -637,45 +637,45 @@ test_create_committed_datatype_empty_types(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_CREATE_EMPTY_TYPES_TEST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Tcommit_empty_compound_type) { - TESTING_2_API("creation of committed datatype with empty compound type"); + TESTING_2("creation of committed datatype with empty compound type"); if ((type_id = H5Tcreate(H5T_COMPOUND, (size_t)32)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create compound type\n"); - PART_ERROR_API(H5Tcommit_empty_compound_type); + PART_ERROR(H5Tcommit_empty_compound_type); } H5E_BEGIN_TRY @@ -686,27 +686,27 @@ test_create_committed_datatype_empty_types(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" committed empty compound datatype!\n"); - PART_ERROR_API(H5Tcommit_empty_compound_type); + PART_ERROR(H5Tcommit_empty_compound_type); } /* Add a field to the compound datatype */ if (H5Tinsert(type_id, "a", (size_t)0, H5T_NATIVE_INT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to insert field into compound datatype\n"); - PART_ERROR_API(H5Tcommit_empty_compound_type); + PART_ERROR(H5Tcommit_empty_compound_type); } /* Attempt to commit the now non-empty compound datatype */ if (H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_CMPD_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit non-empty compound datatype\n"); - PART_ERROR_API(H5Tcommit_empty_compound_type); + PART_ERROR(H5Tcommit_empty_compound_type); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_empty_compound_type); @@ -723,12 +723,12 @@ test_create_committed_datatype_empty_types(void) { int enum_val = 1; - TESTING_2_API("creation of committed datatype with empty enum type"); + TESTING_2("creation of committed datatype with empty enum type"); if ((type_id = H5Tenum_create(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create enum type\n"); - PART_ERROR_API(H5Tcommit_empty_enum_type); + PART_ERROR(H5Tcommit_empty_enum_type); } H5E_BEGIN_TRY @@ -739,27 +739,27 @@ test_create_committed_datatype_empty_types(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" committed empty enum datatype!\n"); - PART_ERROR_API(H5Tcommit_empty_enum_type); + PART_ERROR(H5Tcommit_empty_enum_type); } /* Add a field to the enum datatype */ if (H5Tenum_insert(type_id, "a", &enum_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to insert field into enum datatype\n"); - PART_ERROR_API(H5Tcommit_empty_enum_type); + PART_ERROR(H5Tcommit_empty_enum_type); } /* Attempt to commit the now non-empty enum datatype */ if (H5Tcommit2(group_id, DATATYPE_CREATE_EMPTY_TYPES_TEST_ENUM_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit non-empty enum datatype\n"); - PART_ERROR_API(H5Tcommit_empty_enum_type); + PART_ERROR(H5Tcommit_empty_enum_type); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_empty_enum_type); @@ -807,57 +807,57 @@ test_recommit_committed_type(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - TESTING_API("inability to re-commit a committed datatype"); + TESTING("inability to re-commit a committed datatype"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", RECOMMIT_COMMITTED_TYPE_TEST_GROUP_NAME); goto error; } /* Copy a predefined datatype and commit the copy */ if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy predefined integer datatype\n"); goto error; } if (H5Tcommit2(group_id, "native_int", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit datatype\n"); goto error; } if ((is_committed = H5Tcommitted(type_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to determine if datatype is committed\n"); goto error; } if (!is_committed) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommitted() returned false!\n"); goto error; } @@ -870,7 +870,7 @@ test_recommit_committed_type(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" re-committed an already committed datatype!\n"); goto error; } @@ -884,7 +884,7 @@ test_recommit_committed_type(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -912,45 +912,45 @@ test_open_committed_datatype(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - TESTING_API("H5Topen2"); + TESTING("H5Topen2"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_OPEN_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_OPEN_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME); goto error; } @@ -959,7 +959,7 @@ test_open_committed_datatype(void) TEST_ERROR; if ((type_id = H5Topen2(group_id, DATATYPE_OPEN_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open committed datatype '%s'\n", DATATYPE_OPEN_TEST_TYPE_NAME); goto error; } @@ -973,7 +973,7 @@ test_open_committed_datatype(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1006,43 +1006,43 @@ test_open_committed_datatype_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype to commit\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", DATATYPE_OPEN_INVALID_PARAMS_TEST_TYPE_NAME); goto error; } @@ -1050,13 +1050,13 @@ test_open_committed_datatype_invalid_params(void) if (H5Tclose(type_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Topen2_invalid_loc_id) { - TESTING_2_API("H5Topen2 with an invalid location ID"); + TESTING_2("H5Topen2 with an invalid location ID"); H5E_BEGIN_TRY { @@ -1065,19 +1065,19 @@ test_open_committed_datatype_invalid_params(void) H5E_END_TRY if (type_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened committed datatype with an invalid location ID!\n"); H5Tclose(type_id); - PART_ERROR_API(H5Topen2_invalid_loc_id); + PART_ERROR(H5Topen2_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Topen2_invalid_loc_id); PART_BEGIN(H5Topen2_invalid_type_name) { - TESTING_2_API("H5Topen2 with an invalid datatype name"); + TESTING_2("H5Topen2 with an invalid datatype name"); H5E_BEGIN_TRY { @@ -1086,10 +1086,10 @@ test_open_committed_datatype_invalid_params(void) H5E_END_TRY if (type_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened committed datatype with an invalid datatype name!\n"); H5Tclose(type_id); - PART_ERROR_API(H5Topen2_invalid_type_name); + PART_ERROR(H5Topen2_invalid_type_name); } H5E_BEGIN_TRY @@ -1099,19 +1099,19 @@ test_open_committed_datatype_invalid_params(void) H5E_END_TRY if (type_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened committed datatype with an invalid datatype name!\n"); H5Tclose(type_id); - PART_ERROR_API(H5Topen2_invalid_type_name); + PART_ERROR(H5Topen2_invalid_type_name); } - PASSED_API(); + PASSED(); } PART_END(H5Topen2_invalid_type_name); PART_BEGIN(H5Topen2_invalid_tapl) { - TESTING_2_API("H5Topen2 with an invalid TAPL"); + TESTING_2("H5Topen2 with an invalid TAPL"); H5E_BEGIN_TRY { @@ -1120,19 +1120,19 @@ test_open_committed_datatype_invalid_params(void) H5E_END_TRY if (type_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened committed datatype with an invalid TAPL!\n"); H5Tclose(type_id); - PART_ERROR_API(H5Topen2_invalid_tapl); + PART_ERROR(H5Topen2_invalid_tapl); } - PASSED_API(); + PASSED(); } PART_END(H5Topen2_invalid_tapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -1141,7 +1141,7 @@ test_open_committed_datatype_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1180,29 +1180,29 @@ test_reopen_committed_datatype_indirect(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " "this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_REOPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_REOPEN_TEST_GROUP_NAME); goto error; } @@ -1210,86 +1210,86 @@ test_reopen_committed_datatype_indirect(void) if ((space_id = generate_random_dataspace(DATATYPE_REOPEN_TEST_SPACE_RANK, NULL, NULL, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(reopen_compound_type) { - TESTING_2_API("re-open of compound datatype"); + TESTING_2("re-open of compound datatype"); if ((strtype = H5Tcopy(H5T_C_S1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy C-string datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } if (H5Tset_size(strtype, H5T_VARIABLE) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set string datatype's size to variable\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } if ((type_id = H5Tcreate(H5T_COMPOUND, sizeof(char *))) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create compound datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } if (H5Tinsert(type_id, "vlstr", (size_t)0, strtype) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to insert field into compound datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } if (H5Tclose(strtype) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close string datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } /* Get size of compound type */ if ((dt_size = H5Tget_size(type_id)) == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve size of compound datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } /* Commit compound type and verify the size doesn't change */ if (H5Tcommit2(group_id, "cmpd_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit compound datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } if (dt_size != H5Tget_size(type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" committing datatype caused its size to change!\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } /* Create dataset with compound type */ if ((dset_id = H5Dcreate2(group_id, "cmpd_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create dataset using committed datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open committed datatype using H5Dget_type\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } if (dt_size != H5Tget_size(reopened_type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" size of re-opened datatype didn't match size of original datatype\n"); - PART_ERROR_API(reopen_compound_type); + PART_ERROR(reopen_compound_type); } - PASSED_API(); + PASSED(); } PART_END(reopen_compound_type); @@ -1310,70 +1310,70 @@ test_reopen_committed_datatype_indirect(void) { int enum_value; - TESTING_2_API("re-open of enum datatype"); + TESTING_2("re-open of enum datatype"); if ((type_id = H5Tenum_create(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create enum datatype\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } enum_value = 0; if (H5Tenum_insert(type_id, "val1", &enum_value) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to insert value into enum datatype\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } enum_value = 1; if (H5Tenum_insert(type_id, "val2", &enum_value) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to insert value into enum datatype\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } /* Get size of enum type */ if ((dt_size = H5Tget_size(type_id)) == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve size of enum datatype\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } /* Commit enum type and verify the size doesn't change */ if (H5Tcommit2(group_id, "enum_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit enum datatype\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } if (dt_size != H5Tget_size(type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" committing datatype caused its size to change!\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } /* Create dataset with enum type */ if ((dset_id = H5Dcreate2(group_id, "enum_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create dataset using committed datatype\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open committed datatype using H5Dget_type\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } if (dt_size != H5Tget_size(reopened_type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" size of re-opened datatype didn't match size of original datatype\n"); - PART_ERROR_API(reopen_enum_type); + PART_ERROR(reopen_enum_type); } - PASSED_API(); + PASSED(); } PART_END(reopen_enum_type); @@ -1390,56 +1390,56 @@ test_reopen_committed_datatype_indirect(void) PART_BEGIN(reopen_vlen_type) { - TESTING_2_API("reopen of a variable-length datatype"); + TESTING_2("reopen of a variable-length datatype"); if ((type_id = H5Tvlen_create(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create variable-length datatype\n"); - PART_ERROR_API(reopen_vlen_type); + PART_ERROR(reopen_vlen_type); } /* Get size of variable-length type */ if ((dt_size = H5Tget_size(type_id)) == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve size of variable-length datatype\n"); - PART_ERROR_API(reopen_vlen_type); + PART_ERROR(reopen_vlen_type); } /* Commit variable-length type and verify the size doesn't change */ if (H5Tcommit2(group_id, "vlen_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit variable-length datatype\n"); - PART_ERROR_API(reopen_vlen_type); + PART_ERROR(reopen_vlen_type); } if (dt_size != H5Tget_size(type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" committing datatype caused its size to change!\n"); - PART_ERROR_API(reopen_vlen_type); + PART_ERROR(reopen_vlen_type); } /* Create dataset with variable-length type */ if ((dset_id = H5Dcreate2(group_id, "vlen_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create dataset using committed datatype\n"); - PART_ERROR_API(reopen_vlen_type); + PART_ERROR(reopen_vlen_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open committed datatype using H5Dget_type\n"); - PART_ERROR_API(reopen_vlen_type); + PART_ERROR(reopen_vlen_type); } if (dt_size != H5Tget_size(reopened_type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" size of re-opened datatype didn't match size of original datatype\n"); - PART_ERROR_API(reopen_vlen_type); + PART_ERROR(reopen_vlen_type); } - PASSED_API(); + PASSED(); } PART_END(reopen_vlen_type); @@ -1458,62 +1458,62 @@ test_reopen_committed_datatype_indirect(void) { const char *tag = "opaque_tag"; - TESTING_2_API("reopen of an opaque datatype"); + TESTING_2("reopen of an opaque datatype"); if ((type_id = H5Tcreate(H5T_OPAQUE, (size_t)13)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create opaque datatype\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } if (H5Tset_tag(type_id, tag) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set tag on opaque datatype\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } /* Get size of opaque type */ if ((dt_size = H5Tget_size(type_id)) == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve size of opaque datatype\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } /* Commit opaque type and verify the size doesn't change */ if (H5Tcommit2(group_id, "opaque_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit opaque datatype\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } if (dt_size != H5Tget_size(type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" committing datatype caused its size to change!\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } /* Create dataset with opaque type */ if ((dset_id = H5Dcreate2(group_id, "opaque_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create dataset using committed datatype\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open committed datatype using H5Dget_type\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } if (dt_size != H5Tget_size(reopened_type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" size of re-opened datatype didn't match size of original datatype\n"); - PART_ERROR_API(reopen_opaque_type); + PART_ERROR(reopen_opaque_type); } - PASSED_API(); + PASSED(); } PART_END(reopen_opaque_type); @@ -1532,56 +1532,56 @@ test_reopen_committed_datatype_indirect(void) { hsize_t array_dims[] = {2, 3}; - TESTING_2_API("reopen of an array datatype"); + TESTING_2("reopen of an array datatype"); if ((type_id = H5Tarray_create2(H5T_NATIVE_INT, 1, array_dims)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create array datatype\n"); - PART_ERROR_API(reopen_array_type); + PART_ERROR(reopen_array_type); } /* Get size of array type */ if ((dt_size = H5Tget_size(type_id)) == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve size of array datatype\n"); - PART_ERROR_API(reopen_array_type); + PART_ERROR(reopen_array_type); } /* Commit array type and verify the size doesn't change */ if (H5Tcommit2(group_id, "array_type", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit array datatype\n"); - PART_ERROR_API(reopen_array_type); + PART_ERROR(reopen_array_type); } if (dt_size != H5Tget_size(type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" committing datatype caused its size to change!\n"); - PART_ERROR_API(reopen_array_type); + PART_ERROR(reopen_array_type); } /* Create dataset with array type */ if ((dset_id = H5Dcreate2(group_id, "array_dset", type_id, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create dataset using committed datatype\n"); - PART_ERROR_API(reopen_array_type); + PART_ERROR(reopen_array_type); } /* Indirectly reopen type and verify that the size doesn't change */ if ((reopened_type_id = H5Dget_type(dset_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to re-open committed datatype using H5Dget_type\n"); - PART_ERROR_API(reopen_array_type); + PART_ERROR(reopen_array_type); } if (dt_size != H5Tget_size(reopened_type_id)) { - H5_FAILED_API(); + H5_FAILED(); printf(" size of re-opened datatype didn't match size of original datatype\n"); - PART_ERROR_API(reopen_array_type); + PART_ERROR(reopen_array_type); } - PASSED_API(); + PASSED(); } PART_END(reopen_array_type); @@ -1598,7 +1598,7 @@ test_reopen_committed_datatype_indirect(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -1609,7 +1609,7 @@ test_reopen_committed_datatype_indirect(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1640,18 +1640,18 @@ test_close_committed_datatype_invalid_id(void) herr_t err_ret = -1; hid_t file_id = H5I_INVALID_HID; - TESTING_API("H5Tclose with an invalid committed datatype ID"); + TESTING("H5Tclose with an invalid committed datatype ID"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or stored datatype aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } @@ -1663,7 +1663,7 @@ test_close_committed_datatype_invalid_id(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tclose succeeded with an invalid committed datatype ID!\n"); goto error; } @@ -1671,7 +1671,7 @@ test_close_committed_datatype_invalid_id(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1703,47 +1703,47 @@ test_datatype_property_lists(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, stored datatype, or getting property list aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_PROPERTY_LIST_TEST_SUBGROUP_NAME); goto error; } if ((type_id1 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if ((type_id2 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if ((tcpl_id1 = H5Pcreate(H5P_DATATYPE_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create TCPL\n"); goto error; } @@ -1752,14 +1752,14 @@ test_datatype_property_lists(void) if (H5Tcommit2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1, type_id1, H5P_DEFAULT, tcpl_id1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1); goto error; } if (H5Tcommit2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2, type_id2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2); goto error; } @@ -1767,28 +1767,28 @@ test_datatype_property_lists(void) if (H5Pclose(tcpl_id1) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Tget_create_plist) { - TESTING_2_API("H5Tget_create_plist"); + TESTING_2("H5Tget_create_plist"); /* Try to receive copies for the two property lists */ if ((tcpl_id1 = H5Tget_create_plist(type_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Tget_create_plist); + PART_ERROR(H5Tget_create_plist); } if ((tcpl_id2 = H5Tget_create_plist(type_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Tget_create_plist); + PART_ERROR(H5Tget_create_plist); } - PASSED_API(); + PASSED(); } PART_END(H5Tget_create_plist); @@ -1830,41 +1830,41 @@ test_datatype_property_lists(void) PART_BEGIN(H5Tget_create_plist_reopened) { - TESTING_2_API("H5Tget_create_plist after re-opening committed datatype"); + TESTING_2("H5Tget_create_plist after re-opening committed datatype"); if ((type_id1 = H5Topen2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME1); - PART_ERROR_API(H5Tget_create_plist_reopened); + PART_ERROR(H5Tget_create_plist_reopened); } if ((type_id2 = H5Topen2(group_id, DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open datatype '%s'\n", DATATYPE_PROPERTY_LIST_TEST_DATATYPE_NAME2); - PART_ERROR_API(H5Tget_create_plist_reopened); + PART_ERROR(H5Tget_create_plist_reopened); } if ((tcpl_id1 = H5Tget_create_plist(type_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Tget_create_plist_reopened); + PART_ERROR(H5Tget_create_plist_reopened); } if ((tcpl_id2 = H5Tget_create_plist(type_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Tget_create_plist_reopened); + PART_ERROR(H5Tget_create_plist_reopened); } - PASSED_API(); + PASSED(); } PART_END(H5Tget_create_plist_reopened); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(tcpl_id1) < 0) TEST_ERROR; @@ -1881,7 +1881,7 @@ test_datatype_property_lists(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1914,46 +1914,46 @@ test_create_dataset_with_committed_type(void) hid_t type_id = H5I_INVALID_HID; hid_t fspace_id = H5I_INVALID_HID; - TESTING_API("dataset creation with a committed datatype"); + TESTING("dataset creation with a committed datatype"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " "this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME); goto error; } @@ -1968,26 +1968,26 @@ test_create_dataset_with_committed_type(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); goto error; } if ((type_id = H5Topen2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open committed datatype '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_TYPE_NAME); goto error; } @@ -1997,7 +1997,7 @@ test_create_dataset_with_committed_type(void) if ((dset_id = H5Dcreate2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME, type_id, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s' using committed datatype\n", DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME); goto error; @@ -2007,7 +2007,7 @@ test_create_dataset_with_committed_type(void) TEST_ERROR; if ((dset_id = H5Dopen2(group_id, DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset '%s'\n", DATASET_CREATE_WITH_DATATYPE_TEST_DSET_NAME); goto error; } @@ -2025,7 +2025,7 @@ test_create_dataset_with_committed_type(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2058,46 +2058,46 @@ test_create_attribute_with_committed_type(void) hid_t type_id = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - TESTING_API("attribute creation with a committed datatype"); + TESTING("attribute creation with a committed datatype"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or stored datatype aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, TRUE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME); goto error; } @@ -2106,7 +2106,7 @@ test_create_attribute_with_committed_type(void) TEST_ERROR; if ((type_id = H5Topen2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open committed datatype '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_DTYPE_NAME); goto error; } @@ -2117,21 +2117,21 @@ test_create_attribute_with_committed_type(void) if ((attr_id = H5Acreate2(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME, type_id, space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); goto error; } /* Verify the attribute has been created */ if ((attr_exists = H5Aexists(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if attribute '%s' exists\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); goto error; } if (!attr_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" attribute did not exist\n"); goto error; } @@ -2140,7 +2140,7 @@ test_create_attribute_with_committed_type(void) TEST_ERROR; if ((attr_id = H5Aopen(group_id, ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open attribute '%s'\n", ATTRIBUTE_CREATE_WITH_DATATYPE_TEST_ATTR_NAME); goto error; } @@ -2158,7 +2158,7 @@ test_create_attribute_with_committed_type(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2189,76 +2189,76 @@ test_delete_committed_type(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - TESTING_API("committed datatype deletion"); + TESTING("committed datatype deletion"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, attribute, or stored datatype aren't supported " "with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_DELETE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group '%s'\n", DATATYPE_DELETE_TEST_GROUP_NAME); goto error; } if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if ((type_exists = H5Lexists(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if (!type_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" datatype didn't exist\n"); goto error; } if (H5Ldelete(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete datatype '%s'\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if ((type_exists = H5Lexists(group_id, DATATYPE_DELETE_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if datatype '%s' exists\n", DATATYPE_DELETE_TEST_DTYPE_NAME); goto error; } if (type_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" datatype exists\n"); goto error; } @@ -2272,7 +2272,7 @@ test_delete_committed_type(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2301,61 +2301,61 @@ test_resurrect_datatype(void) hid_t group_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - TESTING_API("resurrecting datatype after deletion"); + TESTING("resurrecting datatype after deletion"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, or stored datatype aren't " "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, DATATYPE_RESURRECT_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME); goto error; } /* Create a named datatype in the file */ if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy predefined integer type\n"); goto error; } if (H5Tcommit2(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit datatype\n"); goto error; } /* Unlink the datatype while it's open (will mark it for deletion when closed) */ if (H5Ldelete(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete datatype\n"); goto error; } /* Check that datatype name is NULL */ if (H5Iget_name(type_id, NULL, (size_t)0) != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" deleted datatype name was not NULL!\n"); goto error; } @@ -2363,7 +2363,7 @@ test_resurrect_datatype(void) /* Re-link the datatype to the group hierarchy (shouldn't get deleted now) */ if (H5Lcreate_hard(type_id, ".", group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create new link for deleted datatype\n"); goto error; } @@ -2380,26 +2380,26 @@ test_resurrect_datatype(void) /* Re-open the file */ if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, DATATYPE_RESURRECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container sub-group '%s'\n", DATATYPE_RESURRECT_TEST_GROUP_NAME); goto error; } /* Attempt to open the datatype under the new name */ if ((type_id = H5Topen2(group_id, DATATYPE_RESURRECT_TEST_DTYPE_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open resurrected datatype\n"); goto error; } @@ -2413,7 +2413,7 @@ test_resurrect_datatype(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2433,9 +2433,9 @@ test_resurrect_datatype(void) static int test_flush_committed_datatype(void) { - TESTING_API("H5Tflush"); + TESTING("H5Tflush"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -2443,9 +2443,9 @@ test_flush_committed_datatype(void) static int test_flush_committed_datatype_invalid_params(void) { - TESTING_API("H5Tflush with invalid parameters"); + TESTING("H5Tflush with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -2453,9 +2453,9 @@ test_flush_committed_datatype_invalid_params(void) static int test_refresh_committed_datatype(void) { - TESTING_API("H5Trefresh"); + TESTING("H5Trefresh"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -2463,9 +2463,9 @@ test_refresh_committed_datatype(void) static int test_refresh_committed_datatype_invalid_params(void) { - TESTING_API("H5Trefresh with invalid parameters"); + TESTING("H5Trefresh with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -2484,32 +2484,32 @@ test_cant_commit_predefined(void) hid_t container_group = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; - TESTING_API("inability to commit predefined types directly"); + TESTING("inability to commit predefined types directly"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", PREDEFINED_TYPE_COMMIT_TEST_GROUP_NAME); goto error; } @@ -2522,7 +2522,7 @@ test_cant_commit_predefined(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" committed a predefined datatype directly (without copying it)!\n"); goto error; } @@ -2534,7 +2534,7 @@ test_cant_commit_predefined(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2564,57 +2564,57 @@ test_cant_modify_committed_type(void) hid_t group_id = H5I_INVALID_HID; hid_t type_id = H5I_INVALID_HID; - TESTING_API("inability to modify a committed datatype"); + TESTING("inability to modify a committed datatype"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or stored datatype aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, DATATYPE_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", DATATYPE_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", MODIFY_COMMITTED_TYPE_TEST_GROUP_NAME); goto error; } /* Copy a predefined datatype and commit the copy */ if ((type_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy predefined integer datatype\n"); goto error; } if (H5Tcommit2(group_id, "native_int", type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to commit datatype\n"); goto error; } if ((is_committed = H5Tcommitted(type_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to determine if datatype is committed\n"); goto error; } if (!is_committed) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Tcommitted() returned false!\n"); goto error; } @@ -2627,7 +2627,7 @@ test_cant_modify_committed_type(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" modified committed datatype!\n"); goto error; } @@ -2641,7 +2641,7 @@ test_cant_modify_committed_type(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; diff --git a/test/API/H5_api_file_test.c b/test/API/H5_api_file_test.c index 9221393fdfd..19ac3e076a2 100644 --- a/test/API/H5_api_file_test.c +++ b/test/API/H5_api_file_test.c @@ -63,23 +63,23 @@ test_create_file(void) hid_t file_id = H5I_INVALID_HID; char *prefixed_filename = NULL; - TESTING_API("H5Fcreate"); + TESTING("H5Fcreate"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_CREATE_TEST_FILENAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } @@ -90,7 +90,7 @@ test_create_file(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; @@ -120,13 +120,13 @@ test_create_file_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_CREATE_INVALID_PARAMS_FILE_NAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } @@ -135,7 +135,7 @@ test_create_file_invalid_params(void) { PART_BEGIN(H5Fcreate_invalid_name) { - TESTING_2_API("H5Fcreate with invalid file name"); + TESTING_2("H5Fcreate with invalid file name"); H5E_BEGIN_TRY { @@ -144,10 +144,10 @@ test_create_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was created with a NULL name!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fcreate_invalid_name); + PART_ERROR(H5Fcreate_invalid_name); } H5E_BEGIN_TRY @@ -157,19 +157,19 @@ test_create_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was created with an invalid name of ''!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fcreate_invalid_name); + PART_ERROR(H5Fcreate_invalid_name); } - PASSED_API(); + PASSED(); } PART_END(H5Fcreate_invalid_name); PART_BEGIN(H5Fcreate_invalid_flags) { - TESTING_2_API("H5Fcreate with invalid flags"); + TESTING_2("H5Fcreate with invalid flags"); H5E_BEGIN_TRY { @@ -178,10 +178,10 @@ test_create_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was created with invalid flag H5F_ACC_RDWR!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fcreate_invalid_flags); + PART_ERROR(H5Fcreate_invalid_flags); } H5E_BEGIN_TRY @@ -191,10 +191,10 @@ test_create_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was created with invalid flag H5F_ACC_CREAT!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fcreate_invalid_flags); + PART_ERROR(H5Fcreate_invalid_flags); } H5E_BEGIN_TRY @@ -204,19 +204,19 @@ test_create_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was created with invalid flag H5F_ACC_SWMR_READ!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fcreate_invalid_flags); + PART_ERROR(H5Fcreate_invalid_flags); } - PASSED_API(); + PASSED(); } PART_END(H5Fcreate_invalid_flags); PART_BEGIN(H5Fcreate_invalid_fcpl) { - TESTING_2_API("H5Fcreate with invalid FCPL"); + TESTING_2("H5Fcreate with invalid FCPL"); H5E_BEGIN_TRY { @@ -225,13 +225,13 @@ test_create_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was created with invalid FCPL!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fcreate_invalid_fcpl); + PART_ERROR(H5Fcreate_invalid_fcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Fcreate_invalid_fcpl); } @@ -268,23 +268,23 @@ test_create_file_excl(void) hid_t file_id2 = H5I_INVALID_HID; char *prefixed_filename = NULL; - TESTING_API("H5Fcreate with H5F_ACC_EXCL/H5F_ACC_TRUNC flag"); + TESTING("H5Fcreate with H5F_ACC_EXCL/H5F_ACC_TRUNC flag"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_CREATE_EXCL_FILE_NAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_EXCL, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first file\n"); goto error; } @@ -303,14 +303,14 @@ test_create_file_excl(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created already existing file using H5F_ACC_EXCL flag!\n"); goto error; } /* Test creating with H5F_ACC_TRUNC. This will truncate the existing file on disk. */ if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't truncate the existing file\n"); goto error; } @@ -321,7 +321,7 @@ test_create_file_excl(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; @@ -350,7 +350,7 @@ test_open_file(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } @@ -359,15 +359,15 @@ test_open_file(void) { PART_BEGIN(H5Fopen_rdonly) { - TESTING_2_API("H5Fopen in read-only mode"); + TESTING_2("H5Fopen in read-only mode"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to open file '%s' in read-only mode\n", H5_API_TEST_FILENAME); - PART_ERROR_API(H5Fopen_rdonly); + PART_ERROR(H5Fopen_rdonly); } - PASSED_API(); + PASSED(); } PART_END(H5Fopen_rdonly); @@ -382,15 +382,15 @@ test_open_file(void) PART_BEGIN(H5Fopen_rdwrite) { - TESTING_2_API("H5Fopen in read-write mode"); + TESTING_2("H5Fopen in read-write mode"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to open file '%s' in read-write mode\n", H5_API_TEST_FILENAME); - PART_ERROR_API(H5Fopen_rdwrite); + PART_ERROR(H5Fopen_rdwrite); } - PASSED_API(); + PASSED(); } PART_END(H5Fopen_rdwrite); @@ -434,7 +434,7 @@ test_open_file_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } @@ -443,7 +443,7 @@ test_open_file_invalid_params(void) { PART_BEGIN(H5Fopen_invalid_name) { - TESTING_2_API("H5Fopen with invalid file name"); + TESTING_2("H5Fopen with invalid file name"); H5E_BEGIN_TRY { @@ -452,10 +452,10 @@ test_open_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was opened with a NULL name!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fopen_invalid_name); + PART_ERROR(H5Fopen_invalid_name); } H5E_BEGIN_TRY @@ -465,19 +465,19 @@ test_open_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was opened with an invalid name of ''!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fopen_invalid_name); + PART_ERROR(H5Fopen_invalid_name); } - PASSED_API(); + PASSED(); } PART_END(H5Fopen_invalid_name); PART_BEGIN(H5Fopen_invalid_flags) { - TESTING_2_API("H5Fopen with invalid flags"); + TESTING_2("H5Fopen with invalid flags"); H5E_BEGIN_TRY { @@ -486,10 +486,10 @@ test_open_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was opened with invalid flag H5F_ACC_TRUNC!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fopen_invalid_flags); + PART_ERROR(H5Fopen_invalid_flags); } H5E_BEGIN_TRY @@ -499,13 +499,13 @@ test_open_file_invalid_params(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" file was opened with invalid flag H5F_ACC_EXCL!\n"); H5Fclose(file_id); - PART_ERROR_API(H5Fopen_invalid_flags); + PART_ERROR(H5Fopen_invalid_flags); } - PASSED_API(); + PASSED(); } PART_END(H5Fopen_invalid_flags); } @@ -532,17 +532,17 @@ test_open_nonexistent_file(void) hid_t file_id = H5I_INVALID_HID; char *prefixed_filename = NULL; - TESTING_API("for invalid opening of a non-existent file"); + TESTING("for invalid opening of a non-existent file"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, NONEXISTENT_FILENAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } @@ -556,7 +556,7 @@ test_open_nonexistent_file(void) H5E_END_TRY if (file_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" non-existent file was opened!\n"); goto error; } @@ -564,7 +564,7 @@ test_open_nonexistent_file(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; @@ -602,35 +602,35 @@ test_file_permission(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, attribute, or stored datatype aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, FILE_PERMISSION_TEST_FILENAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create data space\n"); goto error; } if ((dset_id = H5Dcreate2(file_id, FILE_PERMISSION_TEST_DSET_NAME, H5T_STD_U32LE, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create data set: %s\n", FILE_PERMISSION_TEST_DSET_NAME); goto error; } @@ -642,18 +642,18 @@ test_file_permission(void) /* Open the file (with read-only permission) */ if ((file_id = H5Fopen(prefixed_filename, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gcreate_rdonly_file) { - TESTING_2_API("invalid creation of group in read-only file"); + TESTING_2("invalid creation of group in read-only file"); /* Create a group with the read-only file handle (should fail) */ H5E_BEGIN_TRY @@ -664,9 +664,9 @@ test_file_permission(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a group was created in a read-only file!\n"); - PART_ERROR_API(H5Gcreate_rdonly_file); + PART_ERROR(H5Gcreate_rdonly_file); } H5E_BEGIN_TRY @@ -676,18 +676,18 @@ test_file_permission(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a group was created in a read-only file!\n"); - PART_ERROR_API(H5Gcreate_rdonly_file); + PART_ERROR(H5Gcreate_rdonly_file); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_rdonly_file); PART_BEGIN(H5Dcreate_rdonly_file) { - TESTING_2_API("invalid creation of dataset in read-only file"); + TESTING_2("invalid creation of dataset in read-only file"); /* Create a dataset with the read-only file handle (should fail) */ H5E_BEGIN_TRY @@ -698,9 +698,9 @@ test_file_permission(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a dataset was created in a read-only file!\n"); - PART_ERROR_API(H5Dcreate_rdonly_file); + PART_ERROR(H5Dcreate_rdonly_file); } H5E_BEGIN_TRY @@ -710,18 +710,18 @@ test_file_permission(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a dataset was created in a read-only file!\n"); - PART_ERROR_API(H5Dcreate_rdonly_file); + PART_ERROR(H5Dcreate_rdonly_file); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_rdonly_file); PART_BEGIN(H5Acreate_rdonly_file) { - TESTING_2_API("invalid creation of attribute in read-only file"); + TESTING_2("invalid creation of attribute in read-only file"); /* Create an attribute with the read-only file handle (should fail) */ H5E_BEGIN_TRY @@ -732,23 +732,23 @@ test_file_permission(void) H5E_END_TRY if (attr_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" an attribute was created in a read-only file!\n"); - PART_ERROR_API(H5Acreate_rdonly_file); + PART_ERROR(H5Acreate_rdonly_file); } - PASSED_API(); + PASSED(); } PART_END(H5Acreate_rdonly_file); PART_BEGIN(H5Tcommit_rdonly_file) { - TESTING_2_API("invalid creation of committed datatype in read-only file"); + TESTING_2("invalid creation of committed datatype in read-only file"); if ((dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't copy a native datatype\n"); - PART_ERROR_API(H5Tcommit_rdonly_file); + PART_ERROR(H5Tcommit_rdonly_file); } /* Commit a datatype with the read-only file handle (should fail) */ @@ -760,9 +760,9 @@ test_file_permission(void) H5E_END_TRY if (h5_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a named datatype was committed in a read-only file!\n"); - PART_ERROR_API(H5Tcommit_rdonly_file); + PART_ERROR(H5Tcommit_rdonly_file); } H5E_BEGIN_TRY @@ -772,18 +772,18 @@ test_file_permission(void) H5E_END_TRY if (h5_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a named datatype was committed in a read-only file!\n"); - PART_ERROR_API(H5Tcommit_rdonly_file); + PART_ERROR(H5Tcommit_rdonly_file); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_rdonly_file); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Tclose(dtype_id) < 0) TEST_ERROR; @@ -795,7 +795,7 @@ test_file_permission(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; @@ -825,23 +825,23 @@ test_reopen_file(void) hid_t file_id = H5I_INVALID_HID; hid_t file_id2 = H5I_INVALID_HID; - TESTING_API("re-open of a file with H5Freopen"); + TESTING("re-open of a file with H5Freopen"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((file_id2 = H5Freopen(file_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't re-open file\n"); goto error; } @@ -851,7 +851,7 @@ test_reopen_file(void) if (H5Fclose(file_id2) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -874,11 +874,11 @@ test_close_file_invalid_id(void) { herr_t err_ret = -1; - TESTING_API("H5Fclose with an invalid ID"); + TESTING("H5Fclose with an invalid ID"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } @@ -890,12 +890,12 @@ test_close_file_invalid_id(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" closed an invalid file ID!\n"); goto error; } - PASSED_API(); + PASSED(); return 0; @@ -921,29 +921,29 @@ test_flush_file(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, dataset, or file flush aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, FILE_FLUSH_TEST_FILENAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } /* Create multiple small datasets in file */ if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create data space\n"); goto error; } @@ -953,7 +953,7 @@ test_flush_file(void) if ((dset_id = H5Dcreate2(file_id, dset_name, H5T_STD_U32LE, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create data set: %s\n", dset_name); goto error; } @@ -962,41 +962,41 @@ test_flush_file(void) TEST_ERROR; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Fflush_local) { - TESTING_2_API("file flushing at local scope"); + TESTING_2("file flushing at local scope"); if (H5Fflush(file_id, H5F_SCOPE_LOCAL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to flush file with scope H5F_SCOPE_LOCAL\n"); - PART_ERROR_API(H5Fflush_local); + PART_ERROR(H5Fflush_local); } - PASSED_API(); + PASSED(); } PART_END(H5Fflush_local); PART_BEGIN(H5Fflush_global) { - TESTING_2_API("file flushing at global scope"); + TESTING_2("file flushing at global scope"); if (H5Fflush(file_id, H5F_SCOPE_GLOBAL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" unable to flush file with scope H5F_SCOPE_GLOBAL\n"); - PART_ERROR_API(H5Fflush_global); + PART_ERROR(H5Fflush_global); } - PASSED_API(); + PASSED(); } PART_END(H5Fflush_global); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dspace_id) < 0) TEST_ERROR; @@ -1006,7 +1006,7 @@ test_flush_file(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; @@ -1038,13 +1038,13 @@ test_file_is_accessible(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file aren't supported with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, fake_filename, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } @@ -1053,22 +1053,22 @@ test_file_is_accessible(void) { PART_BEGIN(H5Fis_accessible_valid_file) { - TESTING_2_API("H5Fis_accessible on existing file"); + TESTING_2("H5Fis_accessible on existing file"); if ((is_accessible = H5Fis_accessible(H5_API_TEST_FILENAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if file '%s' is accessible with default FAPL\n", H5_API_TEST_FILENAME); - PART_ERROR_API(H5Fis_accessible_valid_file); + PART_ERROR(H5Fis_accessible_valid_file); } if (!is_accessible) { - H5_FAILED_API(); + H5_FAILED(); printf(" file '%s' is not accessible with default FAPL\n", H5_API_TEST_FILENAME); - PART_ERROR_API(H5Fis_accessible_valid_file); + PART_ERROR(H5Fis_accessible_valid_file); } - PASSED_API(); + PASSED(); } PART_END(H5Fis_accessible_valid_file); @@ -1076,7 +1076,7 @@ test_file_is_accessible(void) PART_BEGIN(H5Fis_accessible_invalid_file) { - TESTING_2_API("H5Fis_accessible on non-existing file"); + TESTING_2("H5Fis_accessible on non-existing file"); H5E_BEGIN_TRY { @@ -1085,13 +1085,13 @@ test_file_is_accessible(void) H5E_END_TRY if (is_accessible > 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" non-existent file '%s' was accessible with default FAPL: is_accessible=%d!\n", prefixed_filename, is_accessible); - PART_ERROR_API(H5Fis_accessible_invalid_file); + PART_ERROR(H5Fis_accessible_invalid_file); } - PASSED_API(); + PASSED(); } PART_END(H5Fis_accessible_invalid_file); } @@ -1133,45 +1133,45 @@ test_file_property_lists(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic or more file or get property list aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, FILE_PROPERTY_LIST_TEST_FNAME1, &prefixed_filename1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if (prefix_filename(test_path_prefix, FILE_PROPERTY_LIST_TEST_FNAME2, &prefixed_filename2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((fcpl_id1 = H5Pcreate(H5P_FILE_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create FCPL\n"); goto error; } if (H5Pset_userblock(fcpl_id1, FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to set test property on FCPL\n"); goto error; } if ((file_id1 = H5Fcreate(prefixed_filename1, H5F_ACC_TRUNC, fcpl_id1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file\n"); goto error; } if ((file_id2 = H5Fcreate(prefixed_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file\n"); goto error; } @@ -1179,47 +1179,47 @@ test_file_property_lists(void) if (H5Pclose(fcpl_id1) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Fget_create_plist) { - TESTING_2_API("H5Fget_create_plist"); + TESTING_2("H5Fget_create_plist"); /* Try to receive copies of the two property lists, one which has the property set and one which * does not */ if ((fcpl_id1 = H5Fget_create_plist(file_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get FCPL\n"); - PART_ERROR_API(H5Fget_create_plist); + PART_ERROR(H5Fget_create_plist); } if ((fcpl_id2 = H5Fget_create_plist(file_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get FCPL\n"); - PART_ERROR_API(H5Fget_create_plist); + PART_ERROR(H5Fget_create_plist); } /* Ensure that property list 1 has the property set and property list 2 does not */ if (H5Pget_userblock(fcpl_id1, &prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve test property from FCPL\n"); - PART_ERROR_API(H5Fget_create_plist); + PART_ERROR(H5Fget_create_plist); } if (prop_val != FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved test property value '%llu' did not match expected value '%llu'\n", (long long unsigned)prop_val, (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); - PART_ERROR_API(H5Fget_create_plist); + PART_ERROR(H5Fget_create_plist); } if (H5Pget_userblock(fcpl_id2, &prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve test property from FCPL\n"); - PART_ERROR_API(H5Fget_create_plist); + PART_ERROR(H5Fget_create_plist); } if (prop_val == FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { @@ -1227,16 +1227,16 @@ test_file_property_lists(void) "shouldn't have\n", (long long unsigned)prop_val, (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); - PART_ERROR_API(H5Fget_create_plist); + PART_ERROR(H5Fget_create_plist); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_create_plist); PART_BEGIN(H5Fget_access_plist) { - TESTING_2_API("H5Fget_access_plist"); + TESTING_2("H5Fget_access_plist"); /* Due to the nature of needing to supply a FAPL with the VOL connector having been set on it to * the H5Fcreate() call, we cannot exactly test using H5P_DEFAULT as the FAPL for one of the @@ -1244,18 +1244,18 @@ test_file_property_lists(void) * check that the FAPL is correct after both creating and opening a file. */ if ((fapl_id1 = H5Fget_access_plist(file_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get FAPL\n"); - PART_ERROR_API(H5Fget_access_plist); + PART_ERROR(H5Fget_access_plist); } if ((fapl_id2 = H5Fget_access_plist(file_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get FAPL\n"); - PART_ERROR_API(H5Fget_access_plist); + PART_ERROR(H5Fget_access_plist); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_access_plist); @@ -1315,51 +1315,51 @@ test_file_property_lists(void) PART_BEGIN(H5Fget_create_plist_reopened) { - TESTING_2_API("H5Fget_create_plist after re-opening file"); + TESTING_2("H5Fget_create_plist after re-opening file"); if ((file_id1 = H5Fopen(prefixed_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } if ((file_id2 = H5Fopen(prefixed_filename2, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } if ((fcpl_id1 = H5Fget_create_plist(file_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get FCPL\n"); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } if ((fcpl_id2 = H5Fget_create_plist(file_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get FCPL\n"); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } /* Check the values of the test property */ if (H5Pget_userblock(fcpl_id1, &prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve test property from FCPL\n"); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } if (prop_val != FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved test property value '%llu' did not match expected value '%llu'\n", (long long unsigned)prop_val, (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } if (H5Pget_userblock(fcpl_id2, &prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve test property from FCPL\n"); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } if (prop_val == FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL) { @@ -1367,16 +1367,16 @@ test_file_property_lists(void) "shouldn't have\n", (long long unsigned)prop_val, (long long unsigned)FILE_PROPERTY_LIST_TEST_FCPL_PROP_VAL); - PART_ERROR_API(H5Fget_create_plist_reopened); + PART_ERROR(H5Fget_create_plist_reopened); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_create_plist_reopened); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(fcpl_id1) < 0) TEST_ERROR; @@ -1392,7 +1392,7 @@ test_file_property_lists(void) free(prefixed_filename2); prefixed_filename2 = NULL; - PASSED_API(); + PASSED(); return 0; @@ -1428,47 +1428,47 @@ test_get_file_intent(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic or more file aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, FILE_INTENT_TEST_FILENAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } /* Test that file intent retrieval works correctly for file create */ if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Fget_intent_file_creation) { - TESTING_2_API("H5Fget_intent on newly-created file"); + TESTING_2("H5Fget_intent on newly-created file"); if (H5Fget_intent(file_id, &file_intent) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve file intent\n"); - PART_ERROR_API(H5Fget_intent_file_creation); + PART_ERROR(H5Fget_intent_file_creation); } if (H5F_ACC_RDWR != file_intent) { - H5_FAILED_API(); + H5_FAILED(); printf(" received incorrect file intent for file creation\n"); - PART_ERROR_API(H5Fget_intent_file_creation); + PART_ERROR(H5Fget_intent_file_creation); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_intent_file_creation); @@ -1483,28 +1483,28 @@ test_get_file_intent(void) PART_BEGIN(H5Fget_intent_rdonly_file_open) { - TESTING_2_API("H5Fget_intent for file opened read-only"); + TESTING_2("H5Fget_intent for file opened read-only"); /* Test that file intent retrieval works correctly for file open */ if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); - PART_ERROR_API(H5Fget_intent_rdonly_file_open); + PART_ERROR(H5Fget_intent_rdonly_file_open); } if (H5Fget_intent(file_id, &file_intent) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve file intent\n"); - PART_ERROR_API(H5Fget_intent_rdonly_file_open); + PART_ERROR(H5Fget_intent_rdonly_file_open); } if (H5F_ACC_RDONLY != file_intent) { - H5_FAILED_API(); + H5_FAILED(); printf(" received incorrect file intent for read-only file open\n"); - PART_ERROR_API(H5Fget_intent_rdonly_file_open); + PART_ERROR(H5Fget_intent_rdonly_file_open); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_intent_rdonly_file_open); @@ -1519,27 +1519,27 @@ test_get_file_intent(void) PART_BEGIN(H5Fget_intent_rdwrite_file_open) { - TESTING_2_API("H5Fget_intent for file opened read-write"); + TESTING_2("H5Fget_intent for file opened read-write"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); - PART_ERROR_API(H5Fget_intent_rdwrite_file_open); + PART_ERROR(H5Fget_intent_rdwrite_file_open); } if (H5Fget_intent(file_id, &file_intent) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve file intent\n"); - PART_ERROR_API(H5Fget_intent_rdwrite_file_open); + PART_ERROR(H5Fget_intent_rdwrite_file_open); } if (H5F_ACC_RDWR != file_intent) { - H5_FAILED_API(); + H5_FAILED(); printf(" received incorrect file intent\n"); - PART_ERROR_API(H5Fget_intent_rdwrite_file_open); + PART_ERROR(H5Fget_intent_rdwrite_file_open); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_intent_rdwrite_file_open); @@ -1597,7 +1597,7 @@ test_get_file_obj_count(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic or more file, basic dataset, group, stored datatypes, or attribute " "aren't supported with this connector\n"); @@ -1609,56 +1609,56 @@ test_get_file_obj_count(void) TEST_ERROR; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, GET_OBJ_COUNT_TEST_FILENAME1, &prefixed_filename1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if (prefix_filename(test_path_prefix, GET_OBJ_COUNT_TEST_FILENAME2, &prefixed_filename2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename1); goto error; } if ((group_id = H5Gcreate2(file_id, GET_OBJ_COUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", GET_OBJ_COUNT_TEST_GRP_NAME); goto error; } /* Create a second file while keeping the first file open */ if ((file_id2 = H5Fcreate(prefixed_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename2); goto error; } /* Create a named datatype */ if ((named_dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't copy a native datatype\n"); goto error; } if (H5Tcommit2(file_id2, GET_OBJ_COUNT_TEST_NAMED_DTYPE, named_dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit a named datatype\n"); goto error; } /* Create a dataspace for the attribute and dataset */ if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create data space for attribute\n"); goto error; } @@ -1666,7 +1666,7 @@ test_get_file_obj_count(void) /* Create an attribute for the second file */ if ((attr_id = H5Acreate2(file_id2, GET_OBJ_COUNT_TEST_ATTR_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the attribute '%s'\n", GET_OBJ_COUNT_TEST_ATTR_NAME); goto error; } @@ -1674,214 +1674,214 @@ test_get_file_obj_count(void) /* Create a dataset for the second file */ if ((dset_id = H5Dcreate2(file_id2, GET_OBJ_COUNT_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the dataset '%s'\n", GET_OBJ_COUNT_TEST_DSET_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Fget_obj_count_files) { - TESTING_2_API("H5Fget_obj_count for files"); + TESTING_2("H5Fget_obj_count for files"); /* Get the number of files currently opened */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_FILE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the number of open files\n"); - PART_ERROR_API(H5Fget_obj_count_files); + PART_ERROR(H5Fget_obj_count_files); } if (check_open_obj_count(obj_count, 2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open files (%ld) did not match %s expected number (2)\n", obj_count, active_thread_ct > 1 ? "or exceed" : ""); - PART_ERROR_API(H5Fget_obj_count_files); + PART_ERROR(H5Fget_obj_count_files); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_files); PART_BEGIN(H5Fget_obj_count_grps_single_file) { - TESTING_2_API("H5Fget_obj_count for groups in single file"); + TESTING_2("H5Fget_obj_count for groups in single file"); /* Get the number of groups */ if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_GROUP)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve number of open groups\n"); - PART_ERROR_API(H5Fget_obj_count_grps_single_file); + PART_ERROR(H5Fget_obj_count_grps_single_file); } if (obj_count != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open groups (%ld) did not match expected number (1)\n", obj_count); - PART_ERROR_API(H5Fget_obj_count_grps_single_file); + PART_ERROR(H5Fget_obj_count_grps_single_file); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_grps_single_file); PART_BEGIN(H5Fget_obj_count_grps) { - TESTING_2_API("H5Fget_obj_count for groups"); + TESTING_2("H5Fget_obj_count for groups"); /* Get the number of groups in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_GROUP)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the number of open groups\n"); - PART_ERROR_API(H5Fget_obj_count_grps); + PART_ERROR(H5Fget_obj_count_grps); } if (check_open_obj_count(obj_count, 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open groups (%ld) did not match %s expected number (1)\n", obj_count, active_thread_ct > 1 ? "or exceed" : ""); - PART_ERROR_API(H5Fget_obj_count_grps); + PART_ERROR(H5Fget_obj_count_grps); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_grps); PART_BEGIN(H5Fget_obj_count_types) { - TESTING_2_API("H5Fget_obj_count for datatypes"); + TESTING_2("H5Fget_obj_count for datatypes"); /* Get the number of named datatype in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_DATATYPE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the number of open named datatypes\n"); - PART_ERROR_API(H5Fget_obj_count_types); + PART_ERROR(H5Fget_obj_count_types); } if (check_open_obj_count(obj_count, 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open named datatypes (%ld) did not match %s expected number (1)\n", obj_count, active_thread_ct > 1 ? "or exceed" : ""); - PART_ERROR_API(H5Fget_obj_count_types); + PART_ERROR(H5Fget_obj_count_types); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_types); PART_BEGIN(H5Fget_obj_count_attrs) { - TESTING_2_API("H5Fget_obj_count for attributes"); + TESTING_2("H5Fget_obj_count for attributes"); /* Get the number of attribute in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_ATTR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the number of open attributes\n"); - PART_ERROR_API(H5Fget_obj_count_attrs); + PART_ERROR(H5Fget_obj_count_attrs); } if (check_open_obj_count(obj_count, 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open attributes (%ld) did not match %s expected number (1)\n", obj_count, active_thread_ct > 1 ? "or exceed" : ""); - PART_ERROR_API(H5Fget_obj_count_attrs); + PART_ERROR(H5Fget_obj_count_attrs); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_attrs); PART_BEGIN(H5Fget_obj_count_dsets) { - TESTING_2_API("H5Fget_obj_count for datasets"); + TESTING_2("H5Fget_obj_count for datasets"); /* Get the number of dataset in two opened files */ if ((obj_count = H5Fget_obj_count((hid_t)H5F_OBJ_ALL, H5F_OBJ_DATASET)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the number of open datasets\n"); - PART_ERROR_API(H5Fget_obj_count_dsets); + PART_ERROR(H5Fget_obj_count_dsets); } if (check_open_obj_count(obj_count, 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open datasets (%ld) did not match %s expected number (1)\n", obj_count, active_thread_ct > 1 ? "or exceed" : ""); - PART_ERROR_API(H5Fget_obj_count_dsets); + PART_ERROR(H5Fget_obj_count_dsets); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_dsets); PART_BEGIN(H5Fget_obj_count_all_single_file) { - TESTING_2_API("H5Fget_obj_count for all object types in single file"); + TESTING_2("H5Fget_obj_count for all object types in single file"); /* Get the number of all open objects */ if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_ALL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve number of open objects\n"); - PART_ERROR_API(H5Fget_obj_count_all_single_file); + PART_ERROR(H5Fget_obj_count_all_single_file); } /* One for the file and another for the group */ if (obj_count != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open objects (%ld) did not match expected number (2)\n", obj_count); - PART_ERROR_API(H5Fget_obj_count_all_single_file); + PART_ERROR(H5Fget_obj_count_all_single_file); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_all_single_file); PART_BEGIN(H5Fget_obj_count_all) { - TESTING_2_API("H5Fget_obj_count for all object types"); + TESTING_2("H5Fget_obj_count for all object types"); /* Get the number of all open objects */ if ((obj_count = H5Fget_obj_count(H5F_OBJ_ALL, H5F_OBJ_ALL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve number of open objects\n"); - PART_ERROR_API(H5Fget_obj_count_all); + PART_ERROR(H5Fget_obj_count_all); } if (check_open_obj_count(obj_count, 6) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of open objects (%ld) did not match %s expected number (6)\n", obj_count, active_thread_ct > 1 ? "or exceed" : ""); - PART_ERROR_API(H5Fget_obj_count_all); + PART_ERROR(H5Fget_obj_count_all); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_count_all); PART_BEGIN(H5Fget_obj_ids_singular_grp) { - TESTING_2_API("H5Fget_obj_ids for a singular group"); + TESTING_2("H5Fget_obj_ids for a singular group"); if (H5Fget_obj_ids(file_id, H5F_OBJ_GROUP, (size_t)obj_count, &object_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get opened group IDs\n"); - PART_ERROR_API(H5Fget_obj_ids_singular_grp); + PART_ERROR(H5Fget_obj_ids_singular_grp); } if (object_id != group_id) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened object ID (%ld) did not match only currently open group ID (%ld)\n", object_id, group_id); - PART_ERROR_API(H5Fget_obj_ids_singular_grp); + PART_ERROR(H5Fget_obj_ids_singular_grp); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_obj_ids_singular_grp); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -1903,7 +1903,7 @@ test_get_file_obj_count(void) free(prefixed_filename2); prefixed_filename2 = NULL; - PASSED_API(); + PASSED(); return 0; @@ -1941,45 +1941,45 @@ test_file_open_overlap(void) hid_t dset_id = H5I_INVALID_HID; char *prefixed_filename = NULL; - TESTING_API("overlapping file opens"); + TESTING("overlapping file opens"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic or more file, dataset, or group aren't supported with this " "connector\n"); return 0; } if (prefix_filename(test_path_prefix, OVERLAPPING_FILENAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } if ((file_id2 = H5Fopen(prefixed_filename, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", prefixed_filename); goto error; } if ((group_id = H5Gcreate2(file_id, OVERLAPPING_OPEN_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OVERLAPPING_OPEN_TEST_GRP_NAME); goto error; } /* Create a dataspace for the dataset */ if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create data space for dataset\n"); goto error; } @@ -1987,20 +1987,20 @@ test_file_open_overlap(void) /* Create a dataset in the group of the first file */ if ((dset_id = H5Dcreate2(group_id, OVERLAPPING_OPEN_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME); goto error; } /* Get the number of objects opened in the first file: 3 == file + dataset + group */ if ((obj_count = H5Fget_obj_count(file_id, H5F_OBJ_LOCAL | H5F_OBJ_ALL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve the number of objects opened in the file\n"); goto error; } if (obj_count != 3) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of objects opened in file (%ld) did not match expected number (3)\n", obj_count); goto error; } @@ -2015,20 +2015,20 @@ test_file_open_overlap(void) /* Create a dataset in the second file */ if ((dset_id = H5Dcreate2(file_id2, OVERLAPPING_OPEN_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the dataset '%s'\n", OVERLAPPING_OPEN_TEST_DSET_NAME); goto error; } /* Get the number of objects opened in the first file: 2 == file + dataset */ if ((obj_count = H5Fget_obj_count(file_id2, H5F_OBJ_ALL)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve the number of objects opened in the file\n"); goto error; } if (obj_count != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of objects opened in the file (%ld) did not match expected number (2)\n", obj_count); goto error; @@ -2044,7 +2044,7 @@ test_file_open_overlap(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; @@ -2076,51 +2076,51 @@ test_file_mounts(void) hid_t group_id = H5I_INVALID_HID; char *prefixed_filename = NULL; - TESTING_API("file mounting/unmounting"); + TESTING("file mounting/unmounting"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_MOUNT) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, file mount, or basic group aren't supported with this " "connector\n"); return 0; } if (prefix_filename(test_path_prefix, FILE_MOUNT_TEST_FILENAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } if ((group_id = H5Gcreate2(file_id, FILE_MOUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", FILE_MOUNT_TEST_GRP_NAME); goto error; } if ((child_fid = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } /* Mount one file (child_fid) to the group of another file (file_id) */ if (H5Fmount(file_id, FILE_MOUNT_TEST_GRP_NAME, child_fid, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't mount file\n"); goto error; } if (H5Funmount(file_id, FILE_MOUNT_TEST_GRP_NAME) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't mount file\n"); goto error; } @@ -2135,7 +2135,7 @@ test_file_mounts(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; @@ -2176,23 +2176,23 @@ test_get_file_name(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic or more file, basic dataset, group, stored datatypes, or attribute " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, GET_FILE_NAME_TEST_FNAME, &prefixed_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't prefix filename\n"); goto error; } if ((file_id = H5Fcreate(prefixed_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", prefixed_filename); goto error; } @@ -2205,59 +2205,59 @@ test_get_file_name(void) if (NULL == (file_name_buf = (char *)malloc((size_t)file_name_buf_len + 1))) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Fget_name_file_id) { - TESTING_2_API("H5Fget_name using file ID"); + TESTING_2("H5Fget_name using file ID"); memset(file_name_buf, 0, (size_t)file_name_buf_len); /* Retrieve the actual file name */ if (H5Fget_name(file_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get file name %s\n", prefixed_filename); - PART_ERROR_API(H5Fget_name_file_id); + PART_ERROR(H5Fget_name_file_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { - H5_FAILED_API(); + H5_FAILED(); printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, prefixed_filename); - PART_ERROR_API(H5Fget_name_file_id); + PART_ERROR(H5Fget_name_file_id); } - PASSED_API(); + PASSED(); } PART_END(H5Fget_name_file_id); PART_BEGIN(H5Fget_name_grp_id) { - TESTING_2_API("H5Fget_name using non-root group ID"); + TESTING_2("H5Fget_name using non-root group ID"); /* Attempt to retrieve the name of the file from an object that isn't the root group */ memset(file_name_buf, 0, (size_t)file_name_buf_len); if ((group_id = H5Gcreate2(file_id, GET_FILE_NAME_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create group '%s'\n", GET_FILE_NAME_TEST_GRP_NAME); - PART_ERROR_API(H5Fget_name_grp_id); + PART_ERROR(H5Fget_name_grp_id); } if (H5Fget_name(group_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get file name %s\n", prefixed_filename); - PART_ERROR_API(H5Fget_name_grp_id); + PART_ERROR(H5Fget_name_grp_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { - H5_FAILED_API(); + H5_FAILED(); printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, prefixed_filename); - PART_ERROR_API(H5Fget_name_grp_id); + PART_ERROR(H5Fget_name_grp_id); } if (group_id >= 0) { @@ -2269,40 +2269,40 @@ test_get_file_name(void) group_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Fget_name_grp_id); PART_BEGIN(H5Fget_name_dset_id) { - TESTING_2_API("H5Fget_name using dataset ID"); + TESTING_2("H5Fget_name using dataset ID"); if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataspace\n"); - PART_ERROR_API(H5Fget_name_dset_id); + PART_ERROR(H5Fget_name_dset_id); } /* Create a dataset in the file */ if ((dset_id = H5Dcreate2(file_id, GET_FILE_NAME_TEST_DSET_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the dataset '%s'\n", GET_FILE_NAME_TEST_DSET_NAME); - PART_ERROR_API(H5Fget_name_dset_id); + PART_ERROR(H5Fget_name_dset_id); } /* Get and verify file name from the dataset */ if (H5Fget_name(dset_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get file name %s\n", prefixed_filename); - PART_ERROR_API(H5Fget_name_dset_id); + PART_ERROR(H5Fget_name_dset_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { - H5_FAILED_API(); + H5_FAILED(); printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, prefixed_filename); - PART_ERROR_API(H5Fget_name_dset_id); + PART_ERROR(H5Fget_name_dset_id); } if (dspace_id >= 0) { @@ -2322,40 +2322,40 @@ test_get_file_name(void) dset_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Fget_name_dset_id); PART_BEGIN(H5Fget_name_attr_id) { - TESTING_2_API("H5Fget_name using attribute ID"); + TESTING_2("H5Fget_name using attribute ID"); if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataspace\n"); - PART_ERROR_API(H5Fget_name_attr_id); + PART_ERROR(H5Fget_name_attr_id); } /* Create an attribute for the dataset */ if ((attr_id = H5Acreate2(file_id, GET_FILE_NAME_TEST_ATTR_NAME, H5T_NATIVE_INT, dspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create the attribute '%s'\n", GET_FILE_NAME_TEST_ATTR_NAME); - PART_ERROR_API(H5Fget_name_attr_id); + PART_ERROR(H5Fget_name_attr_id); } /* Get and verify file name from the attribute */ if (H5Fget_name(attr_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get file name %s\n", prefixed_filename); - PART_ERROR_API(H5Fget_name_attr_id); + PART_ERROR(H5Fget_name_attr_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { - H5_FAILED_API(); + H5_FAILED(); printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, prefixed_filename); - PART_ERROR_API(H5Fget_name_attr_id); + PART_ERROR(H5Fget_name_attr_id); } if (dspace_id >= 0) { @@ -2375,40 +2375,40 @@ test_get_file_name(void) attr_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Fget_name_attr_id); PART_BEGIN(H5Fget_name_dtype_id) { - TESTING_2_API("H5Fget_name using committed datatype ID"); + TESTING_2("H5Fget_name using committed datatype ID"); /* Create a named datatype */ if ((named_dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't copy a native datatype\n"); - PART_ERROR_API(H5Fget_name_dtype_id); + PART_ERROR(H5Fget_name_dtype_id); } if (H5Tcommit2(file_id, GET_FILE_NAME_TEST_NAMED_DTYPE, named_dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit a named datatype\n"); - PART_ERROR_API(H5Fget_name_dtype_id); + PART_ERROR(H5Fget_name_dtype_id); } /* Get and verify file name from the committed datatype */ if (H5Fget_name(named_dtype_id, file_name_buf, (size_t)file_name_buf_len + 1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get file name %s\n", prefixed_filename); - PART_ERROR_API(H5Fget_name_dtype_id); + PART_ERROR(H5Fget_name_dtype_id); } if (HDstrncmp(file_name_buf, prefixed_filename, (size_t)file_name_buf_len)) { - H5_FAILED_API(); + H5_FAILED(); printf(" file name '%s' didn't match expected name '%s'\n", file_name_buf, prefixed_filename); - PART_ERROR_API(H5Fget_name_dtype_id); + PART_ERROR(H5Fget_name_dtype_id); } if (named_dtype_id >= 0) { @@ -2420,7 +2420,7 @@ test_get_file_name(void) named_dtype_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Fget_name_dtype_id); @@ -2428,12 +2428,12 @@ test_get_file_name(void) { ssize_t name_len = 0; - TESTING_2_API("invalid H5Fget_name using dataspace ID"); + TESTING_2("invalid H5Fget_name using dataspace ID"); if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataspace\n"); - PART_ERROR_API(H5Fget_name_dspace_id); + PART_ERROR(H5Fget_name_dspace_id); } /* Try get file name from data space. Supposed to fail because @@ -2445,9 +2445,9 @@ test_get_file_name(void) H5E_END_TRY if (name_len >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved file name using H5Fget_name on a dataspace ID!\n"); - PART_ERROR_API(H5Fget_name_dspace_id); + PART_ERROR(H5Fget_name_dspace_id); } if (dspace_id >= 0) { @@ -2459,13 +2459,13 @@ test_get_file_name(void) dspace_id = H5I_INVALID_HID; } - PASSED_API(); + PASSED(); } PART_END(H5Fget_name_dspace_id); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (file_name_buf) { free(file_name_buf); @@ -2478,7 +2478,7 @@ test_get_file_name(void) free(prefixed_filename); prefixed_filename = NULL; - PASSED_API(); + PASSED(); return 0; diff --git a/test/API/H5_api_group_test.c b/test/API/H5_api_group_test.c index a139e6bf61c..ff07e879bf8 100644 --- a/test/API/H5_api_group_test.c +++ b/test/API/H5_api_group_test.c @@ -65,17 +65,17 @@ test_create_group_under_root(void) hid_t file_id = H5I_INVALID_HID; hid_t parent_gid = H5I_INVALID_HID; - TESTING_API("creation of group under the root group"); + TESTING("creation of group under the root group"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } @@ -83,7 +83,7 @@ test_create_group_under_root(void) /* Create the group under the root group of the file */ if ((parent_gid = H5Gcreate2(file_id, GROUP_CREATE_UNDER_ROOT_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", GROUP_CREATE_UNDER_ROOT_GNAME); goto error; } @@ -93,7 +93,7 @@ test_create_group_under_root(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -119,24 +119,24 @@ test_create_group_under_existing_group(void) hid_t parent_group_id = H5I_INVALID_HID, child_group_id = H5I_INVALID_HID, grandchild_group_id = H5I_INVALID_HID; - TESTING_API("creation of group under existing group using a relative path"); + TESTING("creation of group under existing group using a relative path"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } /* Open the already-existing group (/group_tests) in the file as the parent */ if ((parent_group_id = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group\n"); goto error; } @@ -145,7 +145,7 @@ test_create_group_under_existing_group(void) * path */ if ((child_group_id = H5Gcreate2(parent_group_id, GROUP_CREATE_UNDER_GROUP_REL_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group using relative path: %s\n", GROUP_CREATE_UNDER_GROUP_REL_GNAME); goto error; } @@ -154,7 +154,7 @@ test_create_group_under_existing_group(void) * absolute path */ if ((grandchild_group_id = H5Gcreate2(parent_group_id, GROUP_CREATE_UNDER_GROUP_ABS_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group using absolute path: %s\n", GROUP_CREATE_UNDER_GROUP_ABS_GNAME); goto error; } @@ -168,7 +168,7 @@ test_create_group_under_existing_group(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -197,30 +197,30 @@ test_create_many_groups(void) char group_name[NAME_BUF_SIZE]; unsigned i; - TESTING_API("H5Gcreate many groups"); + TESTING("H5Gcreate many groups"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((parent_group_id = H5Gcreate2(container_group, MANY_GROUP_CREATIONS_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MANY_GROUP_CREATIONS_GNAME); goto error; } @@ -232,7 +232,7 @@ test_create_many_groups(void) sprintf(group_name, "group %02u", i); if ((child_group_id = H5Gcreate2(parent_group_id, group_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", group_name); goto error; } @@ -248,7 +248,7 @@ test_create_many_groups(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -275,23 +275,23 @@ test_create_deep_groups(void) hid_t container_group = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; - TESTING_API("H5Gcreate groups of great depths"); + TESTING("H5Gcreate groups of great depths"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } @@ -299,7 +299,7 @@ test_create_deep_groups(void) /* Create the group under the root group of the file */ if ((group_id = H5Gcreate2(container_group, DEEP_GROUP_CREATIONS_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", DEEP_GROUP_CREATIONS_GNAME); goto error; } @@ -315,7 +315,7 @@ test_create_deep_groups(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -348,7 +348,7 @@ create_group_recursive(hid_t parent_gid, unsigned counter) else sprintf(gname, "%dth_child_group", counter + 1); if ((child_gid = H5Gcreate2(parent_gid, gname, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", gname); goto error; } @@ -384,23 +384,23 @@ test_create_intermediate_group(void) hid_t group_id = H5I_INVALID_HID; hid_t crt_intmd_lcpl_id = H5I_INVALID_HID; - TESTING_API("H5Gcreate group with intermediate group creation"); + TESTING("H5Gcreate group with intermediate group creation"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } @@ -504,7 +504,7 @@ test_create_intermediate_group(void) if (H5Pclose(crt_intmd_lcpl_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -535,26 +535,26 @@ test_create_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gcreate_invalid_loc_id) { - TESTING_2_API("H5Gcreate with an invalid loc_id"); + TESTING_2("H5Gcreate with an invalid loc_id"); H5E_BEGIN_TRY { @@ -564,19 +564,19 @@ test_create_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created group with invalid loc_id!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gcreate_invalid_loc_id); + PART_ERROR(H5Gcreate_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_invalid_loc_id); PART_BEGIN(H5Gcreate_invalid_grp_name) { - TESTING_2_API("H5Gcreate with an invalid group name"); + TESTING_2("H5Gcreate with an invalid group name"); H5E_BEGIN_TRY { @@ -585,10 +585,10 @@ test_create_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created group with a NULL name!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gcreate_invalid_grp_name); + PART_ERROR(H5Gcreate_invalid_grp_name); } H5E_BEGIN_TRY @@ -598,19 +598,19 @@ test_create_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created group with an invalid group name of ''!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gcreate_invalid_grp_name); + PART_ERROR(H5Gcreate_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_invalid_grp_name); PART_BEGIN(H5Gcreate_invalid_lcpl) { - TESTING_2_API("H5Gcreate with an invalid LCPL"); + TESTING_2("H5Gcreate with an invalid LCPL"); H5E_BEGIN_TRY { @@ -620,19 +620,19 @@ test_create_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created group with invalid LCPL!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gcreate_invalid_lcpl); + PART_ERROR(H5Gcreate_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_invalid_lcpl); PART_BEGIN(H5Gcreate_invalid_gcpl) { - TESTING_2_API("H5Gcreate with an invalid GCPL"); + TESTING_2("H5Gcreate with an invalid GCPL"); H5E_BEGIN_TRY { @@ -642,19 +642,19 @@ test_create_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created group with invalid GCPL!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gcreate_invalid_gcpl); + PART_ERROR(H5Gcreate_invalid_gcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_invalid_gcpl); PART_BEGIN(H5Gcreate_invalid_gapl) { - TESTING_2_API("H5Gcreate with an invalid GAPL"); + TESTING_2("H5Gcreate with an invalid GAPL"); H5E_BEGIN_TRY { @@ -664,24 +664,24 @@ test_create_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created group with invalid GAPL!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gcreate_invalid_gapl); + PART_ERROR(H5Gcreate_invalid_gapl); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_invalid_gapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -706,29 +706,29 @@ test_create_anonymous_group(void) hid_t file_id = H5I_INVALID_HID; hid_t container_group = H5I_INVALID_HID, new_group_id = H5I_INVALID_HID; - TESTING_API("creation of anonymous group"); + TESTING("creation of anonymous group"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group\n"); goto error; } if ((new_group_id = H5Gcreate_anon(file_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create anonymous group\n"); goto error; } @@ -740,7 +740,7 @@ test_create_anonymous_group(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -770,32 +770,32 @@ test_create_anonymous_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gcreate_anon_invalid_loc_id) { - TESTING_2_API("H5Gcreate_anon with an invalid loc_id"); + TESTING_2("H5Gcreate_anon with an invalid loc_id"); H5E_BEGIN_TRY { @@ -804,19 +804,19 @@ test_create_anonymous_group_invalid_params(void) H5E_END_TRY if (new_group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous group with invalid loc_id!\n"); H5Gclose(new_group_id); - PART_ERROR_API(H5Gcreate_anon_invalid_loc_id); + PART_ERROR(H5Gcreate_anon_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_anon_invalid_loc_id); PART_BEGIN(H5Gcreate_anon_invalid_gcpl) { - TESTING_2_API("H5Gcreate_anon with an invalid GCPL"); + TESTING_2("H5Gcreate_anon with an invalid GCPL"); H5E_BEGIN_TRY { @@ -825,19 +825,19 @@ test_create_anonymous_group_invalid_params(void) H5E_END_TRY if (new_group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous group with invalid GCPL!\n"); H5Gclose(new_group_id); - PART_ERROR_API(H5Gcreate_anon_invalid_gcpl); + PART_ERROR(H5Gcreate_anon_invalid_gcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_anon_invalid_gcpl); PART_BEGIN(H5Gcreate_anon_invalid_gapl) { - TESTING_2_API("H5Gcreate_anon with an invalid GAPL"); + TESTING_2("H5Gcreate_anon with an invalid GAPL"); H5E_BEGIN_TRY { @@ -846,26 +846,26 @@ test_create_anonymous_group_invalid_params(void) H5E_END_TRY if (new_group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created anonymous group with invalid GAPL!\n"); H5Gclose(new_group_id); - PART_ERROR_API(H5Gcreate_anon_invalid_gapl); + PART_ERROR(H5Gcreate_anon_invalid_gapl); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_anon_invalid_gapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(container_group) < 0) TEST_ERROR; if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -891,17 +891,17 @@ test_open_nonexistent_group(void) hid_t file_id = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; - TESTING_API("for invalid opening of a nonexistent group"); + TESTING("for invalid opening of a nonexistent group"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } @@ -913,7 +913,7 @@ test_open_nonexistent_group(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened non-existent group!\n"); goto error; } @@ -921,7 +921,7 @@ test_open_nonexistent_group(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -950,26 +950,26 @@ test_open_group_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gopen_invalid_loc_id) { - TESTING_2_API("H5Gopen with an invalid loc_id"); + TESTING_2("H5Gopen with an invalid loc_id"); H5E_BEGIN_TRY { @@ -978,19 +978,19 @@ test_open_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened group using an invalid loc_id!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gopen_invalid_loc_id); + PART_ERROR(H5Gopen_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Gopen_invalid_loc_id); PART_BEGIN(H5Gopen_invalid_grp_name) { - TESTING_2_API("H5Gopen with an invalid group name"); + TESTING_2("H5Gopen with an invalid group name"); H5E_BEGIN_TRY { @@ -999,10 +999,10 @@ test_open_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened group using a NULL name!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gopen_invalid_grp_name); + PART_ERROR(H5Gopen_invalid_grp_name); } H5E_BEGIN_TRY @@ -1012,19 +1012,19 @@ test_open_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened group using an invalid name of ''!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gopen_invalid_grp_name); + PART_ERROR(H5Gopen_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Gopen_invalid_grp_name); PART_BEGIN(H5Gopen_invalid_gapl) { - TESTING_2_API("H5Gopen with an invalid GAPL"); + TESTING_2("H5Gopen with an invalid GAPL"); H5E_BEGIN_TRY { @@ -1033,24 +1033,24 @@ test_open_group_invalid_params(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened group using an invalid GAPL!\n"); H5Gclose(group_id); - PART_ERROR_API(H5Gopen_invalid_gapl); + PART_ERROR(H5Gopen_invalid_gapl); } - PASSED_API(); + PASSED(); } PART_END(H5Gopen_invalid_gapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1074,11 +1074,11 @@ test_close_group_invalid_id(void) { herr_t err_ret = -1; - TESTING_API("H5Gclose with an invalid group ID"); + TESTING("H5Gclose with an invalid group ID"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic group aren't supported with this connector\n"); return 0; } @@ -1090,12 +1090,12 @@ test_close_group_invalid_id(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" close a group with an invalid ID!\n"); goto error; } - PASSED_API(); + PASSED(); return 0; @@ -1122,34 +1122,34 @@ test_group_property_lists(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GET_PLIST) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, property list, or creation order aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((gcpl_id1 = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id1, dummy_prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set property on GCPL\n"); goto error; } @@ -1157,7 +1157,7 @@ test_group_property_lists(void) /* Create the group in the file */ if ((group_id1 = H5Gcreate2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME1, H5P_DEFAULT, gcpl_id1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group\n"); goto error; } @@ -1165,7 +1165,7 @@ test_group_property_lists(void) /* Create the second group using H5P_DEFAULT for the GCPL */ if ((group_id2 = H5Gcreate2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group\n"); goto error; } @@ -1173,63 +1173,63 @@ test_group_property_lists(void) if (H5Pclose(gcpl_id1) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gget_create_plist) { - TESTING_2_API("H5Gget_create_plist"); + TESTING_2("H5Gget_create_plist"); /* Try to retrieve copies of the two property lists, one which has the property set and one which * does not */ if ((gcpl_id1 = H5Gget_create_plist(group_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get GCPL\n"); - PART_ERROR_API(H5Gget_create_plist); + PART_ERROR(H5Gget_create_plist); } if ((gcpl_id2 = H5Gget_create_plist(group_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get GCPL\n"); - PART_ERROR_API(H5Gget_create_plist); + PART_ERROR(H5Gget_create_plist); } /* Ensure that property list 1 has the property set and property list 2 does not */ dummy_prop_val = 0; if (H5Pget_link_creation_order(gcpl_id1, &dummy_prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve GCPL property value\n"); - PART_ERROR_API(H5Gget_create_plist); + PART_ERROR(H5Gget_create_plist); } if (dummy_prop_val != GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved GCPL property value '%llu' did not match expected value '%llu'\n", (unsigned long long)dummy_prop_val, (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); - PART_ERROR_API(H5Gget_create_plist); + PART_ERROR(H5Gget_create_plist); } dummy_prop_val = 0; if (H5Pget_link_creation_order(gcpl_id2, &dummy_prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve GCPL property value\n"); - PART_ERROR_API(H5Gget_create_plist); + PART_ERROR(H5Gget_create_plist); } if (dummy_prop_val == GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved GCPL property value '%llu' matched control value '%llu' when it " "shouldn't have\n", (unsigned long long)dummy_prop_val, (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); - PART_ERROR_API(H5Gget_create_plist); + PART_ERROR(H5Gget_create_plist); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_create_plist); @@ -1273,75 +1273,75 @@ test_group_property_lists(void) PART_BEGIN(H5Gget_create_plist_reopened) { - TESTING_2_API("H5Gget_create_plist after re-opening a group"); + TESTING_2("H5Gget_create_plist after re-opening a group"); if ((group_id1 = H5Gopen2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group\n"); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } if ((group_id2 = H5Gopen2(container_group, GROUP_PROPERTY_LIST_TEST_GROUP_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group\n"); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } if ((gcpl_id1 = H5Gget_create_plist(group_id1)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } if ((gcpl_id2 = H5Gget_create_plist(group_id2)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get property list\n"); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } /* Re-check the property values */ dummy_prop_val = 0; if (H5Pget_link_creation_order(gcpl_id1, &dummy_prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve GCPL property value\n"); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } if (dummy_prop_val != GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved GCPL property value '%llu' did not match expected value '%llu'\n", (unsigned long long)dummy_prop_val, (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } dummy_prop_val = 0; if (H5Pget_link_creation_order(gcpl_id2, &dummy_prop_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve GCPL property value\n"); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } if (dummy_prop_val == GROUP_PROPERTY_LIST_TEST_DUMMY_VAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved GCPL property value '%llu' matched control value '%llu' when it " "shouldn't have\n", (unsigned long long)dummy_prop_val, (unsigned long long)GROUP_PROPERTY_LIST_TEST_DUMMY_VAL); - PART_ERROR_API(H5Gget_create_plist_reopened); + PART_ERROR(H5Gget_create_plist_reopened); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_create_plist_reopened); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id1) < 0) TEST_ERROR; @@ -1356,7 +1356,7 @@ test_group_property_lists(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1394,34 +1394,34 @@ test_get_group_info(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or group aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -1429,7 +1429,7 @@ test_get_group_info(void) if ((parent_group_id = H5Gcreate2(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", GROUP_GET_INFO_TEST_GROUP_NAME); goto error; } @@ -1441,7 +1441,7 @@ test_get_group_info(void) (unsigned)(GROUP_GET_INFO_TEST_GROUP_NUMB - i - 1)); if ((group_id = H5Gcreate2(parent_group_id, group_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", group_name); goto error; } @@ -1450,28 +1450,28 @@ test_get_group_info(void) TEST_ERROR; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gget_info) { - TESTING_2_API("retrieval of group info with H5Gget_info"); + TESTING_2("retrieval of group info with H5Gget_info"); memset(&group_info, 0, sizeof(group_info)); /* Retrieve information about the parent group */ if (H5Gget_info(parent_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get group info\n"); - PART_ERROR_API(H5Gget_info); + PART_ERROR(H5Gget_info); } if (group_info.nlinks != GROUP_GET_INFO_TEST_GROUP_NUMB) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's number of links '%lu' doesn't match expected value '%u'\n", group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB); - PART_ERROR_API(H5Gget_info); + PART_ERROR(H5Gget_info); } /* @@ -1479,10 +1479,10 @@ test_get_group_info(void) * the number of links in the group. */ if (group_info.max_corder != GROUP_GET_INFO_TEST_GROUP_NUMB) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's max creation order '%lld' doesn't match expected value '%lld'\n", (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB); - PART_ERROR_API(H5Gget_info); + PART_ERROR(H5Gget_info); } /* Ensure that the storage_type field is at least set to a meaningful value */ @@ -1490,41 +1490,41 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_COMPACT && group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Gget_info); + PART_ERROR(H5Gget_info); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); - PART_ERROR_API(H5Gget_info); + PART_ERROR(H5Gget_info); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info); PART_BEGIN(H5Gget_info_by_name) { - TESTING_2_API("retrieval of group info with H5Gget_info_by_name"); + TESTING_2("retrieval of group info with H5Gget_info_by_name"); memset(&group_info, 0, sizeof(group_info)); /* Retrieve information about the parent group */ if (H5Gget_info_by_name(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, &group_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get group info by name\n"); - PART_ERROR_API(H5Gget_info_by_name); + PART_ERROR(H5Gget_info_by_name); } if (group_info.nlinks != GROUP_GET_INFO_TEST_GROUP_NUMB) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's number of links '%lu' doesn't match expected value '%u'\n", group_info.nlinks, (unsigned int)GROUP_GET_INFO_TEST_GROUP_NUMB); - PART_ERROR_API(H5Gget_info_by_name); + PART_ERROR(H5Gget_info_by_name); } /* @@ -1532,10 +1532,10 @@ test_get_group_info(void) * the number of links in the group. */ if (group_info.max_corder != GROUP_GET_INFO_TEST_GROUP_NUMB) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's max creation order '%lld' doesn't match expected value '%lld'\n", (long long)group_info.max_corder, (long long)GROUP_GET_INFO_TEST_GROUP_NUMB); - PART_ERROR_API(H5Gget_info_by_name); + PART_ERROR(H5Gget_info_by_name); } /* Ensure that the storage_type field is at least set to a meaningful value */ @@ -1543,28 +1543,28 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_COMPACT && group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Gget_info_by_name); + PART_ERROR(H5Gget_info_by_name); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); - PART_ERROR_API(H5Gget_info_by_name); + PART_ERROR(H5Gget_info_by_name); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_name); PART_BEGIN(H5Gget_info_by_idx_crt_order_increasing) { - TESTING_2_API("H5Gget_info_by_idx by creation order in increasing order"); + TESTING_2("H5Gget_info_by_idx by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Gget_info_by_idx_crt_order_increasing); } @@ -1575,23 +1575,23 @@ test_get_group_info(void) /* Retrieve information about each group under the parent group */ if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get group info for group at index %u\n", i); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } if (group_info.nlinks != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's number of links '%lu' doesn't match expected value '%d'\n", group_info.nlinks, 0); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } if (group_info.max_corder != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", (long long)group_info.max_corder, 0); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } /* Ensure that the storage_type field is at least set to a meaningful value */ @@ -1599,29 +1599,29 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_COMPACT && group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_increasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_increasing); } } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_crt_order_increasing); PART_BEGIN(H5Gget_info_by_idx_crt_order_decreasing) { - TESTING_2_API("H5Gget_info_by_idx by creation order in decreasing order"); + TESTING_2("H5Gget_info_by_idx by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Gget_info_by_idx_crt_order_decreasing); } @@ -1632,23 +1632,23 @@ test_get_group_info(void) /* Retrieve information about each group under the parent group */ if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get group info for group at index %u\n", i); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } if (group_info.nlinks != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's number of links '%lu' doesn't match expected value '%d'\n", group_info.nlinks, 0); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } if (group_info.max_corder != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", (long long)group_info.max_corder, 0); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } /* Ensure that the storage_type field is at least set to a meaningful value */ @@ -1656,26 +1656,26 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_COMPACT && group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); - PART_ERROR_API(H5Gget_info_by_idx_crt_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_crt_order_decreasing); } } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_crt_order_decreasing); PART_BEGIN(H5Gget_info_by_idx_name_order_increasing) { - TESTING_2_API("H5Gget_info_by_idx by alphabetical order in increasing order"); + TESTING_2("H5Gget_info_by_idx by alphabetical order in increasing order"); for (i = 0; i < GROUP_GET_INFO_TEST_GROUP_NUMB; i++) { memset(&group_info, 0, sizeof(group_info)); @@ -1683,23 +1683,23 @@ test_get_group_info(void) /* Retrieve information about each group under the parent group */ if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get group info for group at index %u\n", i); - PART_ERROR_API(H5Gget_info_by_idx_name_order_increasing); + PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } if (group_info.nlinks != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's number of links '%lu' doesn't match expected value '%d'\n", group_info.nlinks, 0); - PART_ERROR_API(H5Gget_info_by_idx_name_order_increasing); + PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } if (group_info.max_corder != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", (long long)group_info.max_corder, 0); - PART_ERROR_API(H5Gget_info_by_idx_name_order_increasing); + PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } /* Ensure that the storage_type field is at least set to a meaningful value */ @@ -1707,26 +1707,26 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_COMPACT && group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Gget_info_by_idx_name_order_increasing); + PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); - PART_ERROR_API(H5Gget_info_by_idx_name_order_increasing); + PART_ERROR(H5Gget_info_by_idx_name_order_increasing); } } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_name_order_increasing); PART_BEGIN(H5Gget_info_by_idx_name_order_decreasing) { - TESTING_2_API("H5Gget_info_by_idx by alphabetical order in decreasing order"); + TESTING_2("H5Gget_info_by_idx by alphabetical order in decreasing order"); for (i = 0; i < GROUP_GET_INFO_TEST_GROUP_NUMB; i++) { memset(&group_info, 0, sizeof(group_info)); @@ -1734,23 +1734,23 @@ test_get_group_info(void) /* Retrieve information about each group under the parent group */ if (H5Gget_info_by_idx(container_group, GROUP_GET_INFO_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, (hsize_t)i, &group_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get group info for group at index %u\n", i); - PART_ERROR_API(H5Gget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } if (group_info.nlinks != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's number of links '%" PRIuHSIZE "' doesn't match expected value '%d'\n", group_info.nlinks, 0); - PART_ERROR_API(H5Gget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } if (group_info.max_corder != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's max creation order '%lld' doesn't match expected value '%d'\n", (long long)group_info.max_corder, 0); - PART_ERROR_API(H5Gget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } /* Ensure that the storage_type field is at least set to a meaningful value */ @@ -1758,26 +1758,26 @@ test_get_group_info(void) group_info.storage_type != H5G_STORAGE_TYPE_COMPACT && group_info.storage_type != H5G_STORAGE_TYPE_DENSE && group_info.storage_type != H5G_STORAGE_TYPE_UNKNOWN) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'storage_type' field wasn't set to a meaningful value\n"); - PART_ERROR_API(H5Gget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } /* Assume that mounted should be FALSE in this case */ if (group_info.mounted != FALSE) { - H5_FAILED_API(); + H5_FAILED(); printf(" group info's 'mounted' field was TRUE when it should have been FALSE\n"); - PART_ERROR_API(H5Gget_info_by_idx_name_order_decreasing); + PART_ERROR(H5Gget_info_by_idx_name_order_decreasing); } } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_name_order_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -1788,7 +1788,7 @@ test_get_group_info(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1821,27 +1821,27 @@ test_get_group_info_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, or more group aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gget_info_invalid_loc_id) { - TESTING_2_API("H5Gget_info with an invalid loc_id"); + TESTING_2("H5Gget_info with an invalid loc_id"); H5E_BEGIN_TRY { @@ -1850,18 +1850,18 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info with an invalid loc_id!\n"); - PART_ERROR_API(H5Gget_info_invalid_loc_id); + PART_ERROR(H5Gget_info_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_invalid_loc_id); PART_BEGIN(H5Gget_info_invalid_grp_info_pointer) { - TESTING_2_API("H5Gget_info with an invalid group info pointer"); + TESTING_2("H5Gget_info with an invalid group info pointer"); H5E_BEGIN_TRY { @@ -1870,18 +1870,18 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info with invalid group info pointer!\n"); - PART_ERROR_API(H5Gget_info_invalid_grp_info_pointer); + PART_ERROR(H5Gget_info_invalid_grp_info_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_invalid_grp_info_pointer); PART_BEGIN(H5Gget_info_by_name_invalid_loc_id) { - TESTING_2_API("H5Gget_info_by_name with an invalid loc_id"); + TESTING_2("H5Gget_info_by_name with an invalid loc_id"); H5E_BEGIN_TRY { @@ -1890,18 +1890,18 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_name with an invalid loc_id!\n"); - PART_ERROR_API(H5Gget_info_by_name_invalid_loc_id); + PART_ERROR(H5Gget_info_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_name_invalid_loc_id); PART_BEGIN(H5Gget_info_by_name_invalid_grp_name) { - TESTING_2_API("H5Gget_info_by_name with an invalid group name"); + TESTING_2("H5Gget_info_by_name with an invalid group name"); H5E_BEGIN_TRY { @@ -1910,9 +1910,9 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_name with a NULL name!\n"); - PART_ERROR_API(H5Gget_info_by_name_invalid_grp_name); + PART_ERROR(H5Gget_info_by_name_invalid_grp_name); } H5E_BEGIN_TRY @@ -1922,18 +1922,18 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_name with an invalid name of ''!\n"); - PART_ERROR_API(H5Gget_info_by_name_invalid_grp_name); + PART_ERROR(H5Gget_info_by_name_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_name_invalid_grp_name); PART_BEGIN(H5Gget_info_by_name_invalid_grp_info_pointer) { - TESTING_2_API("H5Gget_info_by_name with an invalid group info pointer"); + TESTING_2("H5Gget_info_by_name with an invalid group info pointer"); H5E_BEGIN_TRY { @@ -1942,19 +1942,19 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_name with an invalid group info " "pointer!\n"); - PART_ERROR_API(H5Gget_info_by_name_invalid_grp_info_pointer); + PART_ERROR(H5Gget_info_by_name_invalid_grp_info_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_name_invalid_grp_info_pointer); PART_BEGIN(H5Gget_info_by_name_invalid_lapl) { - TESTING_2_API("H5Gget_info_by_name with an invalid LAPL"); + TESTING_2("H5Gget_info_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -1963,18 +1963,18 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_name with an invalid LAPL!\n"); - PART_ERROR_API(H5Gget_info_by_name_invalid_lapl); + PART_ERROR(H5Gget_info_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_name_invalid_lapl); PART_BEGIN(H5Gget_info_by_idx_invalid_loc_id) { - TESTING_2_API("H5Gget_info_by_idx with an invalid loc_id"); + TESTING_2("H5Gget_info_by_idx with an invalid loc_id"); H5E_BEGIN_TRY { @@ -1984,18 +1984,18 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with an invalid loc_id!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_loc_id); + PART_ERROR(H5Gget_info_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_invalid_loc_id); PART_BEGIN(H5Gget_info_by_idx_invalid_grp_name) { - TESTING_2_API("H5Gget_info_by_idx with an invalid group name"); + TESTING_2("H5Gget_info_by_idx with an invalid group name"); H5E_BEGIN_TRY { @@ -2005,9 +2005,9 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with a NULL group name!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_grp_name); + PART_ERROR(H5Gget_info_by_idx_invalid_grp_name); } H5E_BEGIN_TRY @@ -2018,19 +2018,19 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with an invalid group name of " "''!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_grp_name); + PART_ERROR(H5Gget_info_by_idx_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_invalid_grp_name); PART_BEGIN(H5Gget_info_by_idx_invalid_index_type) { - TESTING_2_API("H5Gget_info_by_idx with an invalid index type"); + TESTING_2("H5Gget_info_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -2040,10 +2040,10 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with invalid index type " "H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_index_type); + PART_ERROR(H5Gget_info_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -2054,19 +2054,19 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with invalid index type " "H5_INDEX_N!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_index_type); + PART_ERROR(H5Gget_info_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_invalid_index_type); PART_BEGIN(H5Gget_info_by_idx_invalid_iter_order) { - TESTING_2_API("H5Gget_info_by_idx with an invalid iteration order"); + TESTING_2("H5Gget_info_by_idx with an invalid iteration order"); H5E_BEGIN_TRY { @@ -2076,10 +2076,10 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with invalid iteration order " "H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_iter_order); + PART_ERROR(H5Gget_info_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -2090,19 +2090,19 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with invalid iteration order " "H5_ITER_N!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_iter_order); + PART_ERROR(H5Gget_info_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_invalid_iter_order); PART_BEGIN(H5Gget_info_by_idx_invalid_grp_info_pointer) { - TESTING_2_API("H5Gget_info_by_idx with an invalid group info pointer"); + TESTING_2("H5Gget_info_by_idx with an invalid group info pointer"); H5E_BEGIN_TRY { @@ -2111,19 +2111,19 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with an invalid group info " "pointer!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_grp_info_pointer); + PART_ERROR(H5Gget_info_by_idx_invalid_grp_info_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_invalid_grp_info_pointer); PART_BEGIN(H5Gget_info_by_idx_invalid_lapl) { - TESTING_2_API("H5Gget_info_by_idx with an invalid LAPL"); + TESTING_2("H5Gget_info_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -2133,23 +2133,23 @@ test_get_group_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" retrieved info of group using H5Gget_info_by_idx with an invalid LAPL!\n"); - PART_ERROR_API(H5Gget_info_by_idx_invalid_lapl); + PART_ERROR(H5Gget_info_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Gget_info_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2173,39 +2173,39 @@ test_flush_group(void) hid_t container_group = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; - TESTING_API("H5Gflush"); + TESTING("H5Gflush"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or flush refresh aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GROUP_FLUSH_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", GROUP_FLUSH_GNAME); goto error; } /* Flush the group */ if (H5Gflush(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't flush the group '%s'\n", GROUP_FLUSH_GNAME); goto error; } @@ -2217,7 +2217,7 @@ test_flush_group(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2242,11 +2242,11 @@ test_flush_group_invalid_params(void) { herr_t status; - TESTING_API("H5Gflush with invalid parameters"); + TESTING("H5Gflush with invalid parameters"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for group flush aren't supported with this connector\n"); return 0; } @@ -2258,12 +2258,12 @@ test_flush_group_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" flushed group with invalid ID!\n"); goto error; } - PASSED_API(); + PASSED(); return 0; @@ -2281,39 +2281,39 @@ test_refresh_group(void) hid_t container_group = H5I_INVALID_HID; hid_t group_id = H5I_INVALID_HID; - TESTING_API("H5Grefresh"); + TESTING("H5Grefresh"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or flush refresh aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, GROUP_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GROUP_REFRESH_GNAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", GROUP_REFRESH_GNAME); goto error; } /* Refresh the group */ if (H5Grefresh(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't refresh the group '%s'\n", GROUP_REFRESH_GNAME); goto error; } @@ -2325,7 +2325,7 @@ test_refresh_group(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2350,11 +2350,11 @@ test_refresh_group_invalid_params(void) { herr_t status; - TESTING_API("H5Grefresh with invalid parameters"); + TESTING("H5Grefresh with invalid parameters"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FLUSH_REFRESH)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for group refresh aren't supported with this connector\n"); return 0; } @@ -2366,12 +2366,12 @@ test_refresh_group_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" refreshed group with invalid ID!\n"); goto error; } - PASSED_API(); + PASSED(); return 0; diff --git a/test/API/H5_api_link_test.c b/test/API/H5_api_link_test.c index 3b45d2cc8b9..647e33a66a2 100644 --- a/test/API/H5_api_link_test.c +++ b/test/API/H5_api_link_test.c @@ -179,51 +179,51 @@ test_create_hard_link(void) hid_t file_id = H5I_INVALID_HID; hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; - TESTING_API("hard link creation"); + TESTING("hard link creation"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or hard link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(file_id, "/", group_id, HARD_LINK_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", HARD_LINK_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, HARD_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", HARD_LINK_TEST_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } @@ -235,7 +235,7 @@ test_create_hard_link(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -266,38 +266,38 @@ test_create_hard_link_long_name(void) char *objname = NULL; /* Name of object [Long] */ size_t u; /* Local index variable */ - TESTING_API("hard link creation with a long name"); + TESTING("hard link creation with a long name"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or hard link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_LONG_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get VOL connector name\n"); goto error; } @@ -315,20 +315,20 @@ test_create_hard_link_long_name(void) objname[name_len] = '\0'; if (H5Lcreate_hard(file_id, "/", group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link with a long name\n"); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, objname, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if the link with a long name exists\n"); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } @@ -344,7 +344,7 @@ test_create_hard_link_long_name(void) if (objname) free(objname); - PASSED_API(); + PASSED(); return 0; @@ -376,39 +376,39 @@ test_create_hard_link_many(void) hid_t group_id = H5I_INVALID_HID, group_id2 = H5I_INVALID_HID; char objname[HARD_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE]; /* Object name */ - TESTING_API("hard link creation of many links"); + TESTING("hard link creation of many links"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or hard link aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, HARD_LINK_TEST_GROUP_MANY_FINAL_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); goto error; } @@ -459,13 +459,13 @@ test_create_hard_link_many(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, "hard21", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link 'hard21' exists\n"); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 'hard21' did not exist\n"); goto error; } @@ -481,39 +481,39 @@ test_create_hard_link_many(void) /* Reopen the file and group and verify the hard link */ if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, HARD_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container sub-group '%s'\n", HARD_LINK_TEST_GROUP_NAME); goto error; } /* Open the object through last hard link */ if ((group_id2 = H5Gopen2(group_id, "hard21", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open the group '%s' with the last hard link 'hard21'\n", 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_API(); + H5_FAILED(); printf(" 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")) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrong name of the object '%s'\n", objname); goto error; } @@ -527,7 +527,7 @@ test_create_hard_link_many(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -560,97 +560,97 @@ test_create_hard_link_same_loc(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or hard link aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, H5L_SAME_LOC_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", H5L_SAME_LOC_TEST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5L_SAME_LOC_first_param) { - TESTING_2_API("usage of H5L_SAME_LOC for first parameter of H5Lcreate_hard"); + TESTING_2("usage of H5L_SAME_LOC for first parameter of H5Lcreate_hard"); /* Library functionality for this part of the test is broken */ if (H5Lcreate_hard(H5L_SAME_LOC, ".", group_id, H5L_SAME_LOC_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME1); - PART_ERROR_API(H5L_SAME_LOC_first_param); + PART_ERROR(H5L_SAME_LOC_first_param); } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, H5L_SAME_LOC_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5L_SAME_LOC_first_param); + PART_ERROR(H5L_SAME_LOC_first_param); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); - PART_ERROR_API(H5L_SAME_LOC_first_param); + PART_ERROR(H5L_SAME_LOC_first_param); } - PASSED_API(); + PASSED(); } PART_END(H5L_SAME_LOC_first_param); PART_BEGIN(H5L_SAME_LOC_third_param) { - TESTING_2_API("usage of H5L_SAME_LOC for third parameter of H5Lcreate_hard"); + TESTING_2("usage of H5L_SAME_LOC for third parameter of H5Lcreate_hard"); if (H5Lcreate_hard(group_id, ".", H5L_SAME_LOC, H5L_SAME_LOC_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second link '%s'\n", H5L_SAME_LOC_TEST_LINK_NAME2); - PART_ERROR_API(H5L_SAME_LOC_third_param); + PART_ERROR(H5L_SAME_LOC_third_param); } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, H5L_SAME_LOC_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", H5L_SAME_LOC_TEST_LINK_NAME2); - PART_ERROR_API(H5L_SAME_LOC_third_param); + PART_ERROR(H5L_SAME_LOC_third_param); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); - PART_ERROR_API(H5L_SAME_LOC_third_param); + PART_ERROR(H5L_SAME_LOC_third_param); } - PASSED_API(); + PASSED(); } PART_END(H5L_SAME_LOC_third_param); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -659,7 +659,7 @@ test_create_hard_link_same_loc(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -694,40 +694,40 @@ test_create_hard_link_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or hard link aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", HARD_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lcreate_hard_invalid_cur_loc_id) { - TESTING_2_API("H5Lcreate_hard with an invalid cur_loc_id"); + TESTING_2("H5Lcreate_hard with an invalid cur_loc_id"); H5E_BEGIN_TRY { @@ -737,18 +737,18 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with an invalid cur_loc_id!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_cur_loc_id); + PART_ERROR(H5Lcreate_hard_invalid_cur_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_cur_loc_id); PART_BEGIN(H5Lcreate_hard_invalid_cur_name) { - TESTING_2_API("H5Lcreate_hard with an invalid cur_name"); + TESTING_2("H5Lcreate_hard with an invalid cur_name"); H5E_BEGIN_TRY { @@ -758,9 +758,9 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with a NULL cur_name!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_cur_name); + PART_ERROR(H5Lcreate_hard_invalid_cur_name); } H5E_BEGIN_TRY @@ -771,18 +771,18 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with an invalid cur_name of ''!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_cur_name); + PART_ERROR(H5Lcreate_hard_invalid_cur_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_cur_name); PART_BEGIN(H5Lcreate_hard_invalid_new_loc_id) { - TESTING_2_API("H5Lcreate_hard with an invalid new_loc_id"); + TESTING_2("H5Lcreate_hard with an invalid new_loc_id"); H5E_BEGIN_TRY { @@ -792,18 +792,18 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with an invalid new_loc_id!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_new_loc_id); + PART_ERROR(H5Lcreate_hard_invalid_new_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_new_loc_id); PART_BEGIN(H5Lcreate_hard_invalid_new_name) { - TESTING_2_API("H5Lcreate_hard with an invalid new_name"); + TESTING_2("H5Lcreate_hard with an invalid new_name"); H5E_BEGIN_TRY { @@ -812,9 +812,9 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with a NULL new_name!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_new_name); + PART_ERROR(H5Lcreate_hard_invalid_new_name); } H5E_BEGIN_TRY @@ -824,18 +824,18 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with an invalid new_name of ''!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_new_name); + PART_ERROR(H5Lcreate_hard_invalid_new_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_new_name); PART_BEGIN(H5Lcreate_hard_invalid_lcpl) { - TESTING_2_API("H5Lcreate_hard with an invalid LCPL"); + TESTING_2("H5Lcreate_hard with an invalid LCPL"); H5E_BEGIN_TRY { @@ -845,18 +845,18 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with an invalid LCPL!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_lcpl); + PART_ERROR(H5Lcreate_hard_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_lcpl); PART_BEGIN(H5Lcreate_hard_invalid_lapl) { - TESTING_2_API("H5Lcreate_hard with an invalid LAPL"); + TESTING_2("H5Lcreate_hard with an invalid LAPL"); H5E_BEGIN_TRY { @@ -866,18 +866,18 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with an invalid LAPL!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_lapl); + PART_ERROR(H5Lcreate_hard_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_lapl); PART_BEGIN(H5Lcreate_hard_invalid_same_loc) { - TESTING_2_API("H5Lcreate_hard with the invalid same location"); + TESTING_2("H5Lcreate_hard with the invalid same location"); H5E_BEGIN_TRY { @@ -887,29 +887,29 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link with the invalid same location!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_same_loc); + PART_ERROR(H5Lcreate_hard_invalid_same_loc); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_same_loc); PART_BEGIN(H5Lcreate_hard_across_files) { - TESTING_2_API("H5Lcreate_hard across files"); + TESTING_2("H5Lcreate_hard across files"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link test file name\n"); - PART_ERROR_API(H5Lcreate_hard_across_files); + PART_ERROR(H5Lcreate_hard_across_files); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lcreate_hard_across_files); + PART_ERROR(H5Lcreate_hard_across_files); } H5E_BEGIN_TRY @@ -920,9 +920,9 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link across files!\n"); - PART_ERROR_API(H5Lcreate_hard_across_files); + PART_ERROR(H5Lcreate_hard_across_files); } H5E_BEGIN_TRY @@ -933,41 +933,41 @@ test_create_hard_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created hard link across files!\n"); - PART_ERROR_API(H5Lcreate_hard_across_files); + PART_ERROR(H5Lcreate_hard_across_files); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_across_files); PART_BEGIN(H5Lcreate_hard_invalid_existence) { - TESTING_2_API("invalid link existence after previous invalid H5Lcreate_hard calls"); + TESTING_2("invalid link existence after previous invalid H5Lcreate_hard calls"); /* Verify the link hasn't been created */ if ((link_exists = H5Lexists(group_id, HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", HARD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_hard_invalid_existence); + PART_ERROR(H5Lcreate_hard_invalid_existence); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link existed!\n"); - PART_ERROR_API(H5Lcreate_hard_invalid_existence); + PART_ERROR(H5Lcreate_hard_invalid_existence); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_hard_invalid_existence); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Fclose(ext_file_id) < 0) TEST_ERROR; @@ -979,7 +979,7 @@ test_create_hard_link_invalid_params(void) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -1009,32 +1009,32 @@ test_create_soft_link_existing_relative(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t object_id = H5I_INVALID_HID; - TESTING_API("soft link creation to existing object by relative path"); + TESTING("soft link creation to existing object by relative path"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or soft link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", SOFT_LINK_EXISTING_RELATIVE_TEST_SUBGROUP_NAME); goto error; @@ -1042,7 +1042,7 @@ test_create_soft_link_existing_relative(void) if ((object_id = H5Gcreate2(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create object '%s' for soft link's target\n", SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME); goto error; @@ -1053,26 +1053,26 @@ test_create_soft_link_existing_relative(void) if (H5Lcreate_soft(SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME, group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } if ((object_id = H5Gopen2(group_id, SOFT_LINK_EXISTING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open object '%s' through the soft link\n", SOFT_LINK_EXISTING_RELATIVE_TEST_OBJECT_NAME); goto error; @@ -1087,7 +1087,7 @@ test_create_soft_link_existing_relative(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1115,32 +1115,32 @@ test_create_soft_link_existing_absolute(void) hid_t file_id = H5I_INVALID_HID; hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID, root_id = H5I_INVALID_HID; - TESTING_API("soft link creation to existing object by absolute path"); + TESTING("soft link creation to existing object by absolute path"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or soft link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_SUBGROUP_NAME); goto error; @@ -1148,26 +1148,26 @@ test_create_soft_link_existing_absolute(void) if (H5Lcreate_soft("/", group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } if ((root_id = H5Gopen2(group_id, SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open object pointed to by soft link '%s'\n", SOFT_LINK_EXISTING_ABSOLUTE_TEST_LINK_NAME); goto error; @@ -1182,7 +1182,7 @@ test_create_soft_link_existing_absolute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1212,32 +1212,32 @@ test_create_soft_link_dangling_relative(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t object_id = H5I_INVALID_HID; - TESTING_API("dangling soft link creation to object by relative path"); + TESTING("dangling soft link creation to object by relative path"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or soft link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", SOFT_LINK_DANGLING_RELATIVE_TEST_SUBGROUP_NAME); goto error; @@ -1245,20 +1245,20 @@ test_create_soft_link_dangling_relative(void) if (H5Lcreate_soft(SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME, group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } @@ -1270,7 +1270,7 @@ test_create_soft_link_dangling_relative(void) H5E_END_TRY if (object_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); H5Gclose(object_id); goto error; @@ -1278,7 +1278,7 @@ test_create_soft_link_dangling_relative(void) if ((object_id = H5Gcreate2(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create object '%s' for soft link's target\n", SOFT_LINK_DANGLING_RELATIVE_TEST_OBJECT_NAME); goto error; @@ -1288,7 +1288,7 @@ test_create_soft_link_dangling_relative(void) TEST_ERROR; if ((object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open object pointed to by soft link '%s'\n", SOFT_LINK_DANGLING_RELATIVE_TEST_LINK_NAME); goto error; @@ -1303,7 +1303,7 @@ test_create_soft_link_dangling_relative(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1333,32 +1333,32 @@ test_create_soft_link_dangling_absolute(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; hid_t object_id = H5I_INVALID_HID; - TESTING_API("dangling soft link creation to object by absolute path"); + TESTING("dangling soft link creation to object by absolute path"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or soft link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME); goto error; @@ -1367,20 +1367,20 @@ test_create_soft_link_dangling_absolute(void) if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" SOFT_LINK_DANGLING_ABSOLUTE_TEST_SUBGROUP_NAME "/" SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME, group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } @@ -1392,7 +1392,7 @@ test_create_soft_link_dangling_absolute(void) H5E_END_TRY if (object_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened target of dangling link '%s'!\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); H5Gclose(object_id); goto error; @@ -1400,7 +1400,7 @@ test_create_soft_link_dangling_absolute(void) if ((object_id = H5Gcreate2(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create object '%s' for soft link's target\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_OBJECT_NAME); goto error; @@ -1410,7 +1410,7 @@ test_create_soft_link_dangling_absolute(void) TEST_ERROR; if ((object_id = H5Gopen2(group_id, SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open object pointed to by soft link '%s'\n", SOFT_LINK_DANGLING_ABSOLUTE_TEST_LINK_NAME); goto error; @@ -1425,7 +1425,7 @@ test_create_soft_link_dangling_absolute(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1457,38 +1457,38 @@ test_create_soft_link_long_name(void) char *objname = NULL; /* Name of object [Long] */ size_t u; /* Local index variable */ - TESTING_API("soft link creation with a long name"); + TESTING("soft link creation with a long name"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or soft link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_TEST_GROUP_LONG_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_LONG_NAME); goto error; } if (H5VLget_connector_name(file_id, vol_name, 5) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get VOL connector name\n"); goto error; } @@ -1506,20 +1506,20 @@ test_create_soft_link_long_name(void) objname[name_len] = '\0'; if (H5Lcreate_soft(SOFT_LINK_TEST_LONG_OBJECT_NAME, group_id, objname, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link with a long name\n"); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, objname, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if the link with a long name exists\n"); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } @@ -1535,7 +1535,7 @@ test_create_soft_link_long_name(void) if (objname) free(objname); - PASSED_API(); + PASSED(); return 0; @@ -1568,32 +1568,32 @@ test_create_soft_link_many(void) hid_t object_id = H5I_INVALID_HID; char objname[SOFT_LINK_TEST_GROUP_MANY_NAME_BUF_SIZE]; /* Object name */ - TESTING_API("soft link creation of many links"); + TESTING("soft link creation of many links"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or soft link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); goto error; } @@ -1635,13 +1635,13 @@ test_create_soft_link_many(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, "soft16", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link 'soft16' exists\n"); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 'soft16' did not exist\n"); goto error; } @@ -1655,19 +1655,19 @@ test_create_soft_link_many(void) /* Reopen the file and group and verify the hard link */ if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gopen2(container_group, SOFT_LINK_TEST_GROUP_MANY_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container sub-group '%s'\n", SOFT_LINK_TEST_GROUP_MANY_NAME); goto error; } @@ -1683,7 +1683,7 @@ test_create_soft_link_many(void) H5E_END_TRY if (object_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened target of dangling soft link '%s'!\n", SOFT_LINK_TEST_GROUP_MANY_NAME); H5Gclose(object_id); goto error; @@ -1691,7 +1691,7 @@ test_create_soft_link_many(void) if ((object_id = H5Gcreate2(group_id, SOFT_LINK_TEST_GROUP_MANY_FINAL_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create object '%s' for soft link's target\n", SOFT_LINK_TEST_GROUP_MANY_NAME); goto error; } @@ -1704,19 +1704,19 @@ test_create_soft_link_many(void) * that. */ if ((object_id = H5Gopen2(group_id, "soft16", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" 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_API(); + H5_FAILED(); printf(" 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")) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrong name of the object '%s'\n", objname); goto error; } @@ -1730,7 +1730,7 @@ test_create_soft_link_many(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1764,40 +1764,40 @@ test_create_soft_link_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, or soft link aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", SOFT_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lcreate_soft_invalid_link_target) { - TESTING_2_API("H5Lcreate_soft with an invalid link target"); + TESTING_2("H5Lcreate_soft with an invalid link target"); H5E_BEGIN_TRY { @@ -1807,10 +1807,10 @@ test_create_soft_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created soft link '%s' with an invalid link target!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_link_target); + PART_ERROR(H5Lcreate_soft_invalid_link_target); } H5E_BEGIN_TRY @@ -1821,19 +1821,19 @@ test_create_soft_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created soft link '%s' with an invalid link target!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_link_target); + PART_ERROR(H5Lcreate_soft_invalid_link_target); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_soft_invalid_link_target); PART_BEGIN(H5Lcreate_soft_invalid_link_loc_id) { - TESTING_2_API("H5Lcreate_soft with an invalid link_loc_id"); + TESTING_2("H5Lcreate_soft with an invalid link_loc_id"); H5E_BEGIN_TRY { @@ -1843,19 +1843,19 @@ test_create_soft_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created soft link '%s' with an invalid link_loc_id!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_link_loc_id); + PART_ERROR(H5Lcreate_soft_invalid_link_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_soft_invalid_link_loc_id); PART_BEGIN(H5Lcreate_soft_invalid_link_name) { - TESTING_2_API("H5Lcreate_soft with an invalid link name"); + TESTING_2("H5Lcreate_soft with an invalid link name"); H5E_BEGIN_TRY { @@ -1864,10 +1864,10 @@ test_create_soft_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created soft link '%s' with a NULL link name!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_link_name); + PART_ERROR(H5Lcreate_soft_invalid_link_name); } H5E_BEGIN_TRY @@ -1877,19 +1877,19 @@ test_create_soft_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created soft link '%s' with an invalid link name of ''!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_link_name); + PART_ERROR(H5Lcreate_soft_invalid_link_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_soft_invalid_link_name); PART_BEGIN(H5Lcreate_soft_invalid_lcpl) { - TESTING_2_API("H5Lcreate_soft with an invalid LCPL"); + TESTING_2("H5Lcreate_soft with an invalid LCPL"); H5E_BEGIN_TRY { @@ -1899,19 +1899,19 @@ test_create_soft_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created soft link '%s' with an invalid LCPL!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_lcpl); + PART_ERROR(H5Lcreate_soft_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_soft_invalid_lcpl); PART_BEGIN(H5Lcreate_soft_invalid_lapl) { - TESTING_2_API("H5Lcreate_soft with an invalid LAPL"); + TESTING_2("H5Lcreate_soft with an invalid LAPL"); H5E_BEGIN_TRY { @@ -1921,42 +1921,42 @@ test_create_soft_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created soft link '%s' with an invalid LAPL!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_lapl); + PART_ERROR(H5Lcreate_soft_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_soft_invalid_lapl); PART_BEGIN(H5Lcreate_soft_invalid_existence) { - TESTING_2_API("invalid link existence after previous invalid H5Lcreate_soft calls"); + TESTING_2("invalid link existence after previous invalid H5Lcreate_soft calls"); /* Verify the link hasn't been created */ if ((link_exists = H5Lexists(group_id, SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_existence); + PART_ERROR(H5Lcreate_soft_invalid_existence); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' existed!\n", SOFT_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_soft_invalid_existence); + PART_ERROR(H5Lcreate_soft_invalid_existence); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_soft_invalid_existence); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -1965,7 +1965,7 @@ test_create_soft_link_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1994,25 +1994,25 @@ test_create_external_link(void) hid_t root_id = H5I_INVALID_HID; char *ext_link_filename = NULL; - TESTING_API("external link creation to existing object"); + TESTING("external link creation to existing object"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or external link aren't supported " "with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -2021,46 +2021,46 @@ test_create_external_link(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_SUBGROUP_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/", group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", EXTERNAL_LINK_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } if ((root_id = H5Gopen2(group_id, EXTERNAL_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open root group of other file using external link '%s'\n", EXTERNAL_LINK_TEST_LINK_NAME); goto error; @@ -2076,7 +2076,7 @@ test_create_external_link(void) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -2108,64 +2108,64 @@ test_create_external_link_dangling(void) hid_t object_id = H5I_INVALID_HID; char *ext_link_filename = NULL; - TESTING_API("dangling external link creation"); + TESTING("dangling external link creation"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or external link aren't supported " "with this connector\n"); return 0; } if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_DANGLING_SUBGROUP_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/" EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME, group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dangling external link '%s'\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } @@ -2177,7 +2177,7 @@ test_create_external_link_dangling(void) H5E_END_TRY if (object_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" opened non-existent object in other file using dangling external link '%s'!\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); H5Gclose(object_id); @@ -2186,7 +2186,7 @@ test_create_external_link_dangling(void) if ((object_id = H5Gcreate2(ext_file_id, EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create object '%s' for external link's target\n", EXTERNAL_LINK_TEST_DANGLING_OBJECT_NAME); goto error; @@ -2196,7 +2196,7 @@ test_create_external_link_dangling(void) TEST_ERROR; if ((object_id = H5Gopen2(group_id, EXTERNAL_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open object pointed to by external link '%s'\n", EXTERNAL_LINK_TEST_DANGLING_LINK_NAME); goto error; @@ -2214,7 +2214,7 @@ test_create_external_link_dangling(void) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -2254,7 +2254,7 @@ test_create_external_link_multi(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or external link aren't supported with this " "connector\n"); return 0; @@ -2264,321 +2264,321 @@ test_create_external_link_multi(void) { PART_BEGIN(H5Lcreate_external_first_file) { - TESTING_2_API("Create the first external file to be pointed to"); + TESTING_2("Create the first external file to be pointed to"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if ((file_id = H5Fcreate(ext_link_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename1); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } /* Create object down a path */ if ((group_id = H5Gcreate2(file_id, "A", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if ((group_id = H5Gcreate2(file_id, "A/B", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if ((group_id = H5Gcreate2(file_id, "A/B/C", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } /* Close file */ if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_first_file); PART_BEGIN(H5Lcreate_external_second_file) { - TESTING_2_API("Create the second external file to be pointed to"); + TESTING_2("Create the second external file to be pointed to"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME2, &ext_link_filename2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } if ((file_id = H5Fcreate(ext_link_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename2); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } /* Create object down a path */ if ((group_id = H5Gcreate2(file_id, "D", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } if ((group_id = H5Gcreate2(file_id, "D/E", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } /* Create external link to object in first file */ if (H5Lcreate_external(ext_link_filename1, "/A/B/C", group_id, "F", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link 'F'\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } /* Close file */ if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a file\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_second_file); PART_BEGIN(H5Lcreate_external_third_file) { - TESTING_2_API("Create the third external file to be pointed to"); + TESTING_2("Create the third external file to be pointed to"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME3, &ext_link_filename3) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } if ((file_id = H5Fcreate(ext_link_filename3, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename3); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } /* Create object down a path */ if ((group_id = H5Gcreate2(file_id, "G", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } if ((group_id = H5Gcreate2(file_id, "G/H", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } /* Create external link to object in second file */ if (H5Lcreate_external(ext_link_filename2, "/D/E/F", group_id, "I", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link 'I'\n"); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } /* Close file */ if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a file\n"); - PART_ERROR_API(H5Lcreate_external_third_file); + PART_ERROR(H5Lcreate_external_third_file); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_third_file); PART_BEGIN(H5Lcreate_external_final_file) { - TESTING_2_API("Open the file and create the final external link"); + TESTING_2("Open the file and create the final external link"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_TEST_MULTI_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_TEST_MULTI_NAME); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if (H5Lcreate_external(ext_link_filename3, "/G/H/I", group_id, "ext_link", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link 'ext_link'\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if ((group_id2 = H5Gopen2(group_id, "ext_link", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open the group that is the external link\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } /* Check name */ if (H5Iget_name(group_id2, objname, (size_t)EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the name of the object '%s'\n", HARD_LINK_TEST_GROUP_MANY_FINAL_NAME); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if (HDstrcmp(objname, "/A/B/C")) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrong name of the object '%s'\n", objname); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } /* Create an object in the external file */ if ((group_id3 = H5Gcreate2(group_id2, "new_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group 'new_group' in the external file\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(group_id3) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if (H5Gclose(container_group) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a file\n"); - PART_ERROR_API(H5Lcreate_external_final_file); + PART_ERROR(H5Lcreate_external_final_file); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_final_file); PART_BEGIN(H5Lcreate_external_object_created) { - TESTING_2_API("Check the group being created through the external link"); + TESTING_2("Check the group being created through the external link"); if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", ext_link_filename1); - PART_ERROR_API(H5Lcreate_external_object_created); + PART_ERROR(H5Lcreate_external_object_created); } if ((group_id = H5Gopen2(file_id, "/A/B/C/new_group", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open a group 'new_group' in the external file\n"); - PART_ERROR_API(H5Lcreate_external_object_created); + PART_ERROR(H5Lcreate_external_object_created); } /* Check name */ if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_MULTI_NAME_BUF_SIZE) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the name of the object '/A/B/C/new_group'\n"); - PART_ERROR_API(H5Lcreate_external_object_created); + PART_ERROR(H5Lcreate_external_object_created); } if (HDstrcmp(objname, "/A/B/C/new_group")) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrong name of the object '%s'\n", objname); - PART_ERROR_API(H5Lcreate_external_object_created); + PART_ERROR(H5Lcreate_external_object_created); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close the group\n"); - PART_ERROR_API(H5Lcreate_external_object_created); + PART_ERROR(H5Lcreate_external_object_created); } if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close the file\n"); - PART_ERROR_API(H5Lcreate_external_object_created); + PART_ERROR(H5Lcreate_external_object_created); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_object_created); } @@ -2633,20 +2633,20 @@ test_create_external_link_ping_pong(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or external link aren't supported with this " "connector\n"); return 0; } if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_PING_PONG_NAME1, &ext_link_filename1) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_PING_PONG_NAME2, &ext_link_filename2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } @@ -2655,209 +2655,209 @@ test_create_external_link_ping_pong(void) { PART_BEGIN(H5Lcreate_external_first_file) { - TESTING_2_API("Create the first external file"); + TESTING_2("Create the first external file"); /* Create the first file */ if ((file_id = H5Fcreate(ext_link_filename1, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename1); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } /* Create external links for chain */ if (H5Lcreate_external(ext_link_filename2, "/link2", file_id, "link1", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if (H5Lcreate_external(ext_link_filename2, "/link4", file_id, "link3", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if (H5Lcreate_external(ext_link_filename2, "/link6", file_id, "link5", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } /* Create final object */ if ((group_id = H5Gcreate2(file_id, "final", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } /* Close file */ if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_first_file); + PART_ERROR(H5Lcreate_external_first_file); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_first_file); PART_BEGIN(H5Lcreate_external_second_file) { - TESTING_2_API("Create the second external file"); + TESTING_2("Create the second external file"); /* Create the second file */ if ((file_id = H5Fcreate(ext_link_filename2, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link\n", ext_link_filename2); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } /* Create external links for chain */ if (H5Lcreate_external(ext_link_filename1, "/link3", file_id, "link2", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } if (H5Lcreate_external(ext_link_filename1, "/link5", file_id, "link4", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } if (H5Lcreate_external(ext_link_filename1, "/final", file_id, "link6", H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } /* Close file */ if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close the file\n"); - PART_ERROR_API(H5Lcreate_external_second_file); + PART_ERROR(H5Lcreate_external_second_file); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_second_file); PART_BEGIN(H5Lcreate_external_verify) { - TESTING_2_API("Open the first file to verify the object being pointed to"); + TESTING_2("Open the first file to verify the object being pointed to"); if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", ext_link_filename1); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } /* Open object through external link */ if ((group_id = H5Gopen2(file_id, "link1", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open the group that is the external link 'link1'\n"); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } /* Check the name of the object being pointed to */ if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_PING_PONG_NAME_BUF_SIZE) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the name of the object\n"); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } if (HDstrcmp(objname, "/final")) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrong name of the object '%s'\n", objname); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } /* Create an object in the external file */ if ((group_id2 = H5Gcreate2(group_id, "new_group", H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a new group 'new_group'\n"); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } if (H5Gclose(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } /* Close file */ if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close the file\n"); - PART_ERROR_API(H5Lcreate_external_verify); + PART_ERROR(H5Lcreate_external_verify); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_verify); PART_BEGIN(H5Lcreate_external_verify_again) { - TESTING_2_API("Open the first file to verify the object being created"); + TESTING_2("Open the first file to verify the object being created"); if ((file_id = H5Fopen(ext_link_filename1, H5F_ACC_RDONLY, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", ext_link_filename1); - PART_ERROR_API(H5Lcreate_external_verify_again); + PART_ERROR(H5Lcreate_external_verify_again); } /* Open object through external link */ if ((group_id = H5Gopen2(file_id, "/final/new_group", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open the group that is the external link\n"); - PART_ERROR_API(H5Lcreate_external_verify_again); + PART_ERROR(H5Lcreate_external_verify_again); } /* Check the name of the object being pointed to */ if (H5Iget_name(group_id, objname, (size_t)EXTERNAL_LINK_TEST_PING_PONG_NAME_BUF_SIZE) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get the name of the object\n"); - PART_ERROR_API(H5Lcreate_external_verify_again); + PART_ERROR(H5Lcreate_external_verify_again); } if (HDstrcmp(objname, "/final/new_group")) { - H5_FAILED_API(); + H5_FAILED(); printf(" wrong name of the object '%s'\n", objname); - PART_ERROR_API(H5Lcreate_external_verify_again); + PART_ERROR(H5Lcreate_external_verify_again); } if (H5Gclose(group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close a group\n"); - PART_ERROR_API(H5Lcreate_external_verify_again); + PART_ERROR(H5Lcreate_external_verify_again); } /* Close file */ if (H5Fclose(file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close the file\n"); - PART_ERROR_API(H5Lcreate_external_verify_again); + PART_ERROR(H5Lcreate_external_verify_again); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_verify_again); } @@ -2900,23 +2900,23 @@ test_create_external_link_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or external link aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_INVALID_PARAMS_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create filename for external link test\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -2925,31 +2925,31 @@ test_create_external_link_invalid_params(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lcreate_external_invalid_file_name) { - TESTING_2_API("H5Lcreate_external with an invalid file name"); + TESTING_2("H5Lcreate_external with an invalid file name"); H5E_BEGIN_TRY { @@ -2959,10 +2959,10 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using a NULL file name!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_file_name); + PART_ERROR(H5Lcreate_external_invalid_file_name); } H5E_BEGIN_TRY @@ -2973,19 +2973,19 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using an invalid file name of ''!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_file_name); + PART_ERROR(H5Lcreate_external_invalid_file_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_invalid_file_name); PART_BEGIN(H5Lcreate_external_invalid_ext_obj_name) { - TESTING_2_API("H5Lcreate_external with an invalid external object name"); + TESTING_2("H5Lcreate_external with an invalid external object name"); H5E_BEGIN_TRY { @@ -2996,10 +2996,10 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using a NULL external object name!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_ext_obj_name); + PART_ERROR(H5Lcreate_external_invalid_ext_obj_name); } H5E_BEGIN_TRY @@ -3011,19 +3011,19 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using an invalid external object name of ''!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_ext_obj_name); + PART_ERROR(H5Lcreate_external_invalid_ext_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_invalid_ext_obj_name); PART_BEGIN(H5Lcreate_external_invalid_link_loc_id) { - TESTING_2_API("H5Lcreate_external with an invalid link_loc_id"); + TESTING_2("H5Lcreate_external with an invalid link_loc_id"); H5E_BEGIN_TRY { @@ -3034,19 +3034,19 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using an invalid link_loc_id!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_link_loc_id); + PART_ERROR(H5Lcreate_external_invalid_link_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_invalid_link_loc_id); PART_BEGIN(H5Lcreate_external_invalid_link_name) { - TESTING_2_API("H5Lcreate_external with an invalid link name"); + TESTING_2("H5Lcreate_external with an invalid link name"); H5E_BEGIN_TRY { @@ -3056,10 +3056,10 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using a NULL link_loc_id!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_link_name); + PART_ERROR(H5Lcreate_external_invalid_link_name); } H5E_BEGIN_TRY @@ -3069,19 +3069,19 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using an invalid link name of ''!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_link_name); + PART_ERROR(H5Lcreate_external_invalid_link_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_invalid_link_name); PART_BEGIN(H5Lcreate_external_invalid_lcpl) { - TESTING_2_API("H5Lcreate_external with an invalid LCPL"); + TESTING_2("H5Lcreate_external with an invalid LCPL"); H5E_BEGIN_TRY { @@ -3092,19 +3092,19 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using an invalid LCPL!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_lcpl); + PART_ERROR(H5Lcreate_external_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_invalid_lcpl); PART_BEGIN(H5Lcreate_external_invalid_lapl) { - TESTING_2_API("H5Lcreate_external with an invalid LAPL"); + TESTING_2("H5Lcreate_external with an invalid LAPL"); H5E_BEGIN_TRY { @@ -3115,42 +3115,42 @@ test_create_external_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created external link '%s' using an invalid LAPL!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_lapl); + PART_ERROR(H5Lcreate_external_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_invalid_lapl); PART_BEGIN(H5Lcreate_external_invalid_existence) { - TESTING_2_API("invalid link existence after previous invalid H5Lcreate_external calls"); + TESTING_2("invalid link existence after previous invalid H5Lcreate_external calls"); /* Verify the link hasn't been created */ if ((link_exists = H5Lexists(group_id, EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_existence); + PART_ERROR(H5Lcreate_external_invalid_existence); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' existed!\n", EXTERNAL_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_external_invalid_existence); + PART_ERROR(H5Lcreate_external_invalid_existence); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_external_invalid_existence); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -3159,7 +3159,7 @@ test_create_external_link_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -3188,12 +3188,12 @@ test_create_user_defined_link(void) hid_t container_group = H5I_INVALID_HID, group_id = H5I_INVALID_HID; char udata[UD_LINK_TEST_UDATA_MAX_SIZE]; - TESTING_API("user-defined link creation"); + TESTING("user-defined link creation"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, link, or user-defined link aren't supported with this " "connector\n"); @@ -3201,20 +3201,20 @@ test_create_user_defined_link(void) } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, UD_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", UD_LINK_TEST_GROUP_NAME); goto error; } @@ -3224,20 +3224,20 @@ test_create_user_defined_link(void) if (H5Lcreate_ud(group_id, UD_LINK_TEST_LINK_NAME, H5L_TYPE_EXTERNAL, udata, (size_t)udata_size, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create user-defined link '%s'\n", UD_LINK_TEST_LINK_NAME); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, UD_LINK_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", UD_LINK_TEST_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' didn't exist!\n", UD_LINK_TEST_LINK_NAME); goto error; } @@ -3249,7 +3249,7 @@ test_create_user_defined_link(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3284,29 +3284,29 @@ test_create_user_defined_link_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or user-defined link aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", UD_LINK_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } @@ -3314,13 +3314,13 @@ test_create_user_defined_link_invalid_params(void) if ((udata_size = HDsnprintf(udata, UD_LINK_INVALID_PARAMS_TEST_UDATA_MAX_SIZE, "udata")) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lcreate_ud_invalid_link_loc_id) { - TESTING_2_API("H5Lcreate_ud with an invalid link location ID"); + TESTING_2("H5Lcreate_ud with an invalid link location ID"); H5E_BEGIN_TRY { @@ -3331,19 +3331,19 @@ test_create_user_defined_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created user-defined link '%s' with an invalid link location ID!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_link_loc_id); + PART_ERROR(H5Lcreate_ud_invalid_link_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_ud_invalid_link_loc_id); PART_BEGIN(H5Lcreate_ud_invalid_link_name) { - TESTING_2_API("H5Lcreate_ud with an invalid link name"); + TESTING_2("H5Lcreate_ud with an invalid link name"); H5E_BEGIN_TRY { @@ -3353,10 +3353,10 @@ test_create_user_defined_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created user-defined link '%s' with a NULL link name!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_link_name); + PART_ERROR(H5Lcreate_ud_invalid_link_name); } H5E_BEGIN_TRY @@ -3367,19 +3367,19 @@ test_create_user_defined_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created user-defined link '%s' with an invalid link name of ''!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_link_name); + PART_ERROR(H5Lcreate_ud_invalid_link_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_ud_invalid_link_name); PART_BEGIN(H5Lcreate_ud_invalid_link_type) { - TESTING_2_API("H5Lcreate_ud with an invalid link type"); + TESTING_2("H5Lcreate_ud with an invalid link type"); H5E_BEGIN_TRY { @@ -3389,19 +3389,19 @@ test_create_user_defined_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created user-defined link '%s' with an invalid link type!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_link_type); + PART_ERROR(H5Lcreate_ud_invalid_link_type); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_ud_invalid_link_type); PART_BEGIN(H5Lcreate_ud_invalid_udata_pointer) { - TESTING_2_API("H5Lcreate_ud with an invalid udata pointer"); + TESTING_2("H5Lcreate_ud with an invalid udata pointer"); H5E_BEGIN_TRY { @@ -3411,19 +3411,19 @@ test_create_user_defined_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created user-defined link '%s' with an invalid udata pointer!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_udata_pointer); + PART_ERROR(H5Lcreate_ud_invalid_udata_pointer); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_ud_invalid_udata_pointer); PART_BEGIN(H5Lcreate_ud_invalid_lcpl) { - TESTING_2_API("H5Lcreate_ud with an invalid LCPL"); + TESTING_2("H5Lcreate_ud with an invalid LCPL"); H5E_BEGIN_TRY { @@ -3433,19 +3433,19 @@ test_create_user_defined_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created user-defined link '%s' with an invalid LCPL!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_lcpl); + PART_ERROR(H5Lcreate_ud_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_ud_invalid_lcpl); PART_BEGIN(H5Lcreate_ud_invalid_lapl) { - TESTING_2_API("H5Lcreate_ud with an invalid LAPL"); + TESTING_2("H5Lcreate_ud with an invalid LAPL"); H5E_BEGIN_TRY { @@ -3455,40 +3455,40 @@ test_create_user_defined_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" created user-defined link '%s' with an invalid LAPL!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_lapl); + PART_ERROR(H5Lcreate_ud_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_ud_invalid_lapl); PART_BEGIN(H5Lcreate_ud_invalid_existence) { - TESTING_2_API("invalid link existence after previous invalid H5Lcreate_ud calls"); + TESTING_2("invalid link existence after previous invalid H5Lcreate_ud calls"); /* Verify the link hasn't been created */ if ((link_exists = H5Lexists(group_id, UD_LINK_INVALID_PARAMS_TEST_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_existence); + PART_ERROR(H5Lcreate_ud_invalid_existence); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' existed!\n", UD_LINK_INVALID_PARAMS_TEST_LINK_NAME); - PART_ERROR_API(H5Lcreate_ud_invalid_existence); + PART_ERROR(H5Lcreate_ud_invalid_existence); } - PASSED_API(); + PASSED(); } PART_END(H5Lcreate_ud_invalid_existence); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -3497,7 +3497,7 @@ test_create_user_defined_link_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3535,35 +3535,35 @@ test_delete_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, soft link, or external link " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -3571,73 +3571,73 @@ test_delete_link(void) if ((group_id = H5Gcreate2(container_group, LINK_DELETE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ldelete_hard) { - TESTING_2_API("H5Ldelete on hard link"); + TESTING_2("H5Ldelete on hard link"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first hard link did not exist\n"); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first hard link exists!\n"); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Ldelete_hard); + PART_ERROR(H5Ldelete_hard); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_hard); @@ -3650,75 +3650,75 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_hard_indirect) { - TESTING_2_API("H5Ldelete on nested hard link"); + TESTING_2("H5Ldelete on nested hard link"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_SUBGROUP_NAME1); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if ((nested_grp_id = H5Gcreate2(subgroup_id, LINK_DELETE_TEST_NESTED_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if (H5Lcreate_hard(nested_grp_id, ".", nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if ((link_exists = H5Lexists(nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first hard link did not exist\n"); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_NESTED_HARD_LINK_NAME, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete\n", LINK_DELETE_TEST_NESTED_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if ((link_exists = H5Lexists(nested_grp_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first hard link exists!\n"); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if (H5Gclose(nested_grp_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_NESTED_GRP_NAME); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Ldelete_hard_indirect); + PART_ERROR(H5Ldelete_hard_indirect); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_hard_indirect); @@ -3733,63 +3733,63 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_soft) { - TESTING_2_API("H5Ldelete on soft link"); + TESTING_2("H5Ldelete on soft link"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP2_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first soft link did not exist\n"); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first soft link exists!\n"); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP2_NAME); - PART_ERROR_API(H5Ldelete_soft); + PART_ERROR(H5Ldelete_soft); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_soft); @@ -3802,82 +3802,82 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_external) { - TESTING_2_API("H5Ldelete on external link"); + TESTING_2("H5Ldelete on external link"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP3_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first external link did not exist\n"); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if (H5Ldelete(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first external link exists!\n"); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP3_NAME); - PART_ERROR_API(H5Ldelete_external); + PART_ERROR(H5Ldelete_external); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_external); @@ -3892,11 +3892,11 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_ud) { - TESTING_2_API("H5Ldelete on user-defined link"); + TESTING_2("H5Ldelete on user-defined link"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Ldelete_ud); } PART_END(H5Ldelete_ud); @@ -3910,227 +3910,227 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_hard_crt_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on hard link by creation order in increasing order"); + TESTING_2("H5Ldelete_by_idx on hard link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP5_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_hard_crt_order_increasing); @@ -4143,227 +4143,227 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_hard_crt_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on hard link by creation order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on hard link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP6_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_hard_crt_order_decreasing); @@ -4376,221 +4376,221 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_hard_name_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on hard link by alphabetical order in increasing order"); + TESTING_2("H5Ldelete_by_idx on hard link by alphabetical order in increasing order"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " "increasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " "increasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " "increasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP7_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_hard_name_order_increasing); @@ -4603,221 +4603,221 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_hard_name_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on hard link by alphabetical order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on hard link by alphabetical order in decreasing order"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " "decreasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " "decreasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete hard link '%s' using H5Ldelete_by_idx by alphabetical order in " "decreasing order\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' exists after deletion!\n", LINK_DELETE_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP8_NAME); - PART_ERROR_API(H5Ldelete_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_hard_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_hard_name_order_decreasing); @@ -4830,230 +4830,230 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_soft_crt_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on soft link by creation order in increasing order"); + TESTING_2("H5Ldelete_by_idx on soft link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Create several soft links */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP9_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP9_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP9_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP9_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_soft_crt_order_increasing); @@ -5066,230 +5066,230 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_soft_crt_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on soft link by creation order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on soft link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Create several soft links */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP10_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP10_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP10_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP10_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_soft_crt_order_decreasing); @@ -5302,224 +5302,224 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_soft_name_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on soft link by alphabetical order in increasing order"); + TESTING_2("H5Ldelete_by_idx on soft link by alphabetical order in increasing order"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Create several soft links */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP11_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP11_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP11_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " "increasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " "increasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " "increasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP11_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_soft_name_order_increasing); @@ -5532,224 +5532,224 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_soft_name_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on soft link by alphabetical order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on soft link by alphabetical order in decreasing order"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP12_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Create several soft links */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP12_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP12_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP_NAME "/" LINK_DELETE_TEST_SUBGROUP12_NAME, subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " "decreasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " "decreasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete soft link '%s' using H5Ldelete_by_idx by alphabetical order in " "decreasing order\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' exists after deletion!\n", LINK_DELETE_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP12_NAME); - PART_ERROR_API(H5Ldelete_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_soft_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_soft_name_order_decreasing); @@ -5762,271 +5762,271 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_external_crt_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on external link by creation order in increasing order"); + TESTING_2("H5Ldelete_by_idx on external link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_external_crt_order_increasing); } /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP13_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " "increasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP13_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_external_crt_order_increasing); @@ -6041,271 +6041,271 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_external_crt_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on external link by creation order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on external link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP14_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by creation order in " "decreasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP14_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_external_crt_order_decreasing); @@ -6320,265 +6320,265 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_external_name_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on external link by alphabetical order in increasing order"); + TESTING_2("H5Ldelete_by_idx on external link by alphabetical order in increasing order"); /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP15_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " "order in increasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " "order in increasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " "order in increasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP15_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_increasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_external_name_order_increasing); @@ -6593,265 +6593,265 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_external_name_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on external link by alphabetical order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on external link by alphabetical order in decreasing order"); /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_TEST_SUBGROUP16_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } /* Delete a link */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " "order in decreasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } /* Ensure that the link is gone and others remain */ if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } /* Repeat until all links have been deleted */ if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " "order in decreasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist after deletion of a different link!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Ldelete_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't delete external link '%s' using H5Ldelete_by_idx by alphabetical " "order in decreasing order\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, LINK_DELETE_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' exists after deletion!\n", LINK_DELETE_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", LINK_DELETE_TEST_SUBGROUP16_NAME); - PART_ERROR_API(H5Ldelete_by_idx_external_name_order_decreasing); + PART_ERROR(H5Ldelete_by_idx_external_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_external_name_order_decreasing); @@ -6866,11 +6866,11 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_ud_crt_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on user-defined link by creation order in increasing order"); + TESTING_2("H5Ldelete_by_idx on user-defined link by creation order in increasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Ldelete_by_idx_ud_crt_order_increasing); } PART_END(H5Ldelete_by_idx_ud_crt_order_increasing); @@ -6884,11 +6884,11 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_ud_crt_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on user-defined link by creation order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on user-defined link by creation order in decreasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Ldelete_by_idx_ud_crt_order_decreasing); } PART_END(H5Ldelete_by_idx_ud_crt_order_decreasing); @@ -6902,11 +6902,11 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_ud_name_order_increasing) { - TESTING_2_API("H5Ldelete_by_idx on user-defined link by alphabetical order in increasing order"); + TESTING_2("H5Ldelete_by_idx on user-defined link by alphabetical order in increasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Ldelete_by_idx_ud_name_order_increasing); } PART_END(H5Ldelete_by_idx_ud_name_order_increasing); @@ -6920,11 +6920,11 @@ test_delete_link(void) PART_BEGIN(H5Ldelete_by_idx_ud_name_order_decreasing) { - TESTING_2_API("H5Ldelete_by_idx on user-defined link by alphabetical order in decreasing order"); + TESTING_2("H5Ldelete_by_idx on user-defined link by alphabetical order in decreasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Ldelete_by_idx_ud_name_order_decreasing); } PART_END(H5Ldelete_by_idx_ud_name_order_decreasing); @@ -6938,7 +6938,7 @@ test_delete_link(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -6949,7 +6949,7 @@ test_delete_link(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -6991,60 +6991,60 @@ test_delete_link_reset_grp_max_crt_order(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or creation order " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ldelete_links_bottom_up) { - TESTING_2_API("H5Ldelete from least-recently created link to most-recently created link"); + TESTING_2("H5Ldelete from least-recently created link to most-recently created link"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Ldelete_links_bottom_up); + PART_ERROR(H5Ldelete_links_bottom_up); } /* Create several links inside the group */ @@ -7052,9 +7052,9 @@ test_delete_link_reset_grp_max_crt_order(void) snprintf(link_name, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_BUF_SIZE, "link%d", (int)i); if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", link_name); - PART_ERROR_API(H5Ldelete_links_bottom_up); + PART_ERROR(H5Ldelete_links_bottom_up); } } @@ -7063,25 +7063,25 @@ test_delete_link_reset_grp_max_crt_order(void) memset(&grp_info, 0, sizeof(grp_info)); if (H5Gget_info(subgroup_id, &grp_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group's info\n"); - PART_ERROR_API(H5Ldelete_links_bottom_up); + PART_ERROR(H5Ldelete_links_bottom_up); } if (grp_info.max_corder != LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's maximum creation order value got adjusted to %lld during link " "deletion; value should have remained at %d\n", (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); - PART_ERROR_API(H5Ldelete_links_bottom_up); + PART_ERROR(H5Ldelete_links_bottom_up); } snprintf(link_name, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_BUF_SIZE, "link%d", (int)i); if (H5Ldelete(subgroup_id, link_name, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete link '%s'\n", link_name); - PART_ERROR_API(H5Ldelete_links_bottom_up); + PART_ERROR(H5Ldelete_links_bottom_up); } } @@ -7090,20 +7090,20 @@ test_delete_link_reset_grp_max_crt_order(void) memset(&grp_info, 0, sizeof(grp_info)); if (H5Gget_info(subgroup_id, &grp_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group's info\n"); - PART_ERROR_API(H5Ldelete_links_bottom_up); + PART_ERROR(H5Ldelete_links_bottom_up); } if (grp_info.max_corder != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's maximum creation order value didn't reset to 0 after deleting all " "links from group; value is still %lld\n", (long long)grp_info.max_corder); - PART_ERROR_API(H5Ldelete_links_bottom_up); + PART_ERROR(H5Ldelete_links_bottom_up); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_links_bottom_up); @@ -7116,14 +7116,14 @@ test_delete_link_reset_grp_max_crt_order(void) PART_BEGIN(H5Ldelete_links_top_down) { - TESTING_2_API("H5Ldelete from most-recently created link to least-recently created link"); + TESTING_2("H5Ldelete from most-recently created link to least-recently created link"); if ((subgroup_id = H5Gcreate2(group_id, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_SUBGROUP2_NAME); - PART_ERROR_API(H5Ldelete_links_top_down); + PART_ERROR(H5Ldelete_links_top_down); } /* Create several links inside the group */ @@ -7131,9 +7131,9 @@ test_delete_link_reset_grp_max_crt_order(void) snprintf(link_name, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_BUF_SIZE, "link%d", (int)i); if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", link_name); - PART_ERROR_API(H5Ldelete_links_top_down); + PART_ERROR(H5Ldelete_links_top_down); } } @@ -7142,26 +7142,26 @@ test_delete_link_reset_grp_max_crt_order(void) memset(&grp_info, 0, sizeof(grp_info)); if (H5Gget_info(subgroup_id, &grp_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group's info\n"); - PART_ERROR_API(H5Ldelete_links_top_down); + PART_ERROR(H5Ldelete_links_top_down); } if (grp_info.max_corder != LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's maximum creation order value got adjusted to %lld during link " "deletion; value should have remained at %d\n", (long long)grp_info.max_corder, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); - PART_ERROR_API(H5Ldelete_links_top_down); + PART_ERROR(H5Ldelete_links_top_down); } snprintf(link_name, LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_BUF_SIZE, "link%d", (int)(LINK_DELETE_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS - i - 1)); if (H5Ldelete(subgroup_id, link_name, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to delete link '%s'\n", link_name); - PART_ERROR_API(H5Ldelete_links_top_down); + PART_ERROR(H5Ldelete_links_top_down); } } @@ -7170,20 +7170,20 @@ test_delete_link_reset_grp_max_crt_order(void) memset(&grp_info, 0, sizeof(grp_info)); if (H5Gget_info(subgroup_id, &grp_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group's info\n"); - PART_ERROR_API(H5Ldelete_links_top_down); + PART_ERROR(H5Ldelete_links_top_down); } if (grp_info.max_corder != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group's maximum creation order value didn't reset to 0 after deleting all " "links from group; value is still %lld\n", (long long)grp_info.max_corder); - PART_ERROR_API(H5Ldelete_links_top_down); + PART_ERROR(H5Ldelete_links_top_down); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_links_top_down); @@ -7196,7 +7196,7 @@ test_delete_link_reset_grp_max_crt_order(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -7207,7 +7207,7 @@ test_delete_link_reset_grp_max_crt_order(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7239,36 +7239,36 @@ test_delete_link_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_BY_IDX) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, flag by index, or hard link aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -7276,25 +7276,25 @@ test_delete_link_invalid_params(void) /* Verify the links have been created */ if ((link_exists = H5Lexists(group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first hard link '%s' exists\n", LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first hard link did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ldelete_invalid_loc_id) { - TESTING_2_API("H5Ldelete with an invalid location ID"); + TESTING_2("H5Ldelete with an invalid location ID"); H5E_BEGIN_TRY { @@ -7304,18 +7304,18 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Ldelete_invalid_loc_id); + PART_ERROR(H5Ldelete_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_invalid_loc_id); PART_BEGIN(H5Ldelete_invalid_link_name) { - TESTING_2_API("H5Ldelete with an invalid link name"); + TESTING_2("H5Ldelete with an invalid link name"); H5E_BEGIN_TRY { @@ -7324,9 +7324,9 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete succeeded with a NULL link name!\n"); - PART_ERROR_API(H5Ldelete_invalid_link_name); + PART_ERROR(H5Ldelete_invalid_link_name); } H5E_BEGIN_TRY @@ -7336,18 +7336,18 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete succeeded with an invalid link name of ''!\n"); - PART_ERROR_API(H5Ldelete_invalid_link_name); + PART_ERROR(H5Ldelete_invalid_link_name); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_invalid_link_name); PART_BEGIN(H5Ldelete_invalid_lapl) { - TESTING_2_API("H5Ldelete with an invalid LAPL"); + TESTING_2("H5Ldelete with an invalid LAPL"); H5E_BEGIN_TRY { @@ -7357,18 +7357,18 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Ldelete_invalid_lapl); + PART_ERROR(H5Ldelete_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_invalid_lapl); PART_BEGIN(H5Ldelete_by_idx_invalid_loc_id) { - TESTING_2_API("H5Ldelete_by_idx with an invalid location ID"); + TESTING_2("H5Ldelete_by_idx with an invalid location ID"); H5E_BEGIN_TRY { @@ -7377,18 +7377,18 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_loc_id); + PART_ERROR(H5Ldelete_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_invalid_loc_id); PART_BEGIN(H5Ldelete_by_idx_invalid_grp_name) { - TESTING_2_API("H5Ldelete_by_idx with an invalid group name"); + TESTING_2("H5Ldelete_by_idx with an invalid group name"); H5E_BEGIN_TRY { @@ -7397,9 +7397,9 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with a NULL group name!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_grp_name); + PART_ERROR(H5Ldelete_by_idx_invalid_grp_name); } H5E_BEGIN_TRY @@ -7409,18 +7409,18 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with an invalid group name of ''!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_grp_name); + PART_ERROR(H5Ldelete_by_idx_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_invalid_grp_name); PART_BEGIN(H5Ldelete_by_idx_invalid_index_type) { - TESTING_2_API("H5Ldelete_by_idx with an invalid index type"); + TESTING_2("H5Ldelete_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -7429,9 +7429,9 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_index_type); + PART_ERROR(H5Ldelete_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -7441,18 +7441,18 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_index_type); + PART_ERROR(H5Ldelete_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_invalid_index_type); PART_BEGIN(H5Ldelete_by_idx_invalid_index_order) { - TESTING_2_API("H5Ldelete_by_idx with an invalid iteration ordering"); + TESTING_2("H5Ldelete_by_idx with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -7461,9 +7461,9 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_index_order); + PART_ERROR(H5Ldelete_by_idx_invalid_index_order); } H5E_BEGIN_TRY @@ -7473,18 +7473,18 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_index_order); + PART_ERROR(H5Ldelete_by_idx_invalid_index_order); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_invalid_index_order); PART_BEGIN(H5Ldelete_by_idx_invalid_lapl) { - TESTING_2_API("H5Ldelete_by_idx with an invalid LAPL"); + TESTING_2("H5Ldelete_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -7493,41 +7493,41 @@ test_delete_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ldelete_by_idx succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Ldelete_by_idx_invalid_lapl); + PART_ERROR(H5Ldelete_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_invalid_lapl); PART_BEGIN(H5Ldelete_by_idx_link_existence) { - TESTING_2_API("valid link existence after previous invalid H5Ldelete(_by_idx) calls"); + TESTING_2("valid link existence after previous invalid H5Ldelete(_by_idx) calls"); /* Verify that the link hasn't been deleted */ if ((link_exists = H5Lexists(group_id, LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", LINK_DELETE_INVALID_PARAMS_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Ldelete_by_idx_link_existence); + PART_ERROR(H5Ldelete_by_idx_link_existence); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link didn't exist!\n"); - PART_ERROR_API(H5Ldelete_by_idx_link_existence); + PART_ERROR(H5Ldelete_by_idx_link_existence); } - PASSED_API(); + PASSED(); } PART_END(H5Ldelete_by_idx_link_existence); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -7536,7 +7536,7 @@ test_delete_link_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -7571,125 +7571,125 @@ test_copy_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, soft link, or external link aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't opewn container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, COPY_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", COPY_LINK_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, COPY_LINK_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", COPY_LINK_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, COPY_LINK_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", COPY_LINK_TEST_DST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lcopy_hard_no_check) { - TESTING_2_API("H5Lcopy on hard link (copied link's properties not checked)"); + TESTING_2("H5Lcopy on hard link (copied link's properties not checked)"); /* Try to copy a hard link */ if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } /* Copy the link */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link copy '%s' exists\n", COPY_LINK_TEST_HARD_LINK_COPY_NAME); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original hard link did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_no_check); + PART_ERROR(H5Lcopy_hard_no_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_hard_no_check); @@ -7698,329 +7698,329 @@ test_copy_link(void) H5L_info2_t orig_info, new_info; int cmp_value; - TESTING_2_API("H5Lcopy on hard link (copied link's properties checked)"); + TESTING_2("H5Lcopy on hard link (copied link's properties checked)"); /* Try to copy a hard link */ if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } /* Copy the link */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link copy '%s' exists\n", COPY_LINK_TEST_HARD_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original hard link did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } /* Retrieve the new link's info */ if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_HARD_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_HARD_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (new_info.type != orig_info.type) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's link type doesn't match original link's type\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (H5Otoken_cmp(dst_grp_id, &new_info.u.token, &orig_info.u.token, &cmp_value) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to compare link target tokens\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (cmp_value != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied hard link's object token doesn't match original link's object token\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's 'corder_valid' field doesn't match original link's " "'corder_valid' field\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's creation order value %" PRId64 " doesn't match original link's creation order value %" PRId64 "\n", new_info.corder, orig_info.corder); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } } if (new_info.cset != orig_info.cset) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's character set doesn't match original link's character set\n"); - PART_ERROR_API(H5Lcopy_hard_check); + PART_ERROR(H5Lcopy_hard_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_hard_check); PART_BEGIN(H5Lcopy_hard_same_loc) { - TESTING_2_API("H5Lcopy on hard link using H5L_SAME_LOC"); + TESTING_2("H5Lcopy on hard link using H5L_SAME_LOC"); /* Try to copy a hard link */ if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", COPY_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } /* Verify the links don't currently exist in the target group */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } /* Copy the link using H5L_SAME_LOC as the first parameter to H5Lcopy */ if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_HARD_LINK_NAME3, src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy hard link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n", COPY_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } /* Copy the link using H5L_SAME_LOC as the third parameter to H5Lcopy */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5L_SAME_LOC, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy hard link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n", COPY_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } /* Verify the links have been copied and the original still exist in the source group */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link copy '%s' exists\n", COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link copy '%s' exists\n", COPY_LINK_TEST_HARD_LINK_SAME_LOC_NAME2); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original hard link '%s' exists\n", COPY_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original hard link did not exist\n"); - PART_ERROR_API(H5Lcopy_hard_same_loc); + PART_ERROR(H5Lcopy_hard_same_loc); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_hard_same_loc); PART_BEGIN(H5Lcopy_soft_no_check) { - TESTING_2_API("H5Lcopy on soft link (copied link's properties not checked)"); + TESTING_2("H5Lcopy on soft link (copied link's properties not checked)"); /* Try to copy a soft link */ if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } /* Copy the link */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' copy exists\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original soft link did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_no_check); + PART_ERROR(H5Lcopy_soft_no_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_soft_no_check); @@ -8030,370 +8030,370 @@ test_copy_link(void) char orig_link_val[COPY_LINK_TEST_LINK_VAL_BUF_SIZE]; char new_link_val[COPY_LINK_TEST_LINK_VAL_BUF_SIZE]; - TESTING_2_API("H5Lcopy on soft link (copied link's properties checked)"); + TESTING_2("H5Lcopy on soft link (copied link's properties checked)"); /* Try to copy a soft link */ if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Retrieve the link's value */ if (H5Lget_val(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, orig_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Copy the link */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' copy exists\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original soft link did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Retrieve the new link's info */ if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (new_info.type != orig_info.type) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's link type doesn't match original link's type\n"); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (new_info.u.val_size != orig_info.u.val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied soft link's value size of %llu doesn't match original link's value size " "of %llu\n", (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's 'corder_valid' field doesn't match original link's " "'corder_valid' field\n"); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's creation order value %" PRId64 " doesn't match original link's creation order value %" PRId64 "\n", new_info.corder, orig_info.corder); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } } if (new_info.cset != orig_info.cset) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's character set doesn't match original link's character set\n"); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } /* Check the soft link's value */ if (H5Lget_val(dst_grp_id, COPY_LINK_TEST_SOFT_LINK_COPY_NAME2, new_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } if (HDstrncmp(orig_link_val, new_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE)) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied soft link's value '%s' doesn't match original link's value '%s'\n", new_link_val, orig_link_val); - PART_ERROR_API(H5Lcopy_soft_check); + PART_ERROR(H5Lcopy_soft_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_soft_check); PART_BEGIN(H5Lcopy_soft_same_loc) { - TESTING_2_API("H5Lcopy on soft link using H5L_SAME_LOC"); + TESTING_2("H5Lcopy on soft link using H5L_SAME_LOC"); /* Try to copy a soft link */ if (H5Lcreate_soft(COPY_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", COPY_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } /* Verify the links don't currently exist in the target group */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } /* Copy the link using H5L_SAME_LOC as the first parameter to H5Lcopy */ if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_SOFT_LINK_NAME3, src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy soft link '%s' using H5L_SAME_LOC as first parameter to H5Lcopy\n", COPY_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } /* Copy the link using H5L_SAME_LOC as the third parameter to H5Lcopy */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5L_SAME_LOC, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy soft link '%s' using H5L_SAME_LOC as third parameter to H5Lcopy\n", COPY_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } /* Verify the links have been copied and the original still exists in the source group */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' copy exists\n", COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' copy exists\n", COPY_LINK_TEST_SOFT_LINK_SAME_LOC_NAME2); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original soft link '%s' exists\n", COPY_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original soft link did not exist\n"); - PART_ERROR_API(H5Lcopy_soft_same_loc); + PART_ERROR(H5Lcopy_soft_same_loc); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_soft_same_loc); PART_BEGIN(H5Lcopy_external_no_check) { - TESTING_2_API("H5Lcopy on external link (copied link's properties not checked)"); + TESTING_2("H5Lcopy on external link (copied link's properties not checked)"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } /* Try to copy an external link */ if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } /* Copy the link */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link copy '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original external link did not exist\n"); - PART_ERROR_API(H5Lcopy_external_no_check); + PART_ERROR(H5Lcopy_external_no_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_external_no_check); @@ -8413,194 +8413,194 @@ test_copy_link(void) char orig_link_val[COPY_LINK_TEST_LINK_VAL_BUF_SIZE]; char new_link_val[COPY_LINK_TEST_LINK_VAL_BUF_SIZE]; - TESTING_2_API("H5Lcopy on external link (copied link's properties checked)"); + TESTING_2("H5Lcopy on external link (copied link's properties checked)"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Try to copy an external link */ if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Retrieve the link's value */ if (H5Lget_val(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, orig_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (H5Lunpack_elink_val(orig_link_val, orig_info.u.val_size, &unpack_flags, &orig_filename, &orig_objname) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack original external link's value buffer\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Copy the link */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Verify the link has been copied and still exists in the source group */ if ((link_exists = H5Lexists(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link copy '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original external link did not exist\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Retrieve the new link's info */ if (H5Lget_info2(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, &new_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (new_info.type != orig_info.type) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's link type doesn't match original link's type\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (new_info.u.val_size != orig_info.u.val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied external link's value size of %llu doesn't match original link's value " "size of %llu\n", (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's 'corder_valid' field doesn't match original link's " "'corder_valid' field\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's creation order value %" PRId64 " doesn't match original link's creation " "order value %" PRId64 "\n", new_info.corder, orig_info.corder); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } } if (new_info.cset != orig_info.cset) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied link's character set doesn't match original link's character set\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } /* Check the external link's value */ if (H5Lget_val(dst_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2, new_link_val, COPY_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_COPY_NAME2); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (H5Lunpack_elink_val(new_link_val, new_info.u.val_size, &unpack_flags, &new_filename, &new_objname) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack copied external link's value buffer\n"); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (HDstrncmp(new_filename, orig_filename, strlen(orig_filename)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied external link's filename '%s' doesn't match original external link's " "filename '%s'\n", new_filename, orig_filename); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } if (HDstrncmp(new_objname, orig_objname, strlen(orig_objname)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied external link's object name '%s' doesn't match original external link's " "object name '%s'\n", new_objname, orig_objname); - PART_ERROR_API(H5Lcopy_external_check); + PART_ERROR(H5Lcopy_external_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_external_check); @@ -8613,133 +8613,133 @@ test_copy_link(void) PART_BEGIN(H5Lcopy_external_same_loc) { - TESTING_2_API("H5Lcopy on external link using H5L_SAME_LOC"); + TESTING_2("H5Lcopy on external link using H5L_SAME_LOC"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } /* Try to copy an external link */ if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } /* Verify the links don't currently exist in the target group */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link existed in target group before copy!\n"); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } /* Copy the link using H5L_SAME_LOC as the first parameter to H5Lcopy */ if (H5Lcopy(H5L_SAME_LOC, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy external link '%s' using H5L_SAME_LOC as first parameter to " "H5Lcopy\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } /* Copy the link using H5L_SAME_LOC as the third parameter to H5Lcopy */ if (H5Lcopy(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5L_SAME_LOC, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy external link '%s' using H5L_SAME_LOC as third parameter to " "H5Lcopy\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } /* Verify the links have been copied and the original still exists in the source group */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link copy '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link copy '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_SAME_LOC_NAME2); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link copy did not exist\n"); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original external link '%s' exists\n", COPY_LINK_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original external link did not exist\n"); - PART_ERROR_API(H5Lcopy_external_same_loc); + PART_ERROR(H5Lcopy_external_same_loc); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_external_same_loc); @@ -8752,40 +8752,40 @@ test_copy_link(void) PART_BEGIN(H5Lcopy_ud_no_check) { - TESTING_2_API("H5Lcopy on user-defined link (copied link's properties not checked)"); + TESTING_2("H5Lcopy on user-defined link (copied link's properties not checked)"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lcopy_ud_no_check); } PART_END(H5Lcopy_ud_no_check); PART_BEGIN(H5Lcopy_ud_check) { - TESTING_2_API("H5Lcopy on user-defined link (copied link's properties checked)"); + TESTING_2("H5Lcopy on user-defined link (copied link's properties checked)"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lcopy_ud_check); } PART_END(H5Lcopy_ud_check); PART_BEGIN(H5Lcopy_ud_same_loc) { - TESTING_2_API("H5Lcopy on user-defined link using H5L_SAME_LOC"); + TESTING_2("H5Lcopy on user-defined link using H5L_SAME_LOC"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lcopy_ud_same_loc); } PART_END(H5Lcopy_ud_same_loc); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(dst_grp_id) < 0) TEST_ERROR; @@ -8798,7 +8798,7 @@ test_copy_link(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -8830,9 +8830,9 @@ test_copy_link(void) static int test_copy_links_into_group_with_links(void) { - TESTING_API("H5Lcopy adjusting creation order values for copied links"); + TESTING("H5Lcopy adjusting creation order values for copied links"); - SKIPPED_API(); + SKIPPED(); return 1; } @@ -8849,11 +8849,11 @@ test_copy_links_into_group_with_links(void) static int test_copy_link_across_files(void) { - TESTING_API("link copying across files"); + TESTING("link copying across files"); /* TODO */ - SKIPPED_API(); + SKIPPED(); return 0; } @@ -8879,50 +8879,50 @@ test_copy_link_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or hard links aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -8930,25 +8930,25 @@ test_copy_link_invalid_params(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", COPY_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lcopy_invalid_src_loc_id) { - TESTING_2_API("H5Lcopy with an invalid source location ID"); + TESTING_2("H5Lcopy with an invalid source location ID"); H5E_BEGIN_TRY { @@ -8959,18 +8959,18 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with an invalid source location ID\n"); - PART_ERROR_API(H5Lcopy_invalid_src_loc_id); + PART_ERROR(H5Lcopy_invalid_src_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_src_loc_id); PART_BEGIN(H5Lcopy_invalid_src_name) { - TESTING_2_API("H5Lcopy with an invalid source name"); + TESTING_2("H5Lcopy with an invalid source name"); H5E_BEGIN_TRY { @@ -8981,9 +8981,9 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with a NULL source name\n"); - PART_ERROR_API(H5Lcopy_invalid_src_name); + PART_ERROR(H5Lcopy_invalid_src_name); } H5E_BEGIN_TRY @@ -8995,18 +8995,18 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with an invalid source name of ''\n"); - PART_ERROR_API(H5Lcopy_invalid_src_name); + PART_ERROR(H5Lcopy_invalid_src_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_src_name); PART_BEGIN(H5Lcopy_invalid_dst_loc_id) { - TESTING_2_API("H5Lcopy with an invalid destination location ID"); + TESTING_2("H5Lcopy with an invalid destination location ID"); H5E_BEGIN_TRY { @@ -9017,18 +9017,18 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with an invalid destination location ID\n"); - PART_ERROR_API(H5Lcopy_invalid_dst_loc_id); + PART_ERROR(H5Lcopy_invalid_dst_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_dst_loc_id); PART_BEGIN(H5Lcopy_invalid_dst_name) { - TESTING_2_API("H5Lcopy with an invalid destination name"); + TESTING_2("H5Lcopy with an invalid destination name"); H5E_BEGIN_TRY { @@ -9038,9 +9038,9 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with a NULL destination name\n"); - PART_ERROR_API(H5Lcopy_invalid_dst_name); + PART_ERROR(H5Lcopy_invalid_dst_name); } H5E_BEGIN_TRY @@ -9051,18 +9051,18 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with an invalid destination name of ''\n"); - PART_ERROR_API(H5Lcopy_invalid_dst_name); + PART_ERROR(H5Lcopy_invalid_dst_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_dst_name); PART_BEGIN(H5Lcopy_invalid_lcpl) { - TESTING_2_API("H5Lcopy with an invalid LCPL"); + TESTING_2("H5Lcopy with an invalid LCPL"); H5E_BEGIN_TRY { @@ -9073,18 +9073,18 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with an invalid LCPL\n"); - PART_ERROR_API(H5Lcopy_invalid_lcpl); + PART_ERROR(H5Lcopy_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_lcpl); PART_BEGIN(H5Lcopy_invalid_lapl) { - TESTING_2_API("H5Lcopy with an invalid LAPL"); + TESTING_2("H5Lcopy with an invalid LAPL"); H5E_BEGIN_TRY { @@ -9095,18 +9095,18 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with an invalid LAPL\n"); - PART_ERROR_API(H5Lcopy_invalid_lapl); + PART_ERROR(H5Lcopy_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_lapl); PART_BEGIN(H5Lcopy_invalid_same_location) { - TESTING_2_API("H5Lcopy with an invalid same location"); + TESTING_2("H5Lcopy with an invalid same location"); H5E_BEGIN_TRY { @@ -9117,29 +9117,29 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded with an invalid same location\n"); - PART_ERROR_API(H5Lcopy_invalid_same_location); + PART_ERROR(H5Lcopy_invalid_same_location); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_same_location); PART_BEGIN(H5Lcopy_invalid_across_files) { - TESTING_2_API("H5Lcopy invalid across files"); + TESTING_2("H5Lcopy invalid across files"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); - PART_ERROR_API(H5Lcopy_invalid_across_files); + PART_ERROR(H5Lcopy_invalid_across_files); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_invalid_across_files); + PART_ERROR(H5Lcopy_invalid_across_files); } H5E_BEGIN_TRY @@ -9151,24 +9151,24 @@ test_copy_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lcopy succeeded in copying a hard link across files!\n"); - PART_ERROR_API(H5Lcopy_invalid_across_files); + PART_ERROR(H5Lcopy_invalid_across_files); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lcopy_invalid_across_files); + PART_ERROR(H5Lcopy_invalid_across_files); } - PASSED_API(); + PASSED(); } PART_END(H5Lcopy_invalid_across_files); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(dst_grp_id) < 0) TEST_ERROR; @@ -9181,7 +9181,7 @@ test_copy_link_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -9221,131 +9221,131 @@ test_move_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, soft link, or external link aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_TEST_DST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lmove_hard_no_check) { - TESTING_2_API("H5Lmove on hard link (moved link's properties not checked)"); + TESTING_2("H5Lmove on hard link (moved link's properties not checked)"); /* Try to move a hard link */ if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } /* Move the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old hard link exists\n"); - PART_ERROR_API(H5Lmove_hard_no_check); + PART_ERROR(H5Lmove_hard_no_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_hard_no_check); @@ -9354,407 +9354,407 @@ test_move_link(void) H5L_info2_t orig_info, new_info; int cmp_value; - TESTING_2_API("H5Lmove on hard link (moved link's properties checked)"); + TESTING_2("H5Lmove on hard link (moved link's properties checked)"); /* Try to move a hard link */ if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } /* Move the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old hard link exists\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } /* Retrieve the moved link's info */ if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (new_info.type != orig_info.type) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's link type doesn't match original link's type\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (H5Otoken_cmp(dst_grp_id, &new_info.u.token, &orig_info.u.token, &cmp_value) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to compare link target tokens\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (cmp_value != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved hard link's object token doesn't match original link's object token\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf( " moved link's 'corder_valid' field doesn't match original link's 'corder_valid' " "field\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's creation order value %" PRId64 " doesn't match original link's creation order value %" PRId64 "\n", new_info.corder, orig_info.corder); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } } if (new_info.cset != orig_info.cset) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's character set doesn't match original link's character set\n"); - PART_ERROR_API(H5Lmove_hard_check); + PART_ERROR(H5Lmove_hard_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_hard_check); PART_BEGIN(H5Lmove_hard_same_loc) { - TESTING_2_API("H5Lmove on hard link using H5L_SAME_LOC"); + TESTING_2("H5Lmove on hard link using H5L_SAME_LOC"); /* Try to move a hard link */ if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } /* Rename the link using H5L_SAME_LOC as the first parameter to H5Lmove */ if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_HARD_LINK_NAME3, src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n", MOVE_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } /* Ensure the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original hard link existed in target group after move!\n"); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist after move!\n"); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } /* Rename the link back using H5L_SAME_LOC as the third parameter to H5Lmove */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5L_SAME_LOC, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n", MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } /* Verify the link has been renamed back */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original hard link did not exist after moving the link back!\n"); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed hard link exists after moving the link back!\n"); - PART_ERROR_API(H5Lmove_hard_same_loc); + PART_ERROR(H5Lmove_hard_same_loc); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_hard_same_loc); PART_BEGIN(H5Lmove_hard_rename) { - TESTING_2_API("H5Lmove to rename hard link without moving it"); + TESTING_2("H5Lmove to rename hard link without moving it"); /* Try to rename a hard link */ if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME4); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } /* Verify the renamed link doesn't currently exist in the source group */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if renamed hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NEW_NAME); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed hard link existed in source group before move!\n"); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } /* Rename the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to rename link '%s'\n", MOVE_LINK_TEST_HARD_LINK_NAME4); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } /* Verify the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if renamed hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NEW_NAME); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed hard link did not exist\n"); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_HARD_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old hard link '%s' exists\n", MOVE_LINK_TEST_HARD_LINK_NAME4); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old hard link exists\n"); - PART_ERROR_API(H5Lmove_hard_rename); + PART_ERROR(H5Lmove_hard_rename); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_hard_rename); PART_BEGIN(H5Lmove_soft_no_check) { - TESTING_2_API("H5Lmove on soft link (moved link's properties not checked)"); + TESTING_2("H5Lmove on soft link (moved link's properties not checked)"); /* Try to move a soft link */ if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } /* Move the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old soft link exists\n"); - PART_ERROR_API(H5Lmove_soft_no_check); + PART_ERROR(H5Lmove_soft_no_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_soft_no_check); @@ -9764,440 +9764,440 @@ test_move_link(void) char orig_link_val[MOVE_LINK_TEST_LINK_VAL_BUF_SIZE]; char new_link_val[MOVE_LINK_TEST_LINK_VAL_BUF_SIZE]; - TESTING_2_API("H5Lmove on soft link (moved link's properties checked)"); + TESTING_2("H5Lmove on soft link (moved link's properties checked)"); /* Try to move a soft link */ if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Retrieve the link's value */ if (H5Lget_val(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, orig_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Move the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old soft link exists\n"); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Retrieve the moved link's info */ if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (new_info.type != orig_info.type) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's link type doesn't match original link's type\n"); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (new_info.u.val_size != orig_info.u.val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved soft link's value size of %llu doesn't match original link's value size " "of %llu\n", (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf( " moved link's 'corder_valid' field doesn't match original link's 'corder_valid' " "field\n"); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's creation order value %" PRId64 " doesn't match original link's creation order value %" PRId64 "\n", new_info.corder, orig_info.corder); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } } if (new_info.cset != orig_info.cset) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's character set doesn't match original link's character set\n"); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } /* Check the soft link's value */ if (H5Lget_val(dst_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME2, new_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } if (HDstrncmp(orig_link_val, new_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE)) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved soft link's value '%s' doesn't match original link's value '%s'\n", new_link_val, orig_link_val); - PART_ERROR_API(H5Lmove_soft_check); + PART_ERROR(H5Lmove_soft_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_soft_check); PART_BEGIN(H5Lmove_soft_same_loc) { - TESTING_2_API("H5Lmove on soft link using H5L_SAME_LOC"); + TESTING_2("H5Lmove on soft link using H5L_SAME_LOC"); /* Try to move a soft link */ if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } /* Rename the link using H5L_SAME_LOC as the first parameter to H5Lmove */ if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_SOFT_LINK_NAME3, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s' using H5L_SAME_LOC as first parameter to H5Lmove\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } /* Ensure the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original soft link existed in target group after move!\n"); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist after move!\n"); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } /* Rename the link back using H5L_SAME_LOC as the third parameter to H5Lmove */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5L_SAME_LOC, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s' using H5L_SAME_LOC as third parameter to H5Lmove\n", MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } /* Verify the link has been renamed back */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original hard link did not exist after moving the link back!\n"); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed soft link exists after moving the link back!\n"); - PART_ERROR_API(H5Lmove_soft_same_loc); + PART_ERROR(H5Lmove_soft_same_loc); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_soft_same_loc); PART_BEGIN(H5Lmove_soft_rename) { - TESTING_2_API("H5Lmove to rename soft link without moving it"); + TESTING_2("H5Lmove to rename soft link without moving it"); /* Try to rename a soft link */ if (H5Lcreate_soft(MOVE_LINK_TEST_SOFT_LINK_TARGET_PATH, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } /* Verify the renamed link doesn't currently exist in the source group */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if renamed soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NEW_NAME); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed soft link existed in source group before move!\n"); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } /* Rename the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to rename link '%s'\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } /* Verify the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if renamed soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NEW_NAME); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed soft link did not exist\n"); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_SOFT_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old soft link '%s' exists\n", MOVE_LINK_TEST_SOFT_LINK_NAME4); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old soft link exists\n"); - PART_ERROR_API(H5Lmove_soft_rename); + PART_ERROR(H5Lmove_soft_rename); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_soft_rename); PART_BEGIN(H5Lmove_external_no_check) { - TESTING_2_API("H5Lmove on external link (moved link's properties not checked)"); + TESTING_2("H5Lmove on external link (moved link's properties not checked)"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } /* Try to move an external link */ if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } /* Move the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old external link exists\n"); - PART_ERROR_API(H5Lmove_external_no_check); + PART_ERROR(H5Lmove_external_no_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_external_no_check); @@ -10217,194 +10217,194 @@ test_move_link(void) char orig_link_val[MOVE_LINK_TEST_LINK_VAL_BUF_SIZE]; char new_link_val[MOVE_LINK_TEST_LINK_VAL_BUF_SIZE]; - TESTING_2_API("H5Lmove on external link (moved link's properties checked)"); + TESTING_2("H5Lmove on external link (moved link's properties checked)"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Try to move an external link */ if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Retrieve the link's info */ if (H5Lget_info2(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, &orig_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Retrieve the link's value */ if (H5Lget_val(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, orig_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (H5Lunpack_elink_val(orig_link_val, orig_info.u.val_size, &unpack_flags, &orig_filename, &orig_objname) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack original external link's value buffer\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Move the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Verify the link has been moved */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old external link exists\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Retrieve the moved link's info */ if (H5Lget_info2(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, &new_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve info for link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (new_info.type != orig_info.type) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's link type doesn't match original link's type\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (new_info.u.val_size != orig_info.u.val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved external link's value size of %llu doesn't match original link's value " "size of %llu\n", (unsigned long long)new_info.u.val_size, (unsigned long long)orig_info.u.val_size); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (new_info.corder_valid != orig_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf( " moved link's 'corder_valid' field doesn't match original link's 'corder_valid' " "field\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (new_info.corder_valid && orig_info.corder_valid && (new_info.corder != orig_info.corder)) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's creation order value %" PRId64 " doesn't match original link's creation " "order value %" PRId64 "\n", new_info.corder, orig_info.corder); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } } if (new_info.cset != orig_info.cset) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved link's character set doesn't match original link's character set\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } /* Check the external link's value */ if (H5Lget_val(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME2, new_link_val, MOVE_LINK_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't retrieve value for external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME2); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (H5Lunpack_elink_val(new_link_val, new_info.u.val_size, &unpack_flags, &new_filename, &new_objname) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack moved external link's value buffer\n"); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (HDstrncmp(new_filename, orig_filename, strlen(orig_filename)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved external link's filename '%s' doesn't match original external link's " "filename '%s'\n", new_filename, orig_filename); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } if (HDstrncmp(new_objname, orig_objname, strlen(orig_objname)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" moved external link's object name '%s' doesn't match original external link's " "object name '%s'\n", new_objname, orig_objname); - PART_ERROR_API(H5Lmove_external_check); + PART_ERROR(H5Lmove_external_check); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_external_check); @@ -10417,129 +10417,129 @@ test_move_link(void) PART_BEGIN(H5Lmove_external_same_loc) { - TESTING_2_API("H5Lmove on external link using H5L_SAME_LOC"); + TESTING_2("H5Lmove on external link using H5L_SAME_LOC"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } /* Try to move an external link */ if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link existed in target group before move!\n"); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } /* Rename the link using H5L_SAME_LOC as the first parameter to H5Lmove */ if (H5Lmove(H5L_SAME_LOC, MOVE_LINK_TEST_EXTERN_LINK_NAME3, src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } /* Ensure the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original external link existed in target group after move!\n"); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist after move!\n"); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } /* Rename the link back using H5L_SAME_LOC as the third parameter to H5Lmove */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5L_SAME_LOC, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } /* Verify the link has been renamed back */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME3); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original external link did not exist after moving the link back!\n"); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_SAME_LOC_NAME); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed external link exists after moving the link back!\n"); - PART_ERROR_API(H5Lmove_external_same_loc); + PART_ERROR(H5Lmove_external_same_loc); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_external_same_loc); @@ -10552,92 +10552,92 @@ test_move_link(void) PART_BEGIN(H5Lmove_external_rename) { - TESTING_2_API("H5Lmove to rename external link without moving it"); + TESTING_2("H5Lmove to rename external link without moving it"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } /* Try to move an external link */ if (H5Lcreate_external(ext_link_filename, "/", src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } /* Verify the renamed link doesn't currently exist in the source group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if renamed external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed external link existed in source group before move!\n"); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } /* Rename the link */ if (H5Lmove(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to rename link '%s'\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } /* Verify the link has been renamed */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if renamed external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NEW_NAME); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" renamed external link did not exist\n"); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } /* Verify the old link is gone */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_TEST_EXTERN_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if old external link '%s' exists\n", MOVE_LINK_TEST_EXTERN_LINK_NAME4); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" old external link exists\n"); - PART_ERROR_API(H5Lmove_external_rename); + PART_ERROR(H5Lmove_external_rename); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_external_rename); @@ -10650,51 +10650,51 @@ test_move_link(void) PART_BEGIN(H5Lmove_ud_no_check) { - TESTING_2_API("H5Lmove on user-defined link (moved link's properties not checked)"); + TESTING_2("H5Lmove on user-defined link (moved link's properties not checked)"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lmove_ud_no_check); } PART_END(H5Lmove_ud_no_check); PART_BEGIN(H5Lmove_ud_check) { - TESTING_2_API("H5Lmove on user-defined link (moved link's properties checked)"); + TESTING_2("H5Lmove on user-defined link (moved link's properties checked)"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lmove_ud_check); } PART_END(H5Lmove_ud_check); PART_BEGIN(H5Lmove_ud_same_loc) { - TESTING_2_API("H5Lmove on user-defined link using H5L_SAME_LOC"); + TESTING_2("H5Lmove on user-defined link using H5L_SAME_LOC"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lmove_ud_same_loc); } PART_END(H5Lmove_ud_same_loc); PART_BEGIN(H5Lmove_ud_rename) { - TESTING_2_API("H5Lmove to rename user-defined link without moving it"); + TESTING_2("H5Lmove to rename user-defined link without moving it"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lmove_ud_rename); } PART_END(H5Lmove_ud_rename); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(dst_grp_id) < 0) TEST_ERROR; @@ -10707,7 +10707,7 @@ test_move_link(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -10747,59 +10747,59 @@ test_move_links_into_group_with_links(void) hid_t gcpl_id = H5I_INVALID_HID; char link_name[MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_BUF_SIZE]; - TESTING_API("H5Lmove adjusting creation order values for moved links"); + TESTING("H5Lmove adjusting creation order values for moved links"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, or creation order aren't " "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SUBGROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_SRC_GRP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_DST_GRP_NAME); goto error; } @@ -10809,7 +10809,7 @@ test_move_links_into_group_with_links(void) snprintf(link_name, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_BUF_SIZE, "link_to_move%d", (int)i); if (H5Lcreate_hard(src_grp_id, ".", src_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create link '%s' in source group\n", link_name); goto error; } @@ -10817,20 +10817,20 @@ test_move_links_into_group_with_links(void) /* Check the current creation order value for each link */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info2(src_grp_id, link_name, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve info for link '%s'\n", link_name); goto error; } if (!link_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf(" creation order value for newly-created link '%s' was marked as not valid!\n", link_name); goto error; } if (link_info.corder != (int64_t)i) { - H5_FAILED_API(); + H5_FAILED(); printf(" creation order value %lld for link '%s' did not match expected value %lld\n", (long long)link_info.corder, link_name, (long long)i); goto error; @@ -10842,7 +10842,7 @@ test_move_links_into_group_with_links(void) snprintf(link_name, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_BUF_SIZE, "link%d", (int)i); if (H5Lcreate_hard(dst_grp_id, ".", dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create link '%s' in destination group\n", link_name); goto error; } @@ -10853,7 +10853,7 @@ test_move_links_into_group_with_links(void) snprintf(link_name, MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_BUF_SIZE, "link_to_move%d", (int)i); if (H5Lmove(src_grp_id, link_name, dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s' from source group to destination group\n", link_name); goto error; } @@ -10861,19 +10861,19 @@ test_move_links_into_group_with_links(void) /* Check that the creation order value for each moved link has been adjusted */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info2(dst_grp_id, link_name, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve info for link '%s'\n", link_name); goto error; } if (!link_info.corder_valid) { - H5_FAILED_API(); + H5_FAILED(); printf(" creation order value for moved link '%s' was marked as not valid!\n", link_name); goto error; } if (link_info.corder != (int64_t)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS)) { - H5_FAILED_API(); + H5_FAILED(); printf(" creation order value for moved link '%s' was not adjusted after move! It should " "have been %lld but was %lld\n", link_name, (long long)(i + MOVE_LINK_INTO_GRP_WITH_LINKS_TEST_NUM_LINKS), @@ -10895,7 +10895,7 @@ test_move_links_into_group_with_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -10925,11 +10925,11 @@ test_move_links_into_group_with_links(void) static int test_move_link_across_files(void) { - TESTING_API("link moving across files"); + TESTING("link moving across files"); /* TODO */ - SKIPPED_API(); + SKIPPED(); return 0; } @@ -10950,45 +10950,45 @@ test_move_link_reset_grp_max_crt_order(void) hid_t gcpl_id = H5I_INVALID_HID; char link_name[MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_BUF_SIZE]; - TESTING_API("H5Lmove of all links out of group resets group's maximum link creation order value"); + TESTING("H5Lmove of all links out of group resets group's maximum link creation order value"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, or creation order aren't " "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SUBGROUP_NAME); goto error; @@ -10996,14 +10996,14 @@ test_move_link_reset_grp_max_crt_order(void) if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_SRC_GRP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_DST_GRP_NAME); goto error; } @@ -11013,7 +11013,7 @@ test_move_link_reset_grp_max_crt_order(void) snprintf(link_name, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_BUF_SIZE, "link%d", (int)i); if (H5Lcreate_hard(src_grp_id, ".", src_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s' in source group\n", link_name); goto error; } @@ -11027,13 +11027,13 @@ test_move_link_reset_grp_max_crt_order(void) memset(&grp_info, 0, sizeof(grp_info)); if (H5Gget_info(src_grp_id, &grp_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve source group's info\n"); goto error; } if (grp_info.max_corder != MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" source group's maximum creation order value got adjusted to %lld during link " "moving; value should have remained at %d\n", (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); @@ -11043,7 +11043,7 @@ test_move_link_reset_grp_max_crt_order(void) snprintf(link_name, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_BUF_SIZE, "link%d", (int)i); if (H5Lmove(src_grp_id, link_name, dst_grp_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to move link '%s' to destination group\n", link_name); goto error; } @@ -11056,13 +11056,13 @@ test_move_link_reset_grp_max_crt_order(void) memset(&grp_info, 0, sizeof(grp_info)); if (H5Gget_info(src_grp_id, &grp_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve source group's info\n"); goto error; } if (grp_info.max_corder != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" source group's maximum creation order value didn't reset to 0 after moving all links " "out of it; value is still %lld\n", (long long)grp_info.max_corder); @@ -11073,13 +11073,13 @@ test_move_link_reset_grp_max_crt_order(void) memset(&grp_info, 0, sizeof(grp_info)); if (H5Gget_info(dst_grp_id, &grp_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve destination group's info\n"); goto error; } if (grp_info.max_corder != MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" destination group's maximum creation order value of %lld didn't match expected value " "of %d after moving all links into it\n", (long long)grp_info.max_corder, MOVE_LINK_RESET_MAX_CRT_ORDER_TEST_NUM_LINKS); @@ -11099,7 +11099,7 @@ test_move_link_reset_grp_max_crt_order(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -11138,50 +11138,50 @@ test_move_link_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or hard link aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((src_grp_id = H5Gcreate2(group_id, MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_SRC_GROUP_NAME); goto error; } if ((dst_grp_id = H5Gcreate2(group_id, MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_DST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -11189,14 +11189,14 @@ test_move_link_invalid_params(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); goto error; } @@ -11204,25 +11204,25 @@ test_move_link_invalid_params(void) /* Verify the link doesn't currently exist in the target group */ if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group before move!\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lmove_invalid_src_loc_id) { - TESTING_2_API("H5Lmove with an invalid source location ID"); + TESTING_2("H5Lmove with an invalid source location ID"); H5E_BEGIN_TRY { @@ -11232,18 +11232,18 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with an invalid source location ID!\n"); - PART_ERROR_API(H5Lmove_invalid_src_loc_id); + PART_ERROR(H5Lmove_invalid_src_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_invalid_src_loc_id); PART_BEGIN(H5Lmove_invalid_src_name) { - TESTING_2_API("H5Lmove with an invalid source name"); + TESTING_2("H5Lmove with an invalid source name"); H5E_BEGIN_TRY { @@ -11253,9 +11253,9 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with a NULL source name!\n"); - PART_ERROR_API(H5Lmove_invalid_src_name); + PART_ERROR(H5Lmove_invalid_src_name); } H5E_BEGIN_TRY @@ -11266,18 +11266,18 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with an invalid source name of ''!\n"); - PART_ERROR_API(H5Lmove_invalid_src_name); + PART_ERROR(H5Lmove_invalid_src_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_invalid_src_name); PART_BEGIN(H5Lmove_invalid_dst_loc_id) { - TESTING_2_API("H5Lmove with an invalid destination location ID"); + TESTING_2("H5Lmove with an invalid destination location ID"); H5E_BEGIN_TRY { @@ -11287,18 +11287,18 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with an invalid destination location ID!\n"); - PART_ERROR_API(H5Lmove_invalid_dst_loc_id); + PART_ERROR(H5Lmove_invalid_dst_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_invalid_dst_loc_id); PART_BEGIN(H5Lmove_invalid_dst_name) { - TESTING_2_API("H5Lmove with an invalid destination name"); + TESTING_2("H5Lmove with an invalid destination name"); H5E_BEGIN_TRY { @@ -11308,9 +11308,9 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with a NULL destination name!\n"); - PART_ERROR_API(H5Lmove_invalid_dst_name); + PART_ERROR(H5Lmove_invalid_dst_name); } H5E_BEGIN_TRY @@ -11321,18 +11321,18 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with an invalid destination name of ''!\n"); - PART_ERROR_API(H5Lmove_invalid_dst_name); + PART_ERROR(H5Lmove_invalid_dst_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_invalid_dst_name); PART_BEGIN(H5Lmove_invalid_lcpl) { - TESTING_2_API("H5Lmove with an invalid LCPL"); + TESTING_2("H5Lmove with an invalid LCPL"); H5E_BEGIN_TRY { @@ -11342,18 +11342,18 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with an invalid LCPL!\n"); - PART_ERROR_API(H5Lmove_invalid_lcpl); + PART_ERROR(H5Lmove_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_invalid_lcpl); PART_BEGIN(H5Lmove_invalid_lapl) { - TESTING_2_API("H5Lmove with an invalid LAPL"); + TESTING_2("H5Lmove with an invalid LAPL"); H5E_BEGIN_TRY { @@ -11363,55 +11363,55 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Lmove_invalid_lapl); + PART_ERROR(H5Lmove_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_invalid_lapl); PART_BEGIN(H5Lmove_existence) { - TESTING_2_API("valid link existence in original group after previous invalid H5Lmove calls"); + TESTING_2("valid link existence in original group after previous invalid H5Lmove calls"); /* Verify the link hasn't been moved */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_existence); + PART_ERROR(H5Lmove_existence); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link didn't exist in source group after invalid move!\n"); - PART_ERROR_API(H5Lmove_existence); + PART_ERROR(H5Lmove_existence); } if ((link_exists = H5Lexists(dst_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_existence); + PART_ERROR(H5Lmove_existence); } if (link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link existed in target group after invalid move!\n"); - PART_ERROR_API(H5Lmove_existence); + PART_ERROR(H5Lmove_existence); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_existence); PART_BEGIN(H5Lmove_same_location) { - TESTING_2_API("H5Lmove with an invalid same location"); + TESTING_2("H5Lmove with an invalid same location"); /* Move a group within the file. Both of source and destination use * H5L_SAME_LOC. Should fail. */ @@ -11423,29 +11423,29 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded with an invalid same location!\n"); - PART_ERROR_API(H5Lmove_same_location); + PART_ERROR(H5Lmove_same_location); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_same_location); PART_BEGIN(H5Lmove_across_files) { - TESTING_2_API("H5Lmove into another file"); + TESTING_2("H5Lmove into another file"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); - PART_ERROR_API(H5Lmove_across_files); + PART_ERROR(H5Lmove_across_files); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lmove_across_files); + PART_ERROR(H5Lmove_across_files); } /* Move a group across files. */ @@ -11457,40 +11457,40 @@ test_move_link_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lmove succeeded in moving a hard link across files!\n"); - PART_ERROR_API(H5Lmove_across_files); + PART_ERROR(H5Lmove_across_files); } /* Ensure that original link still exists */ if ((link_exists = H5Lexists(src_grp_id, MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if original link '%s' exists after invalid link move\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_across_files); + PART_ERROR(H5Lmove_across_files); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" original link '%s' didn't exist after failed move!\n", MOVE_LINK_INVALID_PARAMS_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lmove_across_files); + PART_ERROR(H5Lmove_across_files); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close a file!\n"); - PART_ERROR_API(H5Lmove_across_files); + PART_ERROR(H5Lmove_across_files); } - PASSED_API(); + PASSED(); } PART_END(H5Lmove_across_files); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(dst_grp_id) < 0) TEST_ERROR; @@ -11503,7 +11503,7 @@ test_move_link_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -11549,35 +11549,35 @@ test_get_link_val(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, external link, or creation " "order aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -11585,18 +11585,18 @@ test_get_link_val(void) if ((group_id = H5Gcreate2(container_group, GET_LINK_VAL_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP_NAME); goto error; } if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -11604,70 +11604,70 @@ test_get_link_val(void) { const char *link_target = "/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP_NAME; - TESTING_2_API("H5Lget_val on soft link"); + TESTING_2("H5Lget_val on soft link"); memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } if (H5Lcreate_soft(link_target, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } if (H5Lget_info2(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info\n"); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } link_val_size = strlen(link_target) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu did not match expected size of %zu\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Lget_val(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value\n"); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } if (HDstrncmp(link_val_buf, link_target, link_val_size)) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link value did not match\n"); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Lget_val_soft); + PART_ERROR(H5Lget_val_soft); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_soft); @@ -11682,98 +11682,98 @@ test_get_link_val(void) { const char *ext_obj_name = "/"; - TESTING_2_API("H5Lget_val on external link"); + TESTING_2("H5Lget_val on external link"); memset(&link_info, 0, sizeof(link_info)); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (H5Lcreate_external(ext_link_filename, ext_obj_name, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (H5Lget_info2(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info\n"); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu did not match expected size of %zu\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (H5Lget_val(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value\n"); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (HDstrncmp(ext_link_val, ext_obj_name, strlen(ext_obj_name) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP2_NAME); - PART_ERROR_API(H5Lget_val_external); + PART_ERROR(H5Lget_val_external); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_external); @@ -11788,11 +11788,11 @@ test_get_link_val(void) PART_BEGIN(H5Lget_val_ud) { - TESTING_2_API("H5Lget_val on user-defined link"); + TESTING_2("H5Lget_val on user-defined link"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_val_ud); } PART_END(H5Lget_val_ud); @@ -11813,181 +11813,181 @@ test_get_link_val(void) const char *link_target_c = "/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP4_NAME "C"; - TESTING_2_API("H5Lget_val_by_idx on soft link by creation order in increasing order"); + TESTING_2("H5Lget_val_by_idx on soft link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_soft_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP4_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } /* Create several soft links */ if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 0, link_target_a); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 1, link_target_b); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 2, link_target_c); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP4_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_soft_crt_order_increasing); @@ -12007,181 +12007,181 @@ test_get_link_val(void) const char *link_target_c = "/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP5_NAME "C"; - TESTING_2_API("H5Lget_val_by_idx on soft link by creation order in decreasing order"); + TESTING_2("H5Lget_val_by_idx on soft link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_soft_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } /* Create several soft links */ if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 2, link_target_a); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 1, link_target_b); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 0, link_target_c); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP5_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_soft_crt_order_decreasing); @@ -12201,175 +12201,175 @@ test_get_link_val(void) const char *link_target_c = "/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP6_NAME "C"; - TESTING_2_API("H5Lget_val_by_idx on soft link by alphabetical order in increasing order"); + TESTING_2("H5Lget_val_by_idx on soft link by alphabetical order in increasing order"); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } /* Create several soft links */ if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 0, link_target_a); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 1, link_target_b); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 2, link_target_c); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP6_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_soft_name_order_increasing); @@ -12389,175 +12389,175 @@ test_get_link_val(void) const char *link_target_c = "/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP_NAME "/" GET_LINK_VAL_TEST_SUBGROUP7_NAME "C"; - TESTING_2_API("H5Lget_val_by_idx on soft link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_val_by_idx on soft link by alphabetical order in decreasing order"); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } /* Create several soft links */ if (H5Lcreate_soft(link_target_a, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft(link_target_b, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft(link_target_c, subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } link_val_size = strlen(link_target_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_a, strlen(link_target_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 2, link_target_a); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } link_val_size = strlen(link_target_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_b, strlen(link_target_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 1, link_target_b); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve soft link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } link_val_size = strlen(link_target_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_val_buf, link_target_c, strlen(link_target_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value '%s' for link at index %d did not match expected value '%s'\n", link_val_buf, 0, link_target_c); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP7_NAME); - PART_ERROR_API(H5Lget_val_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_soft_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_soft_name_order_decreasing); @@ -12574,235 +12574,235 @@ test_get_link_val(void) const char *ext_obj_name_b = "/B"; const char *ext_obj_name_c = "/C"; - TESTING_2_API("H5Lget_val_by_idx on external link by creation order in increasing order"); + TESTING_2("H5Lget_val_by_idx on external link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_external_crt_order_increasing); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_a); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_b); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_c); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP8_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_external_crt_order_increasing); @@ -12821,235 +12821,235 @@ test_get_link_val(void) const char *ext_obj_name_b = "/B"; const char *ext_obj_name_c = "/C"; - TESTING_2_API("H5Lget_val_by_idx on external link by creation order in decreasing order"); + TESTING_2("H5Lget_val_by_idx on external link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_val_by_idx_external_crt_order_decreasing); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_a); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_b); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_c); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP9_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_external_crt_order_decreasing); @@ -13068,229 +13068,229 @@ test_get_link_val(void) const char *ext_obj_name_b = "/B"; const char *ext_obj_name_c = "/C"; - TESTING_2_API("H5Lget_val_by_idx on external link by alphabetical order in increasing order"); + TESTING_2("H5Lget_val_by_idx on external link by alphabetical order in increasing order"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_a); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_b); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_c); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP10_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_external_name_order_increasing); @@ -13309,229 +13309,229 @@ test_get_link_val(void) const char *ext_obj_name_b = "/B"; const char *ext_obj_name_c = "/C"; - TESTING_2_API("H5Lget_val_by_idx on external link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_val_by_idx on external link by alphabetical order in decreasing order"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_VAL_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_obj_name_a, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_b, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_obj_name_c, subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } /* Verify the links exist */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_VAL_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", GET_LINK_VAL_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } /* Retrieve the info and value of each link in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_a) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 2, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 2); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_a, strlen(ext_obj_name_a) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_a); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_b) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 1, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 1); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_b, strlen(ext_obj_name_b) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_b); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve external link's info at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_obj_name_c) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link value size %zu for link at index %d did not match expected size of %zu\n", link_info.u.val_size, 0, link_val_size); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } memset(link_val_buf, 0, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE); if (H5Lget_val_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_val_buf, GET_LINK_VAL_TEST_LINK_VAL_BUF_SIZE, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link value at index %d\n", 0); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Lunpack_elink_val(link_val_buf, link_info.u.val_size, &ext_link_flags, &ext_link_filepath, &ext_link_val) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't unpack external link value buffer\n"); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_filepath, ext_link_filename, strlen(ext_link_filename) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link target file '%s' did not match expected '%s'\n", ext_link_filepath, ext_link_filename); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (HDstrncmp(ext_link_val, ext_obj_name_c, strlen(ext_obj_name_c) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link value '%s' did not match expected '%s'\n", ext_link_val, ext_obj_name_c); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_VAL_TEST_SUBGROUP11_NAME); - PART_ERROR_API(H5Lget_val_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_val_by_idx_external_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_external_name_order_decreasing); @@ -13546,9 +13546,9 @@ test_get_link_val(void) PART_BEGIN(H5Lget_val_by_idx_ud_crt_order_increasing) { - TESTING_2_API("H5Lget_val_by_idx on user-defined link by creation order in increasing order"); + TESTING_2("H5Lget_val_by_idx on user-defined link by creation order in increasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_val_by_idx_ud_crt_order_increasing); } PART_END(H5Lget_val_by_idx_ud_crt_order_increasing); @@ -13562,9 +13562,9 @@ test_get_link_val(void) PART_BEGIN(H5Lget_val_by_idx_ud_crt_order_decreasing) { - TESTING_2_API("H5Lget_val_by_idx on user-defined link by creation order in decreasing order"); + TESTING_2("H5Lget_val_by_idx on user-defined link by creation order in decreasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_val_by_idx_ud_crt_order_decreasing); } PART_END(H5Lget_val_by_idx_ud_crt_order_decreasing); @@ -13578,9 +13578,9 @@ test_get_link_val(void) PART_BEGIN(H5Lget_val_by_idx_ud_name_order_increasing) { - TESTING_2_API("H5Lget_val_by_idx on user-defined link by alphabetical order in increasing order"); + TESTING_2("H5Lget_val_by_idx on user-defined link by alphabetical order in increasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_val_by_idx_ud_name_order_increasing); } PART_END(H5Lget_val_by_idx_ud_name_order_increasing); @@ -13594,9 +13594,9 @@ test_get_link_val(void) PART_BEGIN(H5Lget_val_by_idx_ud_name_order_decreasing) { - TESTING_2_API("H5Lget_val_by_idx on user-defined link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_val_by_idx on user-defined link by alphabetical order in decreasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_val_by_idx_ud_name_order_decreasing); } PART_END(H5Lget_val_by_idx_ud_name_order_decreasing); @@ -13610,7 +13610,7 @@ test_get_link_val(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -13621,7 +13621,7 @@ test_get_link_val(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -13663,42 +13663,42 @@ test_get_link_val_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, external link, or creation " "order aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_VAL_INVALID_PARAMS_TEST_GROUP_NAME, group_id, GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } @@ -13706,32 +13706,32 @@ test_get_link_val_invalid_params(void) /* Verify the links have been created */ if ((link_exists = H5Lexists(group_id, GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", GET_LINK_VAL_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } link_val_buf_size = 100; if (NULL == (link_val_buf = (char *)malloc(link_val_buf_size))) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't allocate buffer for storing link value\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lget_val_invalid_loc_id) { - TESTING_2_API("H5Lget_val with an invalid location ID"); + TESTING_2("H5Lget_val with an invalid location ID"); memset(&link_info, 0, sizeof(link_info)); @@ -13743,18 +13743,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val succeeded with an invalid location ID\n"); - PART_ERROR_API(H5Lget_val_invalid_loc_id); + PART_ERROR(H5Lget_val_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_invalid_loc_id); PART_BEGIN(H5Lget_val_invalid_link_name) { - TESTING_2_API("H5Lget_val with an invalid link name"); + TESTING_2("H5Lget_val with an invalid link name"); H5E_BEGIN_TRY { @@ -13763,9 +13763,9 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val succeeded with a NULL link name\n"); - PART_ERROR_API(H5Lget_val_invalid_link_name); + PART_ERROR(H5Lget_val_invalid_link_name); } H5E_BEGIN_TRY @@ -13775,18 +13775,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val succeeded with an invalid link name of ''\n"); - PART_ERROR_API(H5Lget_val_invalid_link_name); + PART_ERROR(H5Lget_val_invalid_link_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_invalid_link_name); PART_BEGIN(H5Lget_val_invalid_lapl) { - TESTING_2_API("H5Lget_val with an invalid LAPL"); + TESTING_2("H5Lget_val with an invalid LAPL"); H5E_BEGIN_TRY { @@ -13796,18 +13796,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val succeeded with an invalid LAPL\n"); - PART_ERROR_API(H5Lget_val_invalid_lapl); + PART_ERROR(H5Lget_val_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_invalid_lapl); PART_BEGIN(H5Lget_val_by_idx_invalid_loc_id) { - TESTING_2_API("H5Lget_val_by_idx with an invalid location ID"); + TESTING_2("H5Lget_val_by_idx with an invalid location ID"); memset(&link_info, 0, sizeof(link_info)); @@ -13819,18 +13819,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_loc_id); + PART_ERROR(H5Lget_val_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_invalid_loc_id); PART_BEGIN(H5Lget_val_by_idx_invalid_grp_name) { - TESTING_2_API("H5Lget_val_by_idx with an invalid group name"); + TESTING_2("H5Lget_val_by_idx with an invalid group name"); H5E_BEGIN_TRY { @@ -13840,9 +13840,9 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with a NULL group name!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_grp_name); + PART_ERROR(H5Lget_val_by_idx_invalid_grp_name); } H5E_BEGIN_TRY @@ -13853,18 +13853,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with an invalid group name of ''!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_grp_name); + PART_ERROR(H5Lget_val_by_idx_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_invalid_grp_name); PART_BEGIN(H5Lget_val_by_idx_invalid_index_type) { - TESTING_2_API("H5Lget_val_by_idx with an invalid index type"); + TESTING_2("H5Lget_val_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -13874,9 +13874,9 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_index_type); + PART_ERROR(H5Lget_val_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -13887,18 +13887,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_index_type); + PART_ERROR(H5Lget_val_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_invalid_index_type); PART_BEGIN(H5Lget_val_by_idx_invalid_iter_order) { - TESTING_2_API("H5Lget_val_by_idx with an invalid iteration ordering"); + TESTING_2("H5Lget_val_by_idx with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -13908,9 +13908,9 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_iter_order); + PART_ERROR(H5Lget_val_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -13921,18 +13921,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_iter_order); + PART_ERROR(H5Lget_val_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_invalid_iter_order); PART_BEGIN(H5Lget_val_by_idx_invalid_lapl) { - TESTING_2_API("H5Lget_val_by_idx with an invalid LAPL"); + TESTING_2("H5Lget_val_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -13942,18 +13942,18 @@ test_get_link_val_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_val_by_idx succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Lget_val_by_idx_invalid_lapl); + PART_ERROR(H5Lget_val_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_val_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (link_val_buf) { free(link_val_buf); @@ -13969,7 +13969,7 @@ test_get_link_val_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -14012,35 +14012,35 @@ test_get_link_info(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, hard link, or external link " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -14048,82 +14048,82 @@ test_get_link_info(void) if ((group_id = H5Gcreate2(container_group, GET_LINK_INFO_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_INFO_TEST_GROUP_NAME); goto error; } if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link target filename\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lget_info_hard) { - TESTING_2_API("H5Lget_info2 on hard link"); + TESTING_2("H5Lget_info2 on hard link"); memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP1_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info\n"); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP1_NAME); - PART_ERROR_API(H5Lget_info_hard); + PART_ERROR(H5Lget_info_hard); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_hard); @@ -14136,77 +14136,77 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_soft) { - TESTING_2_API("H5Lget_info2 on soft link"); + TESTING_2("H5Lget_info2 on soft link"); memset(&link_info, 0, sizeof(link_info)); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP2_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP2_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link did not exist\n"); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info\n"); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP2_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP2_NAME); - PART_ERROR_API(H5Lget_info_soft); + PART_ERROR(H5Lget_info_soft); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_soft); @@ -14219,85 +14219,85 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_external) { - TESTING_2_API("H5Lget_info2 on external link"); + TESTING_2("H5Lget_info2 on external link"); memset(&link_info, 0, sizeof(link_info)); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP3_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link did not exist\n"); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if (H5Lget_info2(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info\n"); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP3_NAME); - PART_ERROR_API(H5Lget_info_external); + PART_ERROR(H5Lget_info_external); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_external); @@ -14312,11 +14312,11 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_ud) { - TESTING_2_API("H5Lget_info2 on user-defined link"); + TESTING_2("H5Lget_info2 on user-defined link"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_info_ud); } PART_END(H5Lget_info_ud); @@ -14330,157 +14330,157 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_hard_crt_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on hard link by creation order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on hard link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_hard_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP5_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP5_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_hard_crt_order_increasing); @@ -14493,157 +14493,157 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_hard_crt_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on hard link by creation order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on hard link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_hard_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP6_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP6_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_hard_crt_order_decreasing); @@ -14656,157 +14656,157 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_hard_name_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on hard link by alphabetical order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on hard link by alphabetical order in increasing order"); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP7_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP7_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_hard_name_order_increasing); @@ -14819,157 +14819,157 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_hard_name_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on hard link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on hard link by alphabetical order in decreasing order"); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP8_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get hard link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP8_NAME); - PART_ERROR_API(H5Lget_info_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_hard_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_hard_name_order_decreasing); @@ -14982,19 +14982,19 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_soft_crt_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on soft link by creation order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on soft link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_soft_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP9_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } /* Create several soft links */ @@ -15002,173 +15002,173 @@ test_get_link_info(void) "/" GET_LINK_INFO_TEST_SUBGROUP9_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP9_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP9_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP9_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP9_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP9_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP9_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_soft_crt_order_increasing); @@ -15181,19 +15181,19 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_soft_crt_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on soft link by creation order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on soft link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_soft_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP10_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } /* Create several soft links */ @@ -15201,173 +15201,173 @@ test_get_link_info(void) "/" GET_LINK_INFO_TEST_SUBGROUP10_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP10_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP10_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP10_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP10_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP10_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP10_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_soft_crt_order_decreasing); @@ -15380,13 +15380,13 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_soft_name_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on soft link by alphabetical order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on soft link by alphabetical order in increasing order"); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP11_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } /* Create several soft links */ @@ -15394,179 +15394,179 @@ test_get_link_info(void) "/" GET_LINK_INFO_TEST_SUBGROUP11_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP11_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP11_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP11_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP11_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP11_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%zu' did not match expected value '%zu'\n", link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP11_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_soft_name_order_increasing); @@ -15579,13 +15579,13 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_soft_name_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on soft link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on soft link by alphabetical order in decreasing order"); if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP12_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } /* Create several soft links */ @@ -15593,179 +15593,179 @@ test_get_link_info(void) "/" GET_LINK_INFO_TEST_SUBGROUP12_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP12_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP12_NAME, subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP12_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP12_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get soft link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (link_info.type != H5L_TYPE_SOFT) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } link_val_size = strlen("/" LINK_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_GROUP_NAME "/" GET_LINK_INFO_TEST_SUBGROUP12_NAME) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP12_NAME); - PART_ERROR_API(H5Lget_info_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_soft_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_soft_name_order_decreasing); @@ -15778,193 +15778,193 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_external_crt_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on external link by creation order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on external link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_external_crt_order_increasing); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP13_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP13_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_external_crt_order_increasing); @@ -15979,193 +15979,193 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_external_crt_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on external link by creation order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on external link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_info_by_idx_external_crt_order_decreasing); } if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP14_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP14_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_external_crt_order_decreasing); @@ -16180,193 +16180,193 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_external_name_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on external link by alphabetical order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on external link by alphabetical order in increasing order"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP15_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP15_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_external_name_order_increasing); @@ -16381,193 +16381,193 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_external_name_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on external link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on external link by alphabetical order in decreasing order"); if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_INFO_TEST_SUBGROUP16_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, ext_objname, subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_INFO_TEST_EXT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before deletion\n", GET_LINK_INFO_TEST_EXT_LINK_NAME3); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } /* Retrieve info of links in turn */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 0)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)0); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 1); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)1); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } } memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info_by_idx2(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get external link info for index %d\n", 0); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (link_info.type != H5L_TYPE_EXTERNAL) { - H5_FAILED_API(); + H5_FAILED(); printf(" incorrect link type returned\n"); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } link_val_size = 1 + strlen(ext_link_filename) + 1 + strlen(ext_objname) + 1; if (link_info.u.val_size != link_val_size) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's value size '%lld' did not match expected value '%zu'\n", (long long)link_info.u.val_size, link_val_size); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (link_info.corder_valid && (link_info.corder != 2)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link's creation order value '%lld' did not match expected value '%lld'\n", (long long)link_info.corder, (long long)2); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", GET_LINK_INFO_TEST_SUBGROUP16_NAME); - PART_ERROR_API(H5Lget_info_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_info_by_idx_external_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_external_name_order_decreasing); @@ -16582,9 +16582,9 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_ud_crt_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on user-defined link by creation order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on user-defined link by creation order in increasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_info_by_idx_ud_crt_order_increasing); } PART_END(H5Lget_info_by_idx_ud_crt_order_increasing); @@ -16598,9 +16598,9 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_ud_crt_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on user-defined link by creation order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on user-defined link by creation order in decreasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_info_by_idx_ud_crt_order_decreasing); } PART_END(H5Lget_info_by_idx_ud_crt_order_decreasing); @@ -16614,9 +16614,9 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_ud_name_order_increasing) { - TESTING_2_API("H5Lget_info_by_idx2 on user-defined link by alphabetical order in increasing order"); + TESTING_2("H5Lget_info_by_idx2 on user-defined link by alphabetical order in increasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_info_by_idx_ud_name_order_increasing); } PART_END(H5Lget_info_by_idx_ud_name_order_increasing); @@ -16630,9 +16630,9 @@ test_get_link_info(void) PART_BEGIN(H5Lget_info_by_idx_ud_name_order_decreasing) { - TESTING_2_API("H5Lget_info_by_idx2 on user-defined link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_info_by_idx2 on user-defined link by alphabetical order in decreasing order"); - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_info_by_idx_ud_name_order_decreasing); } PART_END(H5Lget_info_by_idx_ud_name_order_decreasing); @@ -16646,7 +16646,7 @@ test_get_link_info(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -16657,7 +16657,7 @@ test_get_link_info(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -16697,42 +16697,42 @@ test_get_link_info_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, or hard link " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if ((group_id = H5Gcreate2(container_group, GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", group_id, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -16740,25 +16740,25 @@ test_get_link_info_invalid_params(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_INFO_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lget_info_invalid_loc_id) { - TESTING_2_API("H5Lget_info2 with an invalid location ID"); + TESTING_2("H5Lget_info2 with an invalid location ID"); memset(&link_info, 0, sizeof(link_info)); @@ -16770,18 +16770,18 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info2 succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Lget_info_invalid_loc_id); + PART_ERROR(H5Lget_info_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_invalid_loc_id); PART_BEGIN(H5Lget_info_invalid_link_name) { - TESTING_2_API("H5Lget_info2 with an invalid link name"); + TESTING_2("H5Lget_info2 with an invalid link name"); H5E_BEGIN_TRY { @@ -16790,9 +16790,9 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info2 succeeded with a NULL link name!\n"); - PART_ERROR_API(H5Lget_info_invalid_link_name); + PART_ERROR(H5Lget_info_invalid_link_name); } H5E_BEGIN_TRY @@ -16802,18 +16802,18 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info2 succeeded with an invalid link name of ''!\n"); - PART_ERROR_API(H5Lget_info_invalid_link_name); + PART_ERROR(H5Lget_info_invalid_link_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_invalid_link_name); PART_BEGIN(H5Lget_info_invalid_lapl) { - TESTING_2_API("H5Lget_info2 with an invalid LAPL"); + TESTING_2("H5Lget_info2 with an invalid LAPL"); H5E_BEGIN_TRY { @@ -16823,12 +16823,12 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info2 succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Lget_info_invalid_lapl); + PART_ERROR(H5Lget_info_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_invalid_lapl); @@ -16836,7 +16836,7 @@ test_get_link_info_invalid_params(void) PART_BEGIN(H5Lget_info_by_idx_invalid_loc_id) { - TESTING_2_API("H5Lget_info_by_idx2 with an invalid location ID"); + TESTING_2("H5Lget_info_by_idx2 with an invalid location ID"); H5E_BEGIN_TRY { @@ -16846,18 +16846,18 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info_by_idx2 succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_loc_id); + PART_ERROR(H5Lget_info_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_invalid_loc_id); PART_BEGIN(H5Lget_info_by_idx_invalid_grp_name) { - TESTING_2_API("H5Lget_info_by_idx2 with an invalid group name"); + TESTING_2("H5Lget_info_by_idx2 with an invalid group name"); H5E_BEGIN_TRY { @@ -16867,9 +16867,9 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info_by_idx2 succeeded with a NULL group name!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_grp_name); + PART_ERROR(H5Lget_info_by_idx_invalid_grp_name); } H5E_BEGIN_TRY @@ -16880,18 +16880,18 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info_by_idx2 succeeded with an invalid group name of ''!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_grp_name); + PART_ERROR(H5Lget_info_by_idx_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_invalid_grp_name); PART_BEGIN(H5Lget_info_by_idx_invalid_index_type) { - TESTING_2_API("H5Lget_info_by_idx2 with an invalid index type"); + TESTING_2("H5Lget_info_by_idx2 with an invalid index type"); H5E_BEGIN_TRY { @@ -16901,9 +16901,9 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_index_type); + PART_ERROR(H5Lget_info_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -16914,18 +16914,18 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info_by_idx2 succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_index_type); + PART_ERROR(H5Lget_info_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_invalid_index_type); PART_BEGIN(H5Lget_info_by_idx_invalid_iter_order) { - TESTING_2_API("H5Lget_info_by_idx2 with an invalid iteration ordering"); + TESTING_2("H5Lget_info_by_idx2 with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -16935,10 +16935,10 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_iter_order); + PART_ERROR(H5Lget_info_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -16949,18 +16949,18 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info_by_idx2 succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_iter_order); + PART_ERROR(H5Lget_info_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_invalid_iter_order); PART_BEGIN(H5Lget_info_by_idx_invalid_lapl) { - TESTING_2_API("H5Lget_info_by_idx2 with an invalid LAPL"); + TESTING_2("H5Lget_info_by_idx2 with an invalid LAPL"); H5E_BEGIN_TRY { @@ -16970,18 +16970,18 @@ test_get_link_info_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_info_by_idx2 succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Lget_info_by_idx_invalid_lapl); + PART_ERROR(H5Lget_info_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_info_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -16992,7 +16992,7 @@ test_get_link_info_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -17032,35 +17032,35 @@ test_get_link_name(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, hard link, or external link " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -17068,27 +17068,27 @@ test_get_link_name(void) if ((group_id = H5Gcreate2(container_group, GET_LINK_NAME_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_GROUP_NAME); goto error; } if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lget_name_by_idx_hard_crt_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on hard link by creation order in increasing order"); + TESTING_2("H5Lget_name_by_idx on hard link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_hard_crt_order_increasing); } @@ -17096,151 +17096,151 @@ test_get_link_name(void) /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } /* Create several hard links in reverse order to test creation order */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_hard_crt_order_increasing); @@ -17253,10 +17253,10 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_hard_crt_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on hard link by creation order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on hard link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_hard_crt_order_decreasing); } @@ -17264,151 +17264,151 @@ test_get_link_name(void) /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } /* Create several hard links in reverse order to test creation order */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_hard_crt_order_decreasing); @@ -17421,156 +17421,156 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_hard_name_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on hard link by alphabetical order in increasing order"); + TESTING_2("H5Lget_name_by_idx on hard link by alphabetical order in increasing order"); /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_hard_name_order_increasing); @@ -17583,156 +17583,156 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_hard_name_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on hard link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on hard link by alphabetical order in decreasing order"); /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_HARD_SUBGROUP_NAME4); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } /* Create several hard links */ if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_HARD_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if hard link '%s' exists\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" hard link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME, strlen(GET_LINK_NAME_TEST_HARD_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_HARD_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_hard_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_hard_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_hard_name_order_decreasing); @@ -17745,10 +17745,10 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_soft_crt_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on soft link by creation order in increasing order"); + TESTING_2("H5Lget_name_by_idx on soft link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_soft_crt_order_increasing); } @@ -17756,151 +17756,151 @@ test_get_link_name(void) /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } /* Create several soft links in reverse order to test creation order */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_soft_crt_order_increasing); @@ -17913,10 +17913,10 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_soft_crt_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on soft link by creation order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on soft link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_soft_crt_order_decreasing); } @@ -17924,151 +17924,151 @@ test_get_link_name(void) /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } /* Create several soft links in reverse order to test creation order */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_soft_crt_order_decreasing); @@ -18081,156 +18081,156 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_soft_name_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on soft link by alphabetical order in increasing order"); + TESTING_2("H5Lget_name_by_idx on soft link by alphabetical order in increasing order"); /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } /* Create several soft links */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_soft_name_order_increasing); @@ -18243,156 +18243,156 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_soft_name_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on soft link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on soft link by alphabetical order in decreasing order"); /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_SOFT_SUBGROUP_NAME4); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } /* Create several soft links */ if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" GET_LINK_NAME_TEST_GROUP_NAME, subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if soft link '%s' exists\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" soft link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME, strlen(GET_LINK_NAME_TEST_SOFT_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_soft_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_soft_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_soft_name_order_decreasing); @@ -18405,178 +18405,178 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_external_crt_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on external link by creation order in increasing order"); + TESTING_2("H5Lget_name_by_idx on external link by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_external_crt_order_increasing); } /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } /* Create several external links in reverse order to test creation order */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_external_crt_order_increasing); @@ -18591,178 +18591,178 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_external_crt_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on external link by creation order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on external link by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lget_name_by_idx_external_crt_order_decreasing); } /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } /* Create several external links in reverse order to test creation order */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_crt_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_crt_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_external_crt_order_decreasing); @@ -18777,172 +18777,172 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_external_name_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on external link by alphabetical order in increasing order"); + TESTING_2("H5Lget_name_by_idx on external link by alphabetical order in increasing order"); /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_increasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_external_name_order_increasing); @@ -18957,172 +18957,172 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_external_name_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on external link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on external link by alphabetical order in decreasing order"); /* Create file for external link to reference */ if ((ext_file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Fclose(ext_file_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close file '%s'\n", ext_link_filename); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } /* Create group to hold some links */ if ((subgroup_id = H5Gcreate2(group_id, GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_SUBGROUP_NAME4); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } /* Create several external links */ if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create external link '%s'\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_exists = H5Lexists(subgroup_id, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if external link '%s' exists\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" external link '%s' did not exist before name retrieval\n", GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } /* Retrieve link names */ if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 0, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME3); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 1, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME2); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if ((link_name_buf_size = H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, NULL, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Lget_name_by_idx(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, 2, link_name_buf, (size_t)link_name_buf_size + 1, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (HDstrncmp(link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME, strlen(GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME) + 1)) { - H5_FAILED_API(); + H5_FAILED(); printf(" link name '%s' did not match expected name '%s'\n", link_name_buf, GET_LINK_NAME_TEST_EXTERNAL_LINK_NAME); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group\n"); - PART_ERROR_API(H5Lget_name_by_idx_external_name_order_decreasing); + PART_ERROR(H5Lget_name_by_idx_external_name_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_external_name_order_decreasing); @@ -19137,11 +19137,11 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_ud_crt_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on user-defined link by creation order in increasing order"); + TESTING_2("H5Lget_name_by_idx on user-defined link by creation order in increasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_name_by_idx_ud_crt_order_increasing); } PART_END(H5Lget_name_by_idx_ud_crt_order_increasing); @@ -19155,11 +19155,11 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_ud_crt_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on user-defined link by creation order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on user-defined link by creation order in decreasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_name_by_idx_ud_crt_order_decreasing); } PART_END(H5Lget_name_by_idx_ud_crt_order_decreasing); @@ -19173,11 +19173,11 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_ud_name_order_increasing) { - TESTING_2_API("H5Lget_name_by_idx on user-defined link by alphabetical order in increasing order"); + TESTING_2("H5Lget_name_by_idx on user-defined link by alphabetical order in increasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_name_by_idx_ud_name_order_increasing); } PART_END(H5Lget_name_by_idx_ud_name_order_increasing); @@ -19191,11 +19191,11 @@ test_get_link_name(void) PART_BEGIN(H5Lget_name_by_idx_ud_name_order_decreasing) { - TESTING_2_API("H5Lget_name_by_idx on user-defined link by alphabetical order in decreasing order"); + TESTING_2("H5Lget_name_by_idx on user-defined link by alphabetical order in decreasing order"); /* TODO */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Lget_name_by_idx_ud_name_order_decreasing); } PART_END(H5Lget_name_by_idx_ud_name_order_decreasing); @@ -19209,7 +19209,7 @@ test_get_link_name(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -19220,7 +19220,7 @@ test_get_link_name(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -19262,36 +19262,36 @@ test_get_link_name_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, hard link, or external link " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if (H5Lcreate_hard(group_id, ".", group_id, GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create hard link '%s'\n", GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -19299,20 +19299,20 @@ test_get_link_name_invalid_params(void) /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, GET_LINK_NAME_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link did not exist\n"); goto error; } if ((ret = H5Lget_name_by_idx(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, 0, NULL, link_name_buf_size, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve link name size\n"); goto error; } @@ -19321,13 +19321,13 @@ test_get_link_name_invalid_params(void) if (NULL == (link_name_buf = (char *)malloc(link_name_buf_size + 1))) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lget_name_by_idx_invalid_loc_id) { - TESTING_2_API("H5Lget_name_by_idx with an invalid location ID"); + TESTING_2("H5Lget_name_by_idx with an invalid location ID"); H5E_BEGIN_TRY { @@ -19337,18 +19337,18 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_loc_id); + PART_ERROR(H5Lget_name_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_invalid_loc_id); PART_BEGIN(H5Lget_name_by_idx_invalid_grp_name) { - TESTING_2_API("H5Lget_name_by_idx with an invalid group name"); + TESTING_2("H5Lget_name_by_idx with an invalid group name"); H5E_BEGIN_TRY { @@ -19358,9 +19358,9 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with a NULL group name!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_grp_name); + PART_ERROR(H5Lget_name_by_idx_invalid_grp_name); } H5E_BEGIN_TRY @@ -19371,18 +19371,18 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with an invalid group name of ''!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_grp_name); + PART_ERROR(H5Lget_name_by_idx_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_invalid_grp_name); PART_BEGIN(H5Lget_name_by_idx_invalid_index_type) { - TESTING_2_API("H5Lget_name_by_idx with an invalid index type"); + TESTING_2("H5Lget_name_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -19392,9 +19392,9 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_index_type); + PART_ERROR(H5Lget_name_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -19405,18 +19405,18 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_index_type); + PART_ERROR(H5Lget_name_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_invalid_index_type); PART_BEGIN(H5Lget_name_by_idx_invalid_iter_order) { - TESTING_2_API("H5Lget_name_by_idx with an invalid iteration ordering"); + TESTING_2("H5Lget_name_by_idx with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -19426,9 +19426,9 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_iter_order); + PART_ERROR(H5Lget_name_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -19439,18 +19439,18 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_iter_order); + PART_ERROR(H5Lget_name_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_invalid_iter_order); PART_BEGIN(H5Lget_name_by_idx_invalid_lapl) { - TESTING_2_API("H5Lget_name_by_idx with an invalid LAPL"); + TESTING_2("H5Lget_name_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -19460,18 +19460,18 @@ test_get_link_name_invalid_params(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lget_name_by_idx succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Lget_name_by_idx_invalid_lapl); + PART_ERROR(H5Lget_name_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lget_name_by_idx_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (link_name_buf) { free(link_name_buf); @@ -19485,7 +19485,7 @@ test_get_link_name_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -19528,35 +19528,35 @@ test_link_iterate_hard_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, link, or iterate aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -19564,7 +19564,7 @@ test_link_iterate_hard_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -19585,32 +19585,32 @@ test_link_iterate_hard_links(void) if ((dset_id = H5Dcreate2(group_id, dset_name, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", dset_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, dset_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", dset_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", dset_name); goto error; } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close dataset '%s'\n", dset_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -19623,56 +19623,56 @@ test_link_iterate_hard_links(void) PART_BEGIN(H5Literate_link_name_increasing) { - TESTING_2_API("H5Literate2 by link name in increasing order"); + TESTING_2("H5Literate2 by link name in increasing order"); i = 0; /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_increasing); PART_BEGIN(H5Literate_link_name_decreasing) { - TESTING_2_API("H5Literate2 by link name in decreasing order"); + TESTING_2("H5Literate2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_HARD_LINKS_TEST_NUM_LINKS; if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_decreasing); PART_BEGIN(H5Literate_link_creation_increasing) { - TESTING_2_API("H5Literate2 by creation order in increasing order"); + TESTING_2("H5Literate2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -19682,27 +19682,27 @@ test_link_iterate_hard_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_increasing); PART_BEGIN(H5Literate_link_creation_decreasing) { - TESTING_2_API("H5Literate2 by creation order in decreasing order"); + TESTING_2("H5Literate2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -19712,24 +19712,24 @@ test_link_iterate_hard_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_decreasing); PART_BEGIN(H5Literate_by_name_link_name_increasing) { - TESTING_2_API("H5Literate_by_name2 by link name in increasing order"); + TESTING_2("H5Literate_by_name2 by link name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -19737,24 +19737,24 @@ test_link_iterate_hard_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_increasing); PART_BEGIN(H5Literate_by_name_link_name_decreasing) { - TESTING_2_API("H5Literate_by_name2 by link name in decreasing order"); + TESTING_2("H5Literate_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_HARD_LINKS_TEST_NUM_LINKS; @@ -19762,27 +19762,27 @@ test_link_iterate_hard_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_decreasing); PART_BEGIN(H5Literate_by_name_creation_increasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in increasing order"); + TESTING_2("H5Literate_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -19793,27 +19793,27 @@ test_link_iterate_hard_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_increasing); PART_BEGIN(H5Literate_by_name_creation_decreasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in decreasing order"); + TESTING_2("H5Literate_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -19824,24 +19824,24 @@ test_link_iterate_hard_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_HARD_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_hard_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_HARD_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dset_dspace) < 0) TEST_ERROR; @@ -19856,7 +19856,7 @@ test_link_iterate_hard_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -19898,35 +19898,35 @@ test_link_iterate_soft_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -19934,7 +19934,7 @@ test_link_iterate_soft_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -19951,26 +19951,26 @@ test_link_iterate_soft_links(void) (int)(LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS - i - 1)); if (H5Lcreate_soft(link_target, group_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, link_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", link_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -19983,56 +19983,56 @@ test_link_iterate_soft_links(void) PART_BEGIN(H5Literate_link_name_increasing) { - TESTING_2_API("H5Literate2 by link name in increasing order"); + TESTING_2("H5Literate2 by link name in increasing order"); i = 0; /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_increasing); PART_BEGIN(H5Literate_link_name_decreasing) { - TESTING_2_API("H5Literate2 by link name in decreasing order"); + TESTING_2("H5Literate2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS; if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_decreasing); PART_BEGIN(H5Literate_link_creation_increasing) { - TESTING_2_API("H5Literate2 by creation order in increasing order"); + TESTING_2("H5Literate2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -20042,27 +20042,27 @@ test_link_iterate_soft_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_increasing); PART_BEGIN(H5Literate_link_creation_decreasing) { - TESTING_2_API("H5Literate2 by creation order in decreasing order"); + TESTING_2("H5Literate2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -20072,24 +20072,24 @@ test_link_iterate_soft_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_decreasing); PART_BEGIN(H5Literate_by_name_link_name_increasing) { - TESTING_2_API("H5Literate_by_name2 by link name in increasing order"); + TESTING_2("H5Literate_by_name2 by link name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -20097,24 +20097,24 @@ test_link_iterate_soft_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_increasing); PART_BEGIN(H5Literate_by_name_link_name_decreasing) { - TESTING_2_API("H5Literate_by_name2 by link name in decreasing order"); + TESTING_2("H5Literate_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS; @@ -20122,27 +20122,27 @@ test_link_iterate_soft_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_decreasing); PART_BEGIN(H5Literate_by_name_creation_increasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in increasing order"); + TESTING_2("H5Literate_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -20153,27 +20153,27 @@ test_link_iterate_soft_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_increasing); PART_BEGIN(H5Literate_by_name_creation_decreasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in decreasing order"); + TESTING_2("H5Literate_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -20184,24 +20184,24 @@ test_link_iterate_soft_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_SOFT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_soft_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_SOFT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -20212,7 +20212,7 @@ test_link_iterate_soft_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -20252,22 +20252,22 @@ test_link_iterate_external_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, external link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -20276,26 +20276,26 @@ test_link_iterate_external_links(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -20303,7 +20303,7 @@ test_link_iterate_external_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -20316,26 +20316,26 @@ test_link_iterate_external_links(void) (int)(LINK_ITER_EXT_LINKS_TEST_NUM_LINKS - i - 1)); if (H5Lcreate_external(ext_link_filename, "/", group_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(group_id, link_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", link_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -20348,58 +20348,58 @@ test_link_iterate_external_links(void) PART_BEGIN(H5Literate_link_name_increasing) { - TESTING_2_API("H5Literate2 by link name in increasing order"); + TESTING_2("H5Literate2 by link name in increasing order"); i = 0; /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_external_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_increasing); PART_BEGIN(H5Literate_link_name_decreasing) { - TESTING_2_API("H5Literate2 by link name in decreasing order"); + TESTING_2("H5Literate2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_EXT_LINKS_TEST_NUM_LINKS; if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_decreasing); PART_BEGIN(H5Literate_link_creation_increasing) { - TESTING_2_API("H5Literate2 by creation order in increasing order"); + TESTING_2("H5Literate2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -20409,27 +20409,27 @@ test_link_iterate_external_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_external_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_increasing); PART_BEGIN(H5Literate_link_creation_decreasing) { - TESTING_2_API("H5Literate2 by creation order in decreasing order"); + TESTING_2("H5Literate2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -20439,24 +20439,24 @@ test_link_iterate_external_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_decreasing); PART_BEGIN(H5Literate_by_name_link_name_increasing) { - TESTING_2_API("H5Literate_by_name2 by link name in increasing order"); + TESTING_2("H5Literate_by_name2 by link name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -20464,24 +20464,24 @@ test_link_iterate_external_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_increasing); PART_BEGIN(H5Literate_by_name_link_name_decreasing) { - TESTING_2_API("H5Literate_by_name2 by link name in decreasing order"); + TESTING_2("H5Literate_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_EXT_LINKS_TEST_NUM_LINKS; @@ -20489,27 +20489,27 @@ test_link_iterate_external_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_decreasing); PART_BEGIN(H5Literate_by_name_creation_increasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in increasing order"); + TESTING_2("H5Literate_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -20521,27 +20521,27 @@ test_link_iterate_external_links(void) "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_increasing); PART_BEGIN(H5Literate_by_name_creation_decreasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in decreasing order"); + TESTING_2("H5Literate_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -20553,24 +20553,24 @@ test_link_iterate_external_links(void) "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_EXT_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_external_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_EXT_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -20581,7 +20581,7 @@ test_link_iterate_external_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -20612,9 +20612,9 @@ test_link_iterate_external_links(void) static int test_link_iterate_ud_links(void) { - TESTING_API("link iteration (only user-defined links)"); + TESTING("link iteration (only user-defined links)"); - SKIPPED_API(); + SKIPPED(); return 1; } @@ -20654,22 +20654,22 @@ test_link_iterate_mixed_links(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, external link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -20678,26 +20678,26 @@ test_link_iterate_mixed_links(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -20705,7 +20705,7 @@ test_link_iterate_mixed_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME); goto error; } @@ -20719,7 +20719,7 @@ test_link_iterate_mixed_links(void) if ((dset_id = H5Dcreate2(group_id, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME); goto error; } @@ -20727,56 +20727,56 @@ test_link_iterate_mixed_links(void) if (H5Lcreate_soft("/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, group_id, LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/", group_id, LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" second link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" third link did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -20789,56 +20789,56 @@ test_link_iterate_mixed_links(void) PART_BEGIN(H5Literate_link_name_increasing) { - TESTING_2_API("H5Literate2 by link name in increasing order"); + TESTING_2("H5Literate2 by link name in increasing order"); i = 0; /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } if (i != LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_increasing); + PART_ERROR(H5Literate_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_increasing); PART_BEGIN(H5Literate_link_name_decreasing) { - TESTING_2_API("H5Literate2 by link name in decreasing order"); + TESTING_2("H5Literate2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS; if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } if (i != 2 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_name_decreasing); + PART_ERROR(H5Literate_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_name_decreasing); PART_BEGIN(H5Literate_link_creation_increasing) { - TESTING_2_API("H5Literate2 by creation order in increasing order"); + TESTING_2("H5Literate2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_increasing); } @@ -20848,27 +20848,27 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } if (i != 3 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_increasing); + PART_ERROR(H5Literate_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_increasing); PART_BEGIN(H5Literate_link_creation_decreasing) { - TESTING_2_API("H5Literate2 by creation order in decreasing order"); + TESTING_2("H5Literate2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_link_creation_decreasing); } @@ -20878,48 +20878,48 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } if (i != 4 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_link_creation_decreasing); + PART_ERROR(H5Literate_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_link_creation_decreasing); PART_BEGIN(H5Literate_by_name_link_name_increasing) { - TESTING_2_API("H5Literate_by_name2 by link name in increasing order"); + TESTING_2("H5Literate_by_name2 by link name in increasing order"); i = 0; if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } if (i != LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_increasing); + PART_ERROR(H5Literate_by_name_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_increasing); PART_BEGIN(H5Literate_by_name_link_name_decreasing) { - TESTING_2_API("H5Literate_by_name2 by link name in decreasing order"); + TESTING_2("H5Literate_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS; @@ -20927,27 +20927,27 @@ test_link_iterate_mixed_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } if (i != 2 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_link_name_decreasing); + PART_ERROR(H5Literate_by_name_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_link_name_decreasing); PART_BEGIN(H5Literate_by_name_creation_increasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in increasing order"); + TESTING_2("H5Literate_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_increasing); } @@ -20958,27 +20958,27 @@ test_link_iterate_mixed_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } if (i != 3 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_increasing); + PART_ERROR(H5Literate_by_name_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_increasing); PART_BEGIN(H5Literate_by_name_creation_decreasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in decreasing order"); + TESTING_2("H5Literate_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_creation_decreasing); } @@ -20989,27 +20989,27 @@ test_link_iterate_mixed_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_MIXED_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_mixed_links_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } if (i != 4 * LINK_ITER_MIXED_LINKS_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not iterated over!\n"); - PART_ERROR_API(H5Literate_by_name_creation_decreasing); + PART_ERROR(H5Literate_by_name_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_creation_decreasing); PART_BEGIN(H5Literate_index_saving_increasing) { - TESTING_2_API("H5Literate2 index-saving capabilities in increasing order"); + TESTING_2("H5Literate2 index-saving capabilities in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_index_saving_increasing); } @@ -21020,34 +21020,34 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 index-saving capability test failed\n"); - PART_ERROR_API(H5Literate_index_saving_increasing); + PART_ERROR(H5Literate_index_saving_increasing); } if (saved_idx != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" saved index after iteration was wrong\n"); - PART_ERROR_API(H5Literate_index_saving_increasing); + PART_ERROR(H5Literate_index_saving_increasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't finish iterating when beginning from saved index\n"); - PART_ERROR_API(H5Literate_index_saving_increasing); + PART_ERROR(H5Literate_index_saving_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_index_saving_increasing); #ifdef BROKEN PART_BEGIN(H5Literate_index_saving_decreasing) { - TESTING_2_API("H5Literate2 index-saving capabilities in decreasing order"); + TESTING_2("H5Literate2 index-saving capabilities in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_index_saving_decreasing); } @@ -21057,32 +21057,32 @@ test_link_iterate_mixed_links(void) if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 index-saving capability test failed\n"); - PART_ERROR_API(H5Literate_index_saving_decreasing); + PART_ERROR(H5Literate_index_saving_decreasing); } if (saved_idx != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" saved index after iteration was wrong\n"); - PART_ERROR_API(H5Literate_index_saving_decreasing); + PART_ERROR(H5Literate_index_saving_decreasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, &saved_idx, link_iter_idx_saving_cb, &halted) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't finish iterating when beginning from saved index\n"); - PART_ERROR_API(H5Literate_index_saving_decreasing); + PART_ERROR(H5Literate_index_saving_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_index_saving_decreasing); #endif } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dset_dspace) < 0) TEST_ERROR; @@ -21099,7 +21099,7 @@ test_link_iterate_mixed_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -21145,22 +21145,22 @@ test_link_iterate_invalid_params(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, link, soft link, external link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -21169,20 +21169,20 @@ test_link_iterate_invalid_params(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } @@ -21196,7 +21196,7 @@ test_link_iterate_invalid_params(void) if ((dset_id = H5Dcreate2(group_id, LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } @@ -21205,53 +21205,53 @@ test_link_iterate_invalid_params(void) "/" LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, group_id, LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } if (H5Lcreate_external(ext_link_filename, "/", group_id, LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_HARD_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_SOFT_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" second link did not exist\n"); goto error; } if ((link_exists = H5Lexists(group_id, LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", LINK_ITER_INVALID_PARAMS_TEST_EXT_LINK_NAME); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" third link did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -21259,7 +21259,7 @@ test_link_iterate_invalid_params(void) PART_BEGIN(H5Literate_invalid_grp_id) { - TESTING_2_API("H5Literate2 with an invalid group ID"); + TESTING_2("H5Literate2 with an invalid group ID"); H5E_BEGIN_TRY { @@ -21269,18 +21269,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 succeeded with an invalid group ID!\n"); - PART_ERROR_API(H5Literate_invalid_grp_id); + PART_ERROR(H5Literate_invalid_grp_id); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_invalid_grp_id); PART_BEGIN(H5Literate_invalid_index_type) { - TESTING_2_API("H5Literate2 with an invalid index type"); + TESTING_2("H5Literate2 with an invalid index type"); H5E_BEGIN_TRY { @@ -21290,9 +21290,9 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Literate_invalid_index_type); + PART_ERROR(H5Literate_invalid_index_type); } H5E_BEGIN_TRY @@ -21303,18 +21303,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Literate_invalid_index_type); + PART_ERROR(H5Literate_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_invalid_index_type); PART_BEGIN(H5Literate_invalid_iter_order) { - TESTING_2_API("H5Literate2 with an invalid iteration ordering"); + TESTING_2("H5Literate2 with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -21324,9 +21324,9 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Literate_invalid_iter_order); + PART_ERROR(H5Literate_invalid_iter_order); } H5E_BEGIN_TRY @@ -21337,18 +21337,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Literate_invalid_iter_order); + PART_ERROR(H5Literate_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_invalid_iter_order); PART_BEGIN(H5Literate_by_name_invalid_loc_id) { - TESTING_2_API("H5Literate_by_name2 with an invalid location ID"); + TESTING_2("H5Literate_by_name2 with an invalid location ID"); H5E_BEGIN_TRY { @@ -21359,18 +21359,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_loc_id); + PART_ERROR(H5Literate_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_invalid_loc_id); PART_BEGIN(H5Literate_by_name_invalid_grp_name) { - TESTING_2_API("H5Literate_by_name2 with an invalid group name"); + TESTING_2("H5Literate_by_name2 with an invalid group name"); H5E_BEGIN_TRY { @@ -21380,9 +21380,9 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 succeeded with a NULL group name!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_grp_name); + PART_ERROR(H5Literate_by_name_invalid_grp_name); } H5E_BEGIN_TRY @@ -21393,18 +21393,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 succeeded with an invalid group name of ''!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_grp_name); + PART_ERROR(H5Literate_by_name_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_invalid_grp_name); PART_BEGIN(H5Literate_by_name_invalid_index_type) { - TESTING_2_API("H5Literate_by_name2 with an invalid index type"); + TESTING_2("H5Literate_by_name2 with an invalid index type"); H5E_BEGIN_TRY { @@ -21415,9 +21415,9 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_index_type); + PART_ERROR(H5Literate_by_name_invalid_index_type); } H5E_BEGIN_TRY @@ -21429,18 +21429,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_index_type); + PART_ERROR(H5Literate_by_name_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_invalid_index_type); PART_BEGIN(H5Literate_by_name_invalid_iter_order) { - TESTING_2_API("H5Literate_by_name2 with an invalid iteration ordering"); + TESTING_2("H5Literate_by_name2 with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -21451,10 +21451,10 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_iter_order); + PART_ERROR(H5Literate_by_name_invalid_iter_order); } H5E_BEGIN_TRY @@ -21466,18 +21466,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_iter_order); + PART_ERROR(H5Literate_by_name_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_invalid_iter_order); PART_BEGIN(H5Literate_by_name_invalid_lapl) { - TESTING_2_API("H5Literate_by_name2 with an invalid LAPL"); + TESTING_2("H5Literate_by_name2 with an invalid LAPL"); H5E_BEGIN_TRY { @@ -21488,18 +21488,18 @@ test_link_iterate_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Literate_by_name_invalid_lapl); + PART_ERROR(H5Literate_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dset_dspace) < 0) TEST_ERROR; @@ -21514,7 +21514,7 @@ test_link_iterate_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -21550,35 +21550,35 @@ test_link_iterate_0_links(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or iterate aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create GCPL for link creation order tracking\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set link creation order tracking\n"); goto error; } @@ -21586,124 +21586,124 @@ test_link_iterate_0_links(void) if ((group_id = H5Gcreate2(container_group, LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Literate_0_links_name_increasing) { - TESTING_2_API("H5Literate2 by link name in increasing order"); + TESTING_2("H5Literate2 by link name in increasing order"); /* Test basic link iteration capability using both index types and both index orders */ if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_0_links_name_increasing); + PART_ERROR(H5Literate_0_links_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_0_links_name_increasing); PART_BEGIN(H5Literate_0_links_name_decreasing) { - TESTING_2_API("H5Literate2 by link name in decreasing order"); + TESTING_2("H5Literate2 by link name in decreasing order"); if (H5Literate2(group_id, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_0_links_name_decreasing); + PART_ERROR(H5Literate_0_links_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_0_links_name_decreasing); PART_BEGIN(H5Literate_0_links_creation_increasing) { - TESTING_2_API("H5Literate2 by creation order in increasing order"); + TESTING_2("H5Literate2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_0_links_creation_increasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_0_links_creation_increasing); + PART_ERROR(H5Literate_0_links_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_0_links_creation_increasing); PART_BEGIN(H5Literate_0_links_creation_decreasing) { - TESTING_2_API("H5Literate2 by creation order in decreasing order"); + TESTING_2("H5Literate2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_0_links_creation_decreasing); } if (H5Literate2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_0_links_creation_decreasing); + PART_ERROR(H5Literate_0_links_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_0_links_creation_decreasing); PART_BEGIN(H5Literate_by_name_0_links_name_increasing) { - TESTING_2_API("H5Literate_by_name2 by link name in increasing order"); + TESTING_2("H5Literate_by_name2 by link name in increasing order"); if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_0_links_name_increasing); + PART_ERROR(H5Literate_by_name_0_links_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_0_links_name_increasing); PART_BEGIN(H5Literate_by_name_0_links_name_decreasing) { - TESTING_2_API("H5Literate_by_name2 by link name in decreasing order"); + TESTING_2("H5Literate_by_name2 by link name in decreasing order"); if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_0_links_name_decreasing); + PART_ERROR(H5Literate_by_name_0_links_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_0_links_name_decreasing); PART_BEGIN(H5Literate_by_name_0_links_creation_increasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in increasing order"); + TESTING_2("H5Literate_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_0_links_creation_increasing); } @@ -21711,21 +21711,21 @@ test_link_iterate_0_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_0_links_creation_increasing); + PART_ERROR(H5Literate_by_name_0_links_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_0_links_creation_increasing); PART_BEGIN(H5Literate_by_name_0_links_creation_decreasing) { - TESTING_2_API("H5Literate_by_name2 by creation order in decreasing order"); + TESTING_2("H5Literate_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Literate_by_name_0_links_creation_decreasing); } @@ -21733,18 +21733,18 @@ test_link_iterate_0_links(void) if (H5Literate_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_ITER_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, NULL, link_iter_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Literate_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Literate_by_name_0_links_creation_decreasing); + PART_ERROR(H5Literate_by_name_0_links_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Literate_by_name_0_links_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -21755,7 +21755,7 @@ test_link_iterate_0_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -21798,35 +21798,35 @@ test_link_visit_hard_links_no_cycles(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or link iterate aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -21834,7 +21834,7 @@ test_link_visit_hard_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -21857,7 +21857,7 @@ test_link_visit_hard_links_no_cycles(void) (int)(LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_SUBGROUPS - i - 1)); if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -21872,39 +21872,39 @@ test_link_visit_hard_links_no_cycles(void) if ((dset_id = H5Dcreate2(subgroup_id, dset_name, dset_dtype, dset_dspace, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", dset_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, dset_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", dset_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", dset_name); goto error; } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close dataset '%s'\n", dset_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -21917,55 +21917,55 @@ test_link_visit_hard_links_no_cycles(void) PART_BEGIN(H5Lvisit_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -21975,27 +21975,27 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22005,24 +22005,24 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -22030,24 +22030,24 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST; @@ -22055,27 +22055,27 @@ test_link_visit_hard_links_no_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22087,27 +22087,27 @@ test_link_visit_hard_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22119,24 +22119,24 @@ test_link_visit_hard_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dset_dspace) < 0) TEST_ERROR; @@ -22151,7 +22151,7 @@ test_link_visit_hard_links_no_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -22196,35 +22196,35 @@ test_link_visit_soft_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -22232,7 +22232,7 @@ test_link_visit_soft_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -22248,7 +22248,7 @@ test_link_visit_soft_links_no_cycles(void) (int)(LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_SUBGROUPS - i - 1)); if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -22266,33 +22266,33 @@ test_link_visit_soft_links_no_cycles(void) (int)(LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_GROUP - j - 1)); if (H5Lcreate_soft(link_target, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -22305,55 +22305,55 @@ test_link_visit_soft_links_no_cycles(void) PART_BEGIN(H5Lvisit_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22363,27 +22363,27 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22393,48 +22393,48 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); i = 0; if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST; @@ -22442,27 +22442,27 @@ test_link_visit_soft_links_no_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22474,27 +22474,27 @@ test_link_visit_soft_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22506,24 +22506,24 @@ test_link_visit_soft_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -22534,7 +22534,7 @@ test_link_visit_soft_links_no_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -22577,22 +22577,22 @@ test_link_visit_external_links_no_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, external link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -22601,26 +22601,26 @@ test_link_visit_external_links_no_cycles(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -22628,7 +22628,7 @@ test_link_visit_external_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -22644,7 +22644,7 @@ test_link_visit_external_links_no_cycles(void) (int)(LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_SUBGROUPS - i - 1)); if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -22659,33 +22659,33 @@ test_link_visit_external_links_no_cycles(void) if (H5Lcreate_external(ext_link_filename, "/", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -22698,57 +22698,57 @@ test_link_visit_external_links_no_cycles(void) PART_BEGIN(H5Lvisit_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -22758,27 +22758,27 @@ test_link_visit_external_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -22788,24 +22788,24 @@ test_link_visit_external_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -22814,24 +22814,24 @@ test_link_visit_external_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST; @@ -22840,27 +22840,27 @@ test_link_visit_external_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -22872,27 +22872,27 @@ test_link_visit_external_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -22904,24 +22904,24 @@ test_link_visit_external_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_NO_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -22932,7 +22932,7 @@ test_link_visit_external_links_no_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -22965,9 +22965,9 @@ test_link_visit_external_links_no_cycles(void) static int test_link_visit_ud_links_no_cycles(void) { - TESTING_API("link visiting without cycles (only user-defined links)"); + TESTING("link visiting without cycles (only user-defined links)"); - SKIPPED_API(); + SKIPPED(); return 1; } @@ -23009,23 +23009,23 @@ test_link_visit_mixed_links_no_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf( " API functions for basic file, group, link, hard link, soft link, external link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link filename\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -23034,26 +23034,26 @@ test_link_visit_mixed_links_no_cycles(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -23061,7 +23061,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -23069,7 +23069,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME2); goto error; @@ -23077,7 +23077,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME3); goto error; @@ -23092,7 +23092,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); } @@ -23101,7 +23101,7 @@ test_link_visit_mixed_links_no_cycles(void) if ((dset_id = H5Dcreate2(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second dataset '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME); } @@ -23110,28 +23110,28 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lcreate_hard(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); goto error; } if (H5Lcreate_soft(LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME, subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); goto error; } if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); goto error; } if (H5Lcreate_hard(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_DSET_NAME2, subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second hard link '%s'\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); goto error; @@ -23140,61 +23140,61 @@ test_link_visit_mixed_links_no_cycles(void) /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first link '%s' exists\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME1); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 1 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if second link '%s' exists\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME2); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 2 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if third link '%s' exists\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME3); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 3 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if fourth link '%s' exists\n", LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_LINK_NAME4); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 4 did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -23207,57 +23207,57 @@ test_link_visit_mixed_links_no_cycles(void) PART_BEGIN(H5Lvisit_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_increasing); } @@ -23267,27 +23267,27 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_no_cycles_link_creation_decreasing); } @@ -23297,48 +23297,48 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_no_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); i = 0; if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS; @@ -23346,27 +23346,27 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_increasing); } @@ -23378,27 +23378,27 @@ test_link_visit_mixed_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_no_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } @@ -23410,24 +23410,24 @@ test_link_visit_mixed_links_no_cycles(void) file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_no_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_NO_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_no_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_no_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -23446,7 +23446,7 @@ test_link_visit_mixed_links_no_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -23492,35 +23492,35 @@ test_link_visit_hard_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -23528,7 +23528,7 @@ test_link_visit_hard_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -23544,7 +23544,7 @@ test_link_visit_hard_links_cycles(void) (int)(LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_SUBGROUPS - i - 1)); if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -23558,33 +23558,33 @@ test_link_visit_hard_links_cycles(void) (int)(LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_GROUP - j - 1)); if (H5Lcreate_hard(subgroup_id, ".", subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create hard link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -23597,55 +23597,55 @@ test_link_visit_hard_links_cycles(void) PART_BEGIN(H5Lvisit_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -23655,27 +23655,27 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -23685,48 +23685,48 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); i = 0; if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST; @@ -23734,27 +23734,27 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -23765,27 +23765,27 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -23796,24 +23796,24 @@ test_link_visit_hard_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_HARD_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_hard_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_HARD_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -23824,7 +23824,7 @@ test_link_visit_hard_links_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -23865,35 +23865,35 @@ test_link_visit_soft_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, soft link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -23901,7 +23901,7 @@ test_link_visit_soft_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -23917,7 +23917,7 @@ test_link_visit_soft_links_cycles(void) (int)(LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_SUBGROUPS - i - 1)); if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -23936,33 +23936,33 @@ test_link_visit_soft_links_cycles(void) grp_name); if (H5Lcreate_soft(link_target, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -23975,55 +23975,55 @@ test_link_visit_soft_links_cycles(void) PART_BEGIN(H5Lvisit_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -24033,27 +24033,27 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -24063,24 +24063,24 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -24088,24 +24088,24 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST; @@ -24113,27 +24113,27 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -24144,27 +24144,27 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -24175,24 +24175,24 @@ test_link_visit_soft_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_SOFT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_soft_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_SOFT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -24203,7 +24203,7 @@ test_link_visit_soft_links_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -24245,35 +24245,35 @@ test_link_visit_external_links_cycles(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, external link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -24281,7 +24281,7 @@ test_link_visit_external_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -24297,7 +24297,7 @@ test_link_visit_external_links_cycles(void) (int)(LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_SUBGROUPS - i - 1)); if ((subgroup_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup '%s'\n", grp_name); goto error; } @@ -24317,33 +24317,33 @@ test_link_visit_external_links_cycles(void) if (H5Lcreate_external(H5_API_TEST_FILENAME, link_target_obj, subgroup_id, link_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", link_name); goto error; } /* Verify the link has been created */ if ((link_exists = H5Lexists(subgroup_id, link_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' exists\n", link_name); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' did not exist\n", link_name); goto error; } } if (H5Gclose(subgroup_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close subgroup '%s'\n", grp_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -24356,57 +24356,57 @@ test_link_visit_external_links_cycles(void) PART_BEGIN(H5Lvisit_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -24416,27 +24416,27 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -24446,24 +24446,24 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -24471,24 +24471,24 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST; @@ -24496,27 +24496,27 @@ test_link_visit_external_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -24528,27 +24528,27 @@ test_link_visit_external_links_cycles(void) "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -24560,24 +24560,24 @@ test_link_visit_external_links_cycles(void) "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_EXT_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_external_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_EXT_LINKS_CYCLE_TEST_NUM_LINKS_PER_TEST) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -24588,7 +24588,7 @@ test_link_visit_external_links_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -24620,9 +24620,9 @@ test_link_visit_external_links_cycles(void) static int test_link_visit_ud_links_cycles(void) { - TESTING_API("link visiting with cycles (only user-defined links)"); + TESTING("link visiting with cycles (only user-defined links)"); - SKIPPED_API(); + SKIPPED(); return 1; } @@ -24654,22 +24654,22 @@ test_link_visit_mixed_links_cycles(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_HARD_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, link, hard link, soft link, external link, iterate, " "or user defined link aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link test file name\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -24678,26 +24678,26 @@ test_link_visit_mixed_links_cycles(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -24705,7 +24705,7 @@ test_link_visit_mixed_links_cycles(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME); goto error; @@ -24713,14 +24713,14 @@ test_link_visit_mixed_links_cycles(void) if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2); goto error; } if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second subgroup '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3); goto error; @@ -24728,7 +24728,7 @@ test_link_visit_mixed_links_cycles(void) if (H5Lcreate_hard(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2, subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); goto error; } @@ -24737,79 +24737,79 @@ test_link_visit_mixed_links_cycles(void) "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME2, subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); goto error; } if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); goto error; } if (H5Lcreate_hard(group_id, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME3, subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second hard link '%s'\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first link '%s' exists\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" first link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME1); goto error; } if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if second link '%s' exists\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" second link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME2); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if third link '%s' exists\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" third link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME3); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if fourth link '%s' exists\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" fourth link '%s' did not exist\n", LINK_VISIT_MIXED_LINKS_CYCLE_TEST_LINK_NAME4); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -24822,55 +24822,55 @@ test_link_visit_mixed_links_cycles(void) PART_BEGIN(H5Lvisit_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); i = 0; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS; if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_increasing); } @@ -24880,27 +24880,27 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_cycles_link_creation_decreasing); } @@ -24910,48 +24910,48 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_cycles_link_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); i = 0; if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } if (i != LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS; @@ -24959,27 +24959,27 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } if (i != 2 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_name_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_name_decreasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_increasing); } @@ -24990,27 +24990,27 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } if (i != 3 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_increasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_increasing); PART_BEGIN(H5Lvisit_by_name_cycles_link_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_cycles_link_creation_decreasing); } @@ -25021,24 +25021,24 @@ test_link_visit_mixed_links_cycles(void) if (H5Lvisit_by_name2( file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_MIXED_LINKS_CYCLE_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_mixed_links_cycles_cb, &i, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } if (i != 4 * LINK_VISIT_MIXED_LINKS_CYCLE_TEST_NUM_LINKS) { - H5_FAILED_API(); + H5_FAILED(); printf(" some links were not visited!\n"); - PART_ERROR_API(H5Lvisit_by_name_cycles_link_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_cycles_link_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_cycles_link_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -25053,7 +25053,7 @@ test_link_visit_mixed_links_cycles(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -25096,22 +25096,22 @@ test_link_visit_invalid_params(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, link, external link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if (prefix_filename(test_path_prefix, EXTERNAL_LINK_TEST_FILE_NAME, &ext_link_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link test file name\n"); goto error; } if ((file_id = H5Fcreate(ext_link_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s' for external link to reference\n", ext_link_filename); goto error; } @@ -25120,34 +25120,34 @@ test_link_visit_invalid_params(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; } if ((subgroup1 = H5Gcreate2(group_id, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME2); goto error; } if ((subgroup2 = H5Gcreate2(group_id, LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second subgroup '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME3); goto error; } @@ -25161,7 +25161,7 @@ test_link_visit_invalid_params(void) if ((dset_id = H5Dcreate2(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME); } @@ -25170,7 +25170,7 @@ test_link_visit_invalid_params(void) if ((dset_id = H5Dcreate2(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second dataset '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME); } @@ -25179,90 +25179,90 @@ test_link_visit_invalid_params(void) if (H5Lcreate_hard(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create first hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1); goto error; } if (H5Lcreate_soft(LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2); goto error; } if (H5Lcreate_external(ext_link_filename, "/", subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create external link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3); goto error; } if (H5Lcreate_hard(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_DSET_NAME, subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create second hard link '%s'\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4); goto error; } /* Verify the links have been created */ if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if first link '%s' exists\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME1); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 1 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup1, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if second link '%s' exists\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME2); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 2 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if third link '%s' exists\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME3); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 3 did not exist\n"); goto error; } if ((link_exists = H5Lexists(subgroup2, LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if fourth link '%s' exists\n", LINK_VISIT_INVALID_PARAMS_TEST_LINK_NAME4); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link 4 did not exist\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lvisit_invalid_grp_id) { - TESTING_2_API("H5Lvisit2 with an invalid group ID"); + TESTING_2("H5Lvisit2 with an invalid group ID"); H5E_BEGIN_TRY { @@ -25272,18 +25272,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 succeeded with an invalid group ID!\n"); - PART_ERROR_API(H5Lvisit_invalid_grp_id); + PART_ERROR(H5Lvisit_invalid_grp_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_invalid_grp_id); PART_BEGIN(H5Lvisit_invalid_index_type) { - TESTING_2_API("H5Lvisit2 with an invalid index type"); + TESTING_2("H5Lvisit2 with an invalid index type"); H5E_BEGIN_TRY { @@ -25293,9 +25293,9 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Lvisit_invalid_index_type); + PART_ERROR(H5Lvisit_invalid_index_type); } H5E_BEGIN_TRY @@ -25305,18 +25305,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Lvisit_invalid_index_type); + PART_ERROR(H5Lvisit_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_invalid_index_type); PART_BEGIN(H5Lvisit_invalid_iter_order) { - TESTING_2_API("H5Lvisit2 with an invalid iteration ordering"); + TESTING_2("H5Lvisit2 with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -25326,9 +25326,9 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Lvisit_invalid_iter_order); + PART_ERROR(H5Lvisit_invalid_iter_order); } H5E_BEGIN_TRY @@ -25338,18 +25338,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Lvisit_invalid_iter_order); + PART_ERROR(H5Lvisit_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_invalid_iter_order); PART_BEGIN(H5Lvisit_by_name_invalid_loc_id) { - TESTING_2_API("H5Lvisit_by_name2 with an invalid location ID"); + TESTING_2("H5Lvisit_by_name2 with an invalid location ID"); H5E_BEGIN_TRY { @@ -25361,18 +25361,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_loc_id); + PART_ERROR(H5Lvisit_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_invalid_loc_id); PART_BEGIN(H5Lvisit_by_name_invalid_grp_name) { - TESTING_2_API("H5Lvisit_by_name2 with an invalid group name"); + TESTING_2("H5Lvisit_by_name2 with an invalid group name"); H5E_BEGIN_TRY { @@ -25382,9 +25382,9 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with a NULL group name!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_grp_name); + PART_ERROR(H5Lvisit_by_name_invalid_grp_name); } H5E_BEGIN_TRY @@ -25395,18 +25395,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with an invalid group name of ''!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_grp_name); + PART_ERROR(H5Lvisit_by_name_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_invalid_grp_name); PART_BEGIN(H5Lvisit_by_name_invalid_index_type) { - TESTING_2_API("H5Lvisit_by_name2 with an invalid index type"); + TESTING_2("H5Lvisit_by_name2 with an invalid index type"); H5E_BEGIN_TRY { @@ -25417,9 +25417,9 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_index_type); + PART_ERROR(H5Lvisit_by_name_invalid_index_type); } H5E_BEGIN_TRY @@ -25431,18 +25431,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_index_type); + PART_ERROR(H5Lvisit_by_name_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_invalid_index_type); PART_BEGIN(H5Lvisit_by_name_invalid_iter_order) { - TESTING_2_API("H5Lvisit_by_name2 with an invalid iteration ordering"); + TESTING_2("H5Lvisit_by_name2 with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -25453,9 +25453,9 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_iter_order); + PART_ERROR(H5Lvisit_by_name_invalid_iter_order); } H5E_BEGIN_TRY @@ -25467,18 +25467,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_iter_order); + PART_ERROR(H5Lvisit_by_name_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_invalid_iter_order); PART_BEGIN(H5Lvisit_by_name_invalid_lapl) { - TESTING_2_API("H5Lvisit_by_name2 with an invalid LAPL"); + TESTING_2("H5Lvisit_by_name2 with an invalid LAPL"); H5E_BEGIN_TRY { @@ -25489,18 +25489,18 @@ test_link_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Lvisit_by_name_invalid_lapl); + PART_ERROR(H5Lvisit_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -25517,7 +25517,7 @@ test_link_visit_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(ext_link_filename); - PASSED_API(); + PASSED(); return 0; @@ -25556,35 +25556,35 @@ test_link_visit_0_links(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or link iterate aren't supported " "with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, LINK_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", LINK_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -25592,119 +25592,119 @@ test_link_visit_0_links(void) if ((group_id = H5Gcreate2(container_group, LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Lvisit_0_links_name_increasing) { - TESTING_2_API("H5Lvisit2 by link name in increasing order"); + TESTING_2("H5Lvisit2 by link name in increasing order"); if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_INC, link_visit_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_0_links_name_increasing); + PART_ERROR(H5Lvisit_0_links_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_0_links_name_increasing); PART_BEGIN(H5Lvisit_0_links_name_decreasing) { - TESTING_2_API("H5Lvisit2 by link name in decreasing order"); + TESTING_2("H5Lvisit2 by link name in decreasing order"); if (H5Lvisit2(group_id, H5_INDEX_NAME, H5_ITER_DEC, link_visit_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_0_links_name_decreasing); + PART_ERROR(H5Lvisit_0_links_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_0_links_name_decreasing); PART_BEGIN(H5Lvisit_0_links_creation_increasing) { - TESTING_2_API("H5Lvisit2 by creation order in increasing order"); + TESTING_2("H5Lvisit2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_0_links_creation_increasing); } if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_0_links_creation_increasing); + PART_ERROR(H5Lvisit_0_links_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_0_links_creation_increasing); PART_BEGIN(H5Lvisit_0_links_creation_decreasing) { - TESTING_2_API("H5Lvisit2 by creation order in decreasing order"); + TESTING_2("H5Lvisit2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_0_links_creation_decreasing); } if (H5Lvisit2(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_0_links_cb, NULL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_0_links_creation_decreasing); + PART_ERROR(H5Lvisit_0_links_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_0_links_creation_decreasing); PART_BEGIN(H5Lvisit_by_name_0_links_name_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in increasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in increasing order"); if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_0_links_name_increasing); + PART_ERROR(H5Lvisit_by_name_0_links_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_0_links_name_increasing); PART_BEGIN(H5Lvisit_by_name_0_links_name_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by link name in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by link name in decreasing order"); if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type name in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_0_links_name_decreasing); + PART_ERROR(H5Lvisit_by_name_0_links_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_0_links_name_decreasing); PART_BEGIN(H5Lvisit_by_name_0_links_creation_increasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in increasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_0_links_creation_increasing); } @@ -25712,21 +25712,21 @@ test_link_visit_0_links(void) if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in increasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_0_links_creation_increasing); + PART_ERROR(H5Lvisit_by_name_0_links_creation_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_0_links_creation_increasing); PART_BEGIN(H5Lvisit_by_name_0_links_creation_decreasing) { - TESTING_2_API("H5Lvisit_by_name2 by creation order in decreasing order"); + TESTING_2("H5Lvisit_by_name2 by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Lvisit_by_name_0_links_creation_decreasing); } @@ -25734,18 +25734,18 @@ test_link_visit_0_links(void) if (H5Lvisit_by_name2(file_id, "/" LINK_TEST_GROUP_NAME "/" LINK_VISIT_0_LINKS_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, link_visit_0_links_cb, NULL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Lvisit_by_name2 by index type creation order in decreasing order failed\n"); - PART_ERROR_API(H5Lvisit_by_name_0_links_creation_decreasing); + PART_ERROR(H5Lvisit_by_name_0_links_creation_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Lvisit_by_name_0_links_creation_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -25756,7 +25756,7 @@ test_link_visit_0_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -25908,7 +25908,7 @@ link_iter_external_links_cb(hid_t group_id, const char *name, const H5L_info2_t herr_t ret_val = H5_ITER_CONT; if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for external links aren't supported with this " "connector\n"); return 1; @@ -25973,7 +25973,7 @@ link_iter_mixed_links_cb(hid_t group_id, const char *name, const H5L_info2_t *in herr_t ret_val = 0; if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for external or user-defined link aren't supported with this " "connector\n"); return 1; @@ -26062,7 +26062,7 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf int *broken = (int *)op_data; if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for external or user-defined link aren't supported with this " "connector\n"); return 1; @@ -26079,7 +26079,7 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf if (!HDstrncmp(name, LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME, strlen(LINK_ITER_MIXED_LINKS_TEST_HARD_LINK_NAME) + 1)) { if (H5L_TYPE_HARD != info->type) { - H5_FAILED_API(); + H5_FAILED(); printf(" link type did not match\n"); goto error; } @@ -26087,7 +26087,7 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf else if (!HDstrncmp(name, LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME, strlen(LINK_ITER_MIXED_LINKS_TEST_SOFT_LINK_NAME) + 1)) { if (H5L_TYPE_SOFT != info->type) { - H5_FAILED_API(); + H5_FAILED(); printf(" link type did not match\n"); goto error; } @@ -26095,13 +26095,13 @@ link_iter_idx_saving_cb(hid_t group_id, const char *name, const H5L_info2_t *inf else if (!HDstrncmp(name, LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME, strlen(LINK_ITER_MIXED_LINKS_TEST_EXT_LINK_NAME) + 1)) { if (H5L_TYPE_EXTERNAL != info->type) { - H5_FAILED_API(); + H5_FAILED(); printf(" link type did not match\n"); goto error; } } else { - H5_FAILED_API(); + H5_FAILED(); printf(" link name didn't match known names\n"); goto error; } @@ -26347,7 +26347,7 @@ link_visit_external_links_no_cycles_cb(hid_t group_id, const char *name, const H herr_t ret_val = H5_ITER_CONT; if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for external links aren't supported with this " "connector\n"); return 1; @@ -26462,7 +26462,7 @@ link_visit_mixed_links_no_cycles_cb(hid_t group_id, const char *name, const H5L_ herr_t ret_val = 0; if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for external or user-defined link aren't supported with this " "connector\n"); return 1; @@ -26834,7 +26834,7 @@ link_visit_external_links_cycles_cb(hid_t group_id, const char *name, const H5L_ herr_t ret_val = H5_ITER_CONT; if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for external links aren't supported with this " "connector\n"); return 1; @@ -26949,7 +26949,7 @@ link_visit_mixed_links_cycles_cb(hid_t group_id, const char *name, const H5L_inf herr_t ret_val = 0; if (!(vol_cap_flags_g & H5VL_CAP_FLAG_EXTERNAL_LINKS) || !(vol_cap_flags_g & H5VL_CAP_FLAG_UD_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for external or user-defined link aren't supported with this " "connector\n"); return 1; diff --git a/test/API/H5_api_misc_test.c b/test/API/H5_api_misc_test.c index 78c6657b7f1..d5a7ab08aef 100644 --- a/test/API/H5_api_misc_test.c +++ b/test/API/H5_api_misc_test.c @@ -38,24 +38,24 @@ test_open_link_without_leading_slash(void) hid_t dset_dtype = H5I_INVALID_HID; hid_t space_id = H5I_INVALID_HID; - TESTING_API("opening a link without a leading slash"); + TESTING("opening a link without a leading slash"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } @@ -69,7 +69,7 @@ test_open_link_without_leading_slash(void) if ((dset_id = H5Dcreate2(container_group, OPEN_LINK_WITHOUT_SLASH_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); goto error; } @@ -84,20 +84,20 @@ test_open_link_without_leading_slash(void) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((group_id = H5Gopen2(file_id, "/", H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open root group\n"); goto error; } if ((dset_id = H5Dopen2(group_id, MISCELLANEOUS_TEST_GROUP_NAME "/" OPEN_LINK_WITHOUT_SLASH_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset\n"); goto error; } @@ -111,7 +111,7 @@ test_open_link_without_leading_slash(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -147,22 +147,22 @@ test_object_creation_by_absolute_path(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, link, or stored datatype aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } @@ -170,7 +170,7 @@ test_object_creation_by_absolute_path(void) /* Start by creating a group to hold all the objects for this test */ if ((group_id = H5Gcreate2(container_group, OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group\n"); goto error; } @@ -179,24 +179,24 @@ test_object_creation_by_absolute_path(void) "/" MISCELLANEOUS_TEST_GROUP_NAME "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); goto error; } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" container group didn't exist at the correct location\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gcreate_using_absolute_path) { - TESTING_2_API("creation of group using absolute pathname"); + TESTING_2("creation of group using absolute pathname"); /* Try to create a group under the container group by using an absolute pathname */ if ((sub_group_id = H5Gcreate2(file_id, @@ -204,9 +204,9 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create subgroup by absolute pathname\n"); - PART_ERROR_API(H5Gcreate_using_absolute_path); + PART_ERROR(H5Gcreate_using_absolute_path); } if ((link_exists = H5Lexists(file_id, @@ -214,37 +214,37 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_CONTAINER_GROUP_NAME "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Gcreate_using_absolute_path); + PART_ERROR(H5Gcreate_using_absolute_path); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" subgroup didn't exist at the correct location\n"); - PART_ERROR_API(H5Gcreate_using_absolute_path); + PART_ERROR(H5Gcreate_using_absolute_path); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_using_absolute_path); PART_BEGIN(H5Dcreate_using_absolute_path) { - TESTING_2_API("creation of dataset using absolute pathname"); + TESTING_2("creation of dataset using absolute pathname"); /* Try to create a dataset nested at the end of this group chain by using an absolute pathname */ if ((fspace_id = generate_random_dataspace(OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_SPACE_RANK, NULL, NULL, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to generate dataspace\n"); - PART_ERROR_API(H5Dcreate_using_absolute_path); + PART_ERROR(H5Dcreate_using_absolute_path); } if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to generate datatype\n"); - PART_ERROR_API(H5Dcreate_using_absolute_path); + PART_ERROR(H5Dcreate_using_absolute_path); } if ((dset_id = H5Dcreate2(file_id, @@ -253,9 +253,9 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); - PART_ERROR_API(H5Dcreate_using_absolute_path); + PART_ERROR(H5Dcreate_using_absolute_path); } if ((link_exists = H5Lexists(file_id, @@ -264,30 +264,30 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Dcreate_using_absolute_path); + PART_ERROR(H5Dcreate_using_absolute_path); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset didn't exist at the correct location\n"); - PART_ERROR_API(H5Dcreate_using_absolute_path); + PART_ERROR(H5Dcreate_using_absolute_path); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_using_absolute_path); PART_BEGIN(H5Tcommit_using_absolute_path) { - TESTING_2_API("creation of committed datatype using absolute pathname"); + TESTING_2("creation of committed datatype using absolute pathname"); /* Try to create a committed datatype in the same fashion as the preceding dataset */ if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); - PART_ERROR_API(H5Tcommit_using_absolute_path); + PART_ERROR(H5Tcommit_using_absolute_path); } if (H5Tcommit2(file_id, @@ -296,9 +296,9 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype\n"); - PART_ERROR_API(H5Tcommit_using_absolute_path); + PART_ERROR(H5Tcommit_using_absolute_path); } if ((link_exists = H5Lexists(file_id, @@ -307,24 +307,24 @@ test_object_creation_by_absolute_path(void) "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_SUBGROUP_NAME "/" OBJECT_CREATE_BY_ABSOLUTE_PATH_TEST_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Tcommit_using_absolute_path); + PART_ERROR(H5Tcommit_using_absolute_path); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" datatype didn't exist at the correct location\n"); - PART_ERROR_API(H5Tcommit_using_absolute_path); + PART_ERROR(H5Tcommit_using_absolute_path); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_using_absolute_path); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -343,7 +343,7 @@ test_object_creation_by_absolute_path(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -382,22 +382,22 @@ test_absolute_vs_relative_path(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or link aren't supported with this " "connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } @@ -405,7 +405,7 @@ test_absolute_vs_relative_path(void) /* Start by creating a group to be used during some of the dataset creation operations */ if ((group_id = H5Gcreate2(container_group, ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container group\n"); goto error; } @@ -427,13 +427,13 @@ test_absolute_vs_relative_path(void) if ((dset_dtype6 = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Dcreate_absolute_from_root) { - TESTING_2_API("dataset creation by absolute path from root group"); + TESTING_2("dataset creation by absolute path from root group"); /* Create a dataset by absolute path in the form "/group/dataset" starting from the root group */ if ((dset_id1 = H5Dcreate2(file_id, @@ -441,9 +441,9 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET1_NAME, dset_dtype1, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset by absolute path from root\n"); - PART_ERROR_API(H5Dcreate_absolute_from_root); + PART_ERROR(H5Dcreate_absolute_from_root); } if ((link_exists = H5Lexists(file_id, @@ -451,24 +451,24 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET1_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Dcreate_absolute_from_root); + PART_ERROR(H5Dcreate_absolute_from_root); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" didn't exist at the correct location\n"); - PART_ERROR_API(H5Dcreate_absolute_from_root); + PART_ERROR(H5Dcreate_absolute_from_root); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_absolute_from_root); PART_BEGIN(H5Dcreate_absolute_from_nonroot) { - TESTING_2_API("dataset creation by absolute path from non-root group"); + TESTING_2("dataset creation by absolute path from non-root group"); /* Create a dataset by absolute path in the form "/group/dataset" starting from the container * group */ @@ -477,9 +477,9 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET4_NAME, dset_dtype4, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset by absolute path from container group\n"); - PART_ERROR_API(H5Dcreate_absolute_from_nonroot); + PART_ERROR(H5Dcreate_absolute_from_nonroot); } if ((link_exists = H5Lexists(file_id, @@ -487,43 +487,43 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET4_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Dcreate_absolute_from_nonroot); + PART_ERROR(H5Dcreate_absolute_from_nonroot); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" didn't exist at the correct location\n"); - PART_ERROR_API(H5Dcreate_absolute_from_nonroot); + PART_ERROR(H5Dcreate_absolute_from_nonroot); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_absolute_from_nonroot); PART_BEGIN(H5Dcreate_relative_from_root) { - TESTING_2_API("dataset creation by relative path from root group"); + TESTING_2("dataset creation by relative path from root group"); /* TODO: */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Dcreate_relative_from_root); } PART_END(H5Dcreate_relative_from_root); PART_BEGIN(H5Dcreate_relative_from_nonroot) { - TESTING_2_API("dataset creation by relative path from non-root group"); + TESTING_2("dataset creation by relative path from non-root group"); /* Create a dataset by relative path in the form "dataset" starting from the test container group */ if ((dset_id5 = H5Dcreate2(group_id, ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET5_NAME, dset_dtype5, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset by relative path from container group\n"); - PART_ERROR_API(H5Dcreate_relative_from_nonroot); + PART_ERROR(H5Dcreate_relative_from_nonroot); } /* Create a dataset by relative path in the form "group/dataset" starting from the top-level @@ -532,9 +532,9 @@ test_absolute_vs_relative_path(void) ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET2_NAME, dset_dtype2, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset by relative path from container group\n"); - PART_ERROR_API(H5Dcreate_relative_from_nonroot); + PART_ERROR(H5Dcreate_relative_from_nonroot); } if ((link_exists = H5Lexists(file_id, @@ -542,15 +542,15 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET2_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Dcreate_relative_from_nonroot); + PART_ERROR(H5Dcreate_relative_from_nonroot); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" didn't exist at the correct location\n"); - PART_ERROR_API(H5Dcreate_relative_from_nonroot); + PART_ERROR(H5Dcreate_relative_from_nonroot); } if ((link_exists = H5Lexists(file_id, @@ -558,24 +558,24 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET5_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Dcreate_relative_from_nonroot); + PART_ERROR(H5Dcreate_relative_from_nonroot); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" didn't exist at the correct location\n"); - PART_ERROR_API(H5Dcreate_relative_from_nonroot); + PART_ERROR(H5Dcreate_relative_from_nonroot); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_relative_from_nonroot); PART_BEGIN(H5Dcreate_relative_leading_dot_root) { - TESTING_2_API("dataset creation by path with leading '.' from root group"); + TESTING_2("dataset creation by path with leading '.' from root group"); /* Create a dataset by relative path in the form "./group/dataset" starting from the root group */ if ((dset_id3 = H5Dcreate2(file_id, @@ -583,9 +583,9 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET3_NAME, dset_dtype3, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset by relative path from root with leading '.'\n"); - PART_ERROR_API(H5Dcreate_relative_leading_dot_root); + PART_ERROR(H5Dcreate_relative_leading_dot_root); } if ((link_exists = H5Lexists(file_id, @@ -593,32 +593,32 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET3_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Dcreate_relative_leading_dot_root); + PART_ERROR(H5Dcreate_relative_leading_dot_root); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" didn't exist at the correct location\n"); - PART_ERROR_API(H5Dcreate_relative_leading_dot_root); + PART_ERROR(H5Dcreate_relative_leading_dot_root); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_relative_leading_dot_root); PART_BEGIN(H5Dcreate_relative_leading_dot_nonroot) { - TESTING_2_API("dataset creation by path with leading '.' from non-root group"); + TESTING_2("dataset creation by path with leading '.' from non-root group"); /* Create a dataset by relative path in the form "./dataset" starting from the container group */ if ((dset_id6 = H5Dcreate2(group_id, "./" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET6_NAME, dset_dtype6, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf( " couldn't create dataset by relative path from container group with leading '.'\n"); - PART_ERROR_API(H5Dcreate_relative_leading_dot_nonroot); + PART_ERROR(H5Dcreate_relative_leading_dot_nonroot); } if ((link_exists = H5Lexists(file_id, @@ -626,24 +626,24 @@ test_absolute_vs_relative_path(void) "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_CONTAINER_GROUP_NAME "/" ABSOLUTE_VS_RELATIVE_PATH_TEST_DSET6_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link exists\n"); - PART_ERROR_API(H5Dcreate_relative_leading_dot_nonroot); + PART_ERROR(H5Dcreate_relative_leading_dot_nonroot); } if (!link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" didn't exist at the correct location\n"); - PART_ERROR_API(H5Dcreate_relative_leading_dot_nonroot); + PART_ERROR(H5Dcreate_relative_leading_dot_nonroot); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_relative_leading_dot_nonroot); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -678,7 +678,7 @@ test_absolute_vs_relative_path(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -727,46 +727,46 @@ test_dot_for_object_name(void) if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, or stored datatype aren't supported with " "this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", MISCELLANEOUS_TEST_GROUP_NAME); goto error; } if ((subgroup_id = H5Gcreate2(container_group, DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", DOT_AS_OBJECT_NAME_TEST_SUBGROUP_NAME); goto error; } if ((dspace_id = H5Screate(H5S_SCALAR)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create data space\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Gcreate_dot_as_name) { - TESTING_2_API("invalid creation of group with '.' as name"); + TESTING_2("invalid creation of group with '.' as name"); /* Create a group with the "." as the name. It should fail. */ H5E_BEGIN_TRY @@ -776,18 +776,18 @@ test_dot_for_object_name(void) H5E_END_TRY if (group_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a group was created with '.' as the name!\n"); - PART_ERROR_API(H5Gcreate_dot_as_name); + PART_ERROR(H5Gcreate_dot_as_name); } - PASSED_API(); + PASSED(); } PART_END(H5Gcreate_dot_as_name); PART_BEGIN(H5Dcreate_dot_as_name) { - TESTING_2_API("invalid creation of dataset with '.' as name"); + TESTING_2("invalid creation of dataset with '.' as name"); /* Create a dataset with the "." as the name. It should fail. */ H5E_BEGIN_TRY @@ -798,23 +798,23 @@ test_dot_for_object_name(void) H5E_END_TRY if (dset_id >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a dataset was created with '.' as the name!\n"); - PART_ERROR_API(H5Dcreate_dot_as_name); + PART_ERROR(H5Dcreate_dot_as_name); } - PASSED_API(); + PASSED(); } PART_END(H5Dcreate_dot_as_name); PART_BEGIN(H5Tcommit_dot_as_name) { - TESTING_2_API("invalid creation of committed datatype with '.' as name"); + TESTING_2("invalid creation of committed datatype with '.' as name"); if ((dtype_id = H5Tcopy(H5T_NATIVE_INT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't copy a native datatype\n"); - PART_ERROR_API(H5Tcommit_dot_as_name); + PART_ERROR(H5Tcommit_dot_as_name); } /* Commit a datatype with "." as the name. It should fail. */ @@ -825,24 +825,24 @@ test_dot_for_object_name(void) H5E_END_TRY if (ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" a named datatype was committed with '.' as the name!\n"); - PART_ERROR_API(H5Tcommit_dot_as_name); + PART_ERROR(H5Tcommit_dot_as_name); } if (H5Tclose(dtype_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close datatype\n"); - PART_ERROR_API(H5Tcommit_dot_as_name); + PART_ERROR(H5Tcommit_dot_as_name); } - PASSED_API(); + PASSED(); } PART_END(H5Tcommit_dot_as_name); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(dspace_id) < 0) TEST_ERROR; @@ -853,7 +853,7 @@ test_dot_for_object_name(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -885,9 +885,9 @@ test_dot_for_object_name(void) static int test_double_init_term(void) { - TESTING_API("double init/term correctness"); + TESTING("double init/term correctness"); - SKIPPED_API(); + SKIPPED(); return 0; @@ -911,12 +911,12 @@ test_symbols_in_compound_field_name(void) hid_t type_pool[COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_NUM_SUBTYPES]; char member_names[COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_NUM_SUBTYPES][256]; - TESTING_API("usage of '{', '}' and '\\\"' symbols in compound field name"); + TESTING("usage of '{', '}' and '\\\"' symbols in compound field name"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or dataset aren't supported with this connector\n"); return 0; } @@ -925,20 +925,20 @@ test_symbols_in_compound_field_name(void) type_pool[i] = H5I_INVALID_HID; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file\n"); goto error; } if ((container_group = H5Gopen2(file_id, MISCELLANEOUS_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group\n"); goto error; } if ((group_id = H5Gcreate2(container_group, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group\n"); goto error; } @@ -959,14 +959,14 @@ test_symbols_in_compound_field_name(void) HDsnprintf(member_names[8], 256, "{{ member8\\\\"); if ((compound_type = H5Tcreate(H5T_COMPOUND, total_type_size)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create compound datatype\n"); goto error; } for (i = 0, next_offset = 0; i < COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_NUM_SUBTYPES; i++) { if (H5Tinsert(compound_type, member_names[i], next_offset, type_pool[i]) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't insert compound member %zu\n", i); goto error; } @@ -983,7 +983,7 @@ test_symbols_in_compound_field_name(void) if ((dset_id = H5Dcreate2(group_id, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_NAME, compound_type, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset\n"); goto error; } @@ -993,7 +993,7 @@ test_symbols_in_compound_field_name(void) if ((dset_id = H5Dopen2(group_id, COMPOUND_WITH_SYMBOLS_IN_MEMBER_NAMES_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset\n"); goto error; } @@ -1015,7 +1015,7 @@ test_symbols_in_compound_field_name(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; diff --git a/test/API/H5_api_object_test.c b/test/API/H5_api_object_test.c index 428eec2806f..4f81c8e0751 100644 --- a/test/API/H5_api_object_test.c +++ b/test/API/H5_api_object_test.c @@ -119,33 +119,33 @@ test_open_object(void) TESTING_MULTIPART("object opening"); - TESTING_2_API("test setup"); + TESTING_2("test setup"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, dataset, or stored datatype aren't " "supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME); goto error; } @@ -156,19 +156,19 @@ test_open_object(void) if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Oopen_group) { - TESTING_2_API("H5Oopen on a group"); + TESTING_2("H5Oopen on a group"); if ((group_id2 = H5Gcreate2(group_id, OBJECT_OPEN_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_OPEN_TEST_GRP_NAME); - PART_ERROR_API(H5Oopen_group); + PART_ERROR(H5Oopen_group); } H5E_BEGIN_TRY @@ -178,36 +178,36 @@ test_open_object(void) H5E_END_TRY if ((group_id2 = H5Oopen(group_id, OBJECT_OPEN_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group '%s' with H5Oopen\n", OBJECT_OPEN_TEST_GRP_NAME); - PART_ERROR_API(H5Oopen_group); + PART_ERROR(H5Oopen_group); } if (H5Iget_type(group_id2) != H5I_GROUP) { - H5_FAILED_API(); + H5_FAILED(); printf(" ID is not a group\n"); - PART_ERROR_API(H5Oopen_group); + PART_ERROR(H5Oopen_group); } if (H5Gclose(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group opened with H5Oopen\n"); - PART_ERROR_API(H5Oopen_group); + PART_ERROR(H5Oopen_group); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_group); PART_BEGIN(H5Oopen_dset) { - TESTING_2_API("H5Oopen on a dataset"); + TESTING_2("H5Oopen on a dataset"); if ((dset_id = H5Dcreate2(group_id, OBJECT_OPEN_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_OPEN_TEST_DSET_NAME); - PART_ERROR_API(H5Oopen_dset); + PART_ERROR(H5Oopen_dset); } H5E_BEGIN_TRY @@ -217,42 +217,42 @@ test_open_object(void) H5E_END_TRY if ((dset_id = H5Oopen(group_id, OBJECT_OPEN_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s' with H5Oopen\n", OBJECT_OPEN_TEST_DSET_NAME); - PART_ERROR_API(H5Oopen_dset); + PART_ERROR(H5Oopen_dset); } if (H5Iget_type(dset_id) != H5I_DATASET) { - H5_FAILED_API(); + H5_FAILED(); printf(" ID is not a dataset\n"); - PART_ERROR_API(H5Oopen_dset); + PART_ERROR(H5Oopen_dset); } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close dataset opened with H5Oopen\n"); - PART_ERROR_API(H5Oopen_dset); + PART_ERROR(H5Oopen_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_dset); PART_BEGIN(H5Oopen_dtype) { - TESTING_2_API("H5Oopen on a committed datatype"); + TESTING_2("H5Oopen on a committed datatype"); if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME); - PART_ERROR_API(H5Oopen_dtype); + PART_ERROR(H5Oopen_dtype); } if (H5Tcommit2(group_id, OBJECT_OPEN_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_OPEN_TEST_TYPE_NAME); - PART_ERROR_API(H5Oopen_dtype); + PART_ERROR(H5Oopen_dtype); } H5E_BEGIN_TRY @@ -262,24 +262,24 @@ test_open_object(void) H5E_END_TRY if ((type_id = H5Oopen(group_id, OBJECT_OPEN_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open datatype '%s' with H5Oopen\n", OBJECT_OPEN_TEST_TYPE_NAME); - PART_ERROR_API(H5Oopen_dtype); + PART_ERROR(H5Oopen_dtype); } if (H5Iget_type(type_id) != H5I_DATATYPE) { - H5_FAILED_API(); + H5_FAILED(); printf(" ID is not a dataset\n"); - PART_ERROR_API(H5Oopen_dtype); + PART_ERROR(H5Oopen_dtype); } if (H5Tclose(type_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close committed datatype opened with H5Oopen\n"); - PART_ERROR_API(H5Oopen_dtype); + PART_ERROR(H5Oopen_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_dtype); @@ -310,47 +310,47 @@ test_open_object(void) PART_BEGIN(H5Oopen_by_idx_group) { - TESTING_2_API("H5Oopen_by_idx on a group"); + TESTING_2("H5Oopen_by_idx on a group"); if ((group_id2 = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 1, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_GRP_NAME); - PART_ERROR_API(H5Oopen_by_idx_group); + PART_ERROR(H5Oopen_by_idx_group); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_group); PART_BEGIN(H5Oopen_by_idx_dset) { - TESTING_2_API("H5Oopen_by_idx on a dataset"); + TESTING_2("H5Oopen_by_idx on a dataset"); if ((dset_id = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 0, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_DSET_NAME); - PART_ERROR_API(H5Oopen_by_idx_dset); + PART_ERROR(H5Oopen_by_idx_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_dset); PART_BEGIN(H5Oopen_by_idx_dtype) { - TESTING_2_API("H5Oopen_by_idx on a committed datatype"); + TESTING_2("H5Oopen_by_idx on a committed datatype"); if ((type_id = H5Oopen_by_idx(container_group, OBJECT_OPEN_TEST_GROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, 2, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open committed datatype '%s' with H5Oopen_by_idx\n", OBJECT_OPEN_TEST_TYPE_NAME); - PART_ERROR_API(H5Oopen_by_idx_dtype); + PART_ERROR(H5Oopen_by_idx_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_dtype); @@ -381,7 +381,7 @@ test_open_object(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -394,7 +394,7 @@ test_open_object(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -433,35 +433,35 @@ test_open_object_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or object aren't supported with " "this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -469,14 +469,14 @@ test_open_object_invalid_params(void) if ((group_id = H5Gcreate2(container_group, OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_OPEN_INVALID_PARAMS_TEST_GRP_NAME); goto error; } @@ -484,13 +484,13 @@ test_open_object_invalid_params(void) if (H5Gclose(group_id2) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Oopen_invalid_loc_id) { - TESTING_2_API("H5Oopen with an invalid location ID"); + TESTING_2("H5Oopen with an invalid location ID"); H5E_BEGIN_TRY { @@ -499,19 +499,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen succeeded with an invalid location ID!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_invalid_loc_id); + PART_ERROR(H5Oopen_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_invalid_loc_id); PART_BEGIN(H5Oopen_invalid_obj_name) { - TESTING_2_API("H5Oopen with an invalid object name"); + TESTING_2("H5Oopen with an invalid object name"); H5E_BEGIN_TRY { @@ -520,10 +520,10 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen succeeded with a NULL object name!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_invalid_obj_name); + PART_ERROR(H5Oopen_invalid_obj_name); } H5E_BEGIN_TRY @@ -533,19 +533,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen succeeded with an invalid object name of ''!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_invalid_obj_name); + PART_ERROR(H5Oopen_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_invalid_obj_name); PART_BEGIN(H5Oopen_invalid_lapl) { - TESTING_2_API("H5Oopen with an invalid LAPL"); + TESTING_2("H5Oopen with an invalid LAPL"); H5E_BEGIN_TRY { @@ -554,19 +554,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen succeeded with an invalid LAPL!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_invalid_lapl); + PART_ERROR(H5Oopen_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_invalid_lapl); PART_BEGIN(H5Oopen_by_idx_invalid_loc_id) { - TESTING_2_API("H5Oopen_by_idx with an invalid location ID"); + TESTING_2("H5Oopen_by_idx with an invalid location ID"); H5E_BEGIN_TRY { @@ -576,19 +576,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with an invalid location ID!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_loc_id); + PART_ERROR(H5Oopen_by_idx_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_invalid_loc_id); PART_BEGIN(H5Oopen_by_idx_invalid_grp_name) { - TESTING_2_API("H5Oopen_by_idx with an invalid group name"); + TESTING_2("H5Oopen_by_idx with an invalid group name"); H5E_BEGIN_TRY { @@ -597,10 +597,10 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with a NULL group name!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_grp_name); + PART_ERROR(H5Oopen_by_idx_invalid_grp_name); } H5E_BEGIN_TRY @@ -610,19 +610,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with an invalid group name of ''!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_grp_name); + PART_ERROR(H5Oopen_by_idx_invalid_grp_name); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_invalid_grp_name); PART_BEGIN(H5Oopen_by_idx_invalid_index_type) { - TESTING_2_API("H5Oopen_by_idx with an invalid index type"); + TESTING_2("H5Oopen_by_idx with an invalid index type"); H5E_BEGIN_TRY { @@ -632,10 +632,10 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_index_type); + PART_ERROR(H5Oopen_by_idx_invalid_index_type); } H5E_BEGIN_TRY @@ -646,19 +646,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with invalid index type H5_INDEX_N!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_index_type); + PART_ERROR(H5Oopen_by_idx_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_invalid_index_type); PART_BEGIN(H5Oopen_by_idx_invalid_iter_order) { - TESTING_2_API("H5Oopen_by_idx with an invalid iteration order"); + TESTING_2("H5Oopen_by_idx with an invalid iteration order"); H5E_BEGIN_TRY { @@ -668,10 +668,10 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_UNKNOWN!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_iter_order); + PART_ERROR(H5Oopen_by_idx_invalid_iter_order); } H5E_BEGIN_TRY @@ -682,19 +682,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with an invalid iteration ordering H5_ITER_N!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_iter_order); + PART_ERROR(H5Oopen_by_idx_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_invalid_iter_order); PART_BEGIN(H5Oopen_by_idx_invalid_lapl) { - TESTING_2_API("H5Oopen_by_idx with an invalid LAPL"); + TESTING_2("H5Oopen_by_idx with an invalid LAPL"); H5E_BEGIN_TRY { @@ -704,19 +704,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_idx succeeded with an invalid LAPL!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_idx_invalid_lapl); + PART_ERROR(H5Oopen_by_idx_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_idx_invalid_lapl); PART_BEGIN(H5Oopen_by_token_invalid_loc_id) { - TESTING_2_API("H5Oopen_by_token with an invalid location ID"); + TESTING_2("H5Oopen_by_token with an invalid location ID"); H5E_BEGIN_TRY { @@ -725,19 +725,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_token succeeded with an invalid location ID!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_token_invalid_loc_id); + PART_ERROR(H5Oopen_by_token_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_token_invalid_loc_id); PART_BEGIN(H5Oopen_by_token_invalid_token) { - TESTING_2_API("H5Oopen_by_token with an invalid token"); + TESTING_2("H5Oopen_by_token with an invalid token"); H5E_BEGIN_TRY { @@ -746,19 +746,19 @@ test_open_object_invalid_params(void) H5E_END_TRY if (group_id2 >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oopen_by_token succeeded with an invalid token!\n"); H5Gclose(group_id2); - PART_ERROR_API(H5Oopen_by_token_invalid_token); + PART_ERROR(H5Oopen_by_token_invalid_token); } - PASSED_API(); + PASSED(); } PART_END(H5Oopen_by_token_invalid_token); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -769,7 +769,7 @@ test_open_object_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -809,29 +809,29 @@ test_object_exists(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, dataset, stored datatype or soft link " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_EXISTS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_EXISTS_TEST_SUBGROUP_NAME); goto error; } @@ -842,7 +842,7 @@ test_object_exists(void) if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); /* * NOTE: H5Oexists_by_name for hard links should always succeed. @@ -852,173 +852,173 @@ test_object_exists(void) { PART_BEGIN(H5Oexists_by_name_group) { - TESTING_2_API("H5Oexists_by_name on a group"); + TESTING_2("H5Oexists_by_name on a group"); if ((group_id2 = H5Gcreate2(group_id, OBJECT_EXISTS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_EXISTS_TEST_GRP_NAME); - PART_ERROR_API(H5Oexists_by_name_group); + PART_ERROR(H5Oexists_by_name_group); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_GRP_NAME); - PART_ERROR_API(H5Oexists_by_name_group); + PART_ERROR(H5Oexists_by_name_group); } if (!object_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_GRP_NAME); - PART_ERROR_API(H5Oexists_by_name_group); + PART_ERROR(H5Oexists_by_name_group); } if (H5Gclose(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group\n"); - PART_ERROR_API(H5Oexists_by_name_group); + PART_ERROR(H5Oexists_by_name_group); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_group); PART_BEGIN(H5Oexists_by_name_dset) { - TESTING_2_API("H5Oexists_by_name on a dataset"); + TESTING_2("H5Oexists_by_name on a dataset"); if ((dset_id = H5Dcreate2(group_id, OBJECT_EXISTS_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_EXISTS_TEST_DSET_NAME); - PART_ERROR_API(H5Oexists_by_name_dset); + PART_ERROR(H5Oexists_by_name_dset); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_DSET_NAME); - PART_ERROR_API(H5Oexists_by_name_dset); + PART_ERROR(H5Oexists_by_name_dset); } if (!object_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_DSET_NAME); - PART_ERROR_API(H5Oexists_by_name_dset); + PART_ERROR(H5Oexists_by_name_dset); } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close dataset\n"); - PART_ERROR_API(H5Oexists_by_name_dset); + PART_ERROR(H5Oexists_by_name_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_dset); PART_BEGIN(H5Oexists_by_name_dtype) { - TESTING_2_API("H5Oexists_by_name on a committed datatype"); + TESTING_2("H5Oexists_by_name on a committed datatype"); if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME); - PART_ERROR_API(H5Oexists_by_name_dtype); + PART_ERROR(H5Oexists_by_name_dtype); } if (H5Tcommit2(group_id, OBJECT_EXISTS_TEST_TYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_EXISTS_TEST_TYPE_NAME); - PART_ERROR_API(H5Oexists_by_name_dtype); + PART_ERROR(H5Oexists_by_name_dtype); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_TYPE_NAME); - PART_ERROR_API(H5Oexists_by_name_dtype); + PART_ERROR(H5Oexists_by_name_dtype); } if (!object_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_TYPE_NAME); - PART_ERROR_API(H5Oexists_by_name_dtype); + PART_ERROR(H5Oexists_by_name_dtype); } if (H5Tclose(dtype_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close datatype\n"); - PART_ERROR_API(H5Oexists_by_name_dtype); + PART_ERROR(H5Oexists_by_name_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_dtype); PART_BEGIN(H5Oexists_by_name_soft_link) { - TESTING_2_API("H5Oexists_by_name for a soft link"); + TESTING_2("H5Oexists_by_name for a soft link"); if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME, group_id, OBJECT_EXISTS_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Oexists_by_name_soft_link); + PART_ERROR(H5Oexists_by_name_soft_link); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_SOFT_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if object '%s' exists\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Oexists_by_name_soft_link); + PART_ERROR(H5Oexists_by_name_soft_link); } if (!object_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" object '%s' didn't exist!\n", OBJECT_EXISTS_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Oexists_by_name_soft_link); + PART_ERROR(H5Oexists_by_name_soft_link); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_soft_link); PART_BEGIN(H5Oexists_by_name_dangling_soft_link) { - TESTING_2_API("H5Oexists_by_name for a dangling soft link"); + TESTING_2("H5Oexists_by_name for a dangling soft link"); if (H5Lcreate_soft( "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME "/non_existent_object", group_id, OBJECT_EXISTS_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", OBJECT_EXISTS_TEST_DANGLING_LINK_NAME); - PART_ERROR_API(H5Oexists_by_name_dangling_soft_link); + PART_ERROR(H5Oexists_by_name_dangling_soft_link); } if ((object_exists = H5Oexists_by_name(group_id, OBJECT_EXISTS_TEST_DANGLING_LINK_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if object '%s' exists\n", "/" OBJECT_TEST_GROUP_NAME "/" OBJECT_EXISTS_TEST_SUBGROUP_NAME "/non_existent_object"); - PART_ERROR_API(H5Oexists_by_name_dangling_soft_link); + PART_ERROR(H5Oexists_by_name_dangling_soft_link); } if (object_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" object pointed to by dangling soft link should not have existed!\n"); - PART_ERROR_API(H5Oexists_by_name_dangling_soft_link); + PART_ERROR(H5Oexists_by_name_dangling_soft_link); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_dangling_soft_link); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -1031,7 +1031,7 @@ test_object_exists(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1069,28 +1069,28 @@ test_object_exists_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or object aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_EXISTS_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; @@ -1098,7 +1098,7 @@ test_object_exists_invalid_params(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_EXISTS_INVALID_PARAMS_TEST_GRP_NAME); goto error; } @@ -1106,13 +1106,13 @@ test_object_exists_invalid_params(void) if (H5Gclose(group_id2) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Oexists_by_name_invalid_loc_id) { - TESTING_2_API("H5Oexists_by_name with an invalid location ID"); + TESTING_2("H5Oexists_by_name with an invalid location ID"); H5E_BEGIN_TRY { @@ -1122,18 +1122,18 @@ test_object_exists_invalid_params(void) H5E_END_TRY if (object_exists >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oexists_by_name succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Oexists_by_name_invalid_loc_id); + PART_ERROR(H5Oexists_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_invalid_loc_id); PART_BEGIN(H5Oexists_by_name_invalid_obj_name) { - TESTING_2_API("H5Oexists_by_name with an invalid object name"); + TESTING_2("H5Oexists_by_name with an invalid object name"); H5E_BEGIN_TRY { @@ -1142,9 +1142,9 @@ test_object_exists_invalid_params(void) H5E_END_TRY if (object_exists >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oexists_by_name succeeded with a NULL object name!\n"); - PART_ERROR_API(H5Oexists_by_name_invalid_obj_name); + PART_ERROR(H5Oexists_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -1154,18 +1154,18 @@ test_object_exists_invalid_params(void) H5E_END_TRY if (object_exists >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oexists_by_name succeeded with an invalid object name of ''!\n"); - PART_ERROR_API(H5Oexists_by_name_invalid_obj_name); + PART_ERROR(H5Oexists_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_invalid_obj_name); PART_BEGIN(H5Oexists_by_name_invalid_lapl) { - TESTING_2_API("H5Oexists_by_name with an invalid LAPL"); + TESTING_2("H5Oexists_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -1175,18 +1175,18 @@ test_object_exists_invalid_params(void) H5E_END_TRY if (object_exists >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oexists_by_name succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Oexists_by_name_invalid_lapl); + PART_ERROR(H5Oexists_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Oexists_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -1195,7 +1195,7 @@ test_object_exists_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1218,9 +1218,9 @@ test_object_exists_invalid_params(void) static int test_get_object_info(void) { - TESTING_API("object info retrieval"); + TESTING("object info retrieval"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -1233,9 +1233,9 @@ test_get_object_info(void) static int test_get_object_info_invalid_params(void) { - TESTING_API("object info retrieval with invalid parameters"); + TESTING("object info retrieval with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -1260,29 +1260,29 @@ test_link_object(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, dataset, or stored datatype aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME); goto error; } @@ -1293,73 +1293,73 @@ test_link_object(void) if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Olink_group) { - TESTING_2_API("H5Olink an anonymous group"); + TESTING_2("H5Olink an anonymous group"); if ((group_id2 = H5Gcreate_anon(group_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create an anonymous group\n"); - PART_ERROR_API(H5Olink_group); + PART_ERROR(H5Olink_group); } if (H5Olink(group_id2, group_id, OBJECT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't link the anonymous group\n"); - PART_ERROR_API(H5Olink_group); + PART_ERROR(H5Olink_group); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_group); PART_BEGIN(H5Olink_dataset) { - TESTING_2_API("H5Olink an anonymous dataset"); + TESTING_2("H5Olink an anonymous dataset"); if ((dset_id = H5Dcreate_anon(group_id, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create an anonymous dataset\n"); - PART_ERROR_API(H5Olink_dataset); + PART_ERROR(H5Olink_dataset); } if (H5Olink(dset_id, group_id, OBJECT_LINK_TEST_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't link the anonymous dataset\n"); - PART_ERROR_API(H5Olink_dataset); + PART_ERROR(H5Olink_dataset); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_dataset); PART_BEGIN(H5Olink_datatype) { - TESTING_2_API("H5Olink an anonymous datatype"); + TESTING_2("H5Olink an anonymous datatype"); if (H5Tcommit_anon(group_id, dset_dtype, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create an anonymous datatype\n"); - PART_ERROR_API(H5Olink_datatype); + PART_ERROR(H5Olink_datatype); } if (H5Olink(dset_dtype, group_id, OBJECT_LINK_TEST_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't link the anonymous datatype\n"); - PART_ERROR_API(H5Olink_datatype); + PART_ERROR(H5Olink_datatype); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_datatype); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -1376,7 +1376,7 @@ test_link_object(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1415,45 +1415,45 @@ test_link_object_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or object aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_LINK_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_LINK_TEST_GROUP_NAME); goto error; } if ((group_id2 = H5Gcreate_anon(group_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create an anonymous group\n"); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Olink_invalid_object_id) { - TESTING_2_API("H5Olink with an invalid object ID"); + TESTING_2("H5Olink with an invalid object ID"); H5E_BEGIN_TRY { @@ -1463,18 +1463,18 @@ test_link_object_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Olink succeeded with an invalid object ID!\n"); - PART_ERROR_API(H5Olink_invalid_object_id); + PART_ERROR(H5Olink_invalid_object_id); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_invalid_object_id); PART_BEGIN(H5Olink_invalid_location) { - TESTING_2_API("H5Olink with an invalid location ID"); + TESTING_2("H5Olink with an invalid location ID"); H5E_BEGIN_TRY { @@ -1484,18 +1484,18 @@ test_link_object_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Olink succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Olink_invalid_location); + PART_ERROR(H5Olink_invalid_location); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_invalid_location); PART_BEGIN(H5Olink_invalid_name) { - TESTING_2_API("H5Olink with an invalid name"); + TESTING_2("H5Olink with an invalid name"); H5E_BEGIN_TRY { @@ -1504,9 +1504,9 @@ test_link_object_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Olink succeeded with NULL as the object name!\n"); - PART_ERROR_API(H5Olink_invalid_name); + PART_ERROR(H5Olink_invalid_name); } H5E_BEGIN_TRY @@ -1516,18 +1516,18 @@ test_link_object_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Olink succeeded with an invalid object name of ''!\n"); - PART_ERROR_API(H5Olink_invalid_name); + PART_ERROR(H5Olink_invalid_name); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_invalid_name); PART_BEGIN(H5Olink_invalid_lcpl) { - TESTING_2_API("H5Olink with an invalid LCPL"); + TESTING_2("H5Olink with an invalid LCPL"); H5E_BEGIN_TRY { @@ -1537,18 +1537,18 @@ test_link_object_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Olink succeeded with an invalid LCPL!\n"); - PART_ERROR_API(H5Olink_invalid_lcpl); + PART_ERROR(H5Olink_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_invalid_lcpl); PART_BEGIN(H5Olink_invalid_lapl) { - TESTING_2_API("H5Olink with an invalid LAPL"); + TESTING_2("H5Olink with an invalid LAPL"); H5E_BEGIN_TRY { @@ -1558,18 +1558,18 @@ test_link_object_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Olink succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Olink_invalid_lapl); + PART_ERROR(H5Olink_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Olink_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id) < 0) TEST_ERROR; @@ -1580,7 +1580,7 @@ test_link_object_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1618,29 +1618,29 @@ test_incr_decr_object_refcount(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, dataset, stored datatype, or object " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_REF_COUNT_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_REF_COUNT_TEST_SUBGROUP_NAME); goto error; } @@ -1651,220 +1651,220 @@ test_incr_decr_object_refcount(void) if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Oincr_decr_refcount_group) { - TESTING_2_API("H5Oincr_refcount/H5Odecr_refcount on a group"); + TESTING_2("H5Oincr_refcount/H5Odecr_refcount on a group"); if ((group_id2 = H5Gcreate2(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_REF_COUNT_TEST_GRP_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } /* Increment the reference count */ if (H5Oincr_refcount(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't increment reference count for the group '%s' \n", OBJECT_REF_COUNT_TEST_GRP_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } /* Verify that reference count is 2 now */ if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get reference count for the group '%s' \n", OBJECT_REF_COUNT_TEST_GRP_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } if (oinfo.rc != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" the reference count for the group '%s' isn't 2: %d\n", OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } /* Decrement the reference count */ if (H5Odecr_refcount(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't decrement reference count for the group '%s' \n", OBJECT_REF_COUNT_TEST_GRP_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } /* Verify that reference count is 1 now */ if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_GRP_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get reference count for the group '%s' \n", OBJECT_REF_COUNT_TEST_GRP_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } if (oinfo.rc != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" the reference count for the group '%s' isn't 1: %d\n", OBJECT_REF_COUNT_TEST_GRP_NAME, oinfo.rc); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } if (H5Gclose(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group\n"); - PART_ERROR_API(H5Oincr_decr_refcount_group); + PART_ERROR(H5Oincr_decr_refcount_group); } - PASSED_API(); + PASSED(); } PART_END(H5Oincr_decr_refcount_group); PART_BEGIN(H5Oincr_decr_refcount_dset) { - TESTING_2_API("H5Oincr_refcount/H5Odecr_refcount on a dataset"); + TESTING_2("H5Oincr_refcount/H5Odecr_refcount on a dataset"); if ((dset_id = H5Dcreate2(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_REF_COUNT_TEST_DSET_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } /* Increment the reference count */ if (H5Oincr_refcount(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't increment reference count for the dataset '%s' \n", OBJECT_REF_COUNT_TEST_DSET_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } /* Verify that reference count is 2 now */ if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get reference count for the dataset '%s' \n", OBJECT_REF_COUNT_TEST_DSET_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } if (oinfo.rc != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" the reference count for the dataset '%s' isn't 2: %d\n", OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } /* Decrement the reference count */ if (H5Odecr_refcount(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't decrement reference count for the dataset '%s' \n", OBJECT_REF_COUNT_TEST_DSET_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } /* Verify that reference count is 1 now */ if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_DSET_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get reference count for the dataset '%s' \n", OBJECT_REF_COUNT_TEST_DSET_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } if (oinfo.rc != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" the reference count for the dataset '%s' isn't 1: %d\n", OBJECT_REF_COUNT_TEST_DSET_NAME, oinfo.rc); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } if (H5Dclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close dataset\n"); - PART_ERROR_API(H5Oincr_decr_refcount_dset); + PART_ERROR(H5Oincr_decr_refcount_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Oincr_decr_refcount_dset); PART_BEGIN(H5Oincr / decr_refcount_dtype) { - TESTING_2_API("H5Oincr_refcount/H5Odecr_refcount on a committed datatype"); + TESTING_2("H5Oincr_refcount/H5Odecr_refcount on a committed datatype"); if (H5Tcommit2(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, dset_dtype, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_REF_COUNT_TEST_TYPE_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } /* Increment the reference count */ if (H5Oincr_refcount(dset_dtype) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't increment reference count for the datatype '%s' \n", OBJECT_REF_COUNT_TEST_TYPE_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } /* Verify that reference count is 2 now */ if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get reference count for the datatype '%s' \n", OBJECT_REF_COUNT_TEST_TYPE_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } if (oinfo.rc != 2) { - H5_FAILED_API(); + H5_FAILED(); printf(" the reference count for the datatype '%s' isn't 2: %d\n", OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } /* Decrement the reference count */ if (H5Odecr_refcount(dset_dtype) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't decrement reference count for the datatype '%s' \n", OBJECT_REF_COUNT_TEST_TYPE_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } /* Verify that reference count is 1 now */ if (H5Oget_info_by_name3(group_id, OBJECT_REF_COUNT_TEST_TYPE_NAME, &oinfo, H5O_INFO_BASIC, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't get reference count for the datatype '%s' \n", OBJECT_REF_COUNT_TEST_TYPE_NAME); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } if (oinfo.rc != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" the reference count for the datatype '%s' isn't 1: %d\n", OBJECT_REF_COUNT_TEST_TYPE_NAME, oinfo.rc); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } if (H5Tclose(dset_dtype) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close datatype\n"); - PART_ERROR_API(H5Oincr_decr_refcount_dtype); + PART_ERROR(H5Oincr_decr_refcount_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Oincr_decr_refcount_dtype); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -1875,7 +1875,7 @@ test_incr_decr_object_refcount(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -1908,7 +1908,7 @@ test_incr_decr_object_refcount_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for more object aren't supported with this connector\n"); return 0; } @@ -1917,7 +1917,7 @@ test_incr_decr_object_refcount_invalid_params(void) { PART_BEGIN(H5Oincr_refcount_invalid_param) { - TESTING_2_API("H5Oincr_refcount with invalid object ID"); + TESTING_2("H5Oincr_refcount with invalid object ID"); H5E_BEGIN_TRY { @@ -1926,18 +1926,18 @@ test_incr_decr_object_refcount_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" incremented the reference count for an invalid object ID\n"); - PART_ERROR_API(H5Oincr_refcount_invalid_param); + PART_ERROR(H5Oincr_refcount_invalid_param); } - PASSED_API(); + PASSED(); } PART_END(H5Oincr_refcount_invalid_param); PART_BEGIN(H5Odecr_refcount_invalid_param) { - TESTING_2_API("H5Odecr_refcount with invalid object ID"); + TESTING_2("H5Odecr_refcount with invalid object ID"); H5E_BEGIN_TRY { @@ -1946,12 +1946,12 @@ test_incr_decr_object_refcount_invalid_params(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" decremented the reference count for an invalid object ID\n"); - PART_ERROR_API(H5Odecr_refcount_invalid_param); + PART_ERROR(H5Odecr_refcount_invalid_param); } - PASSED_API(); + PASSED(); } PART_END(H5Odecr_refcount_invalid_param); } @@ -1995,29 +1995,29 @@ test_object_copy_basic(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, link, dataset, attribute, iterate, or " "stored datatype aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_BASIC_TEST_SUBGROUP_NAME); goto error; } @@ -2033,7 +2033,7 @@ test_object_copy_basic(void) /* Create the test group object, along with its nested members and the attributes attached to it. */ if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_BASIC_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME); goto error; } @@ -2044,7 +2044,7 @@ test_object_copy_basic(void) snprintf(grp_name, OBJECT_COPY_BASIC_TEST_BUF_SIZE, "grp%d", (int)i); if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s' under group '%s'\n", grp_name, OBJECT_COPY_BASIC_TEST_GROUP_NAME); goto error; @@ -2054,7 +2054,7 @@ test_object_copy_basic(void) if (i == (OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS - 1)) { if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create nested group '%s' under group '%s'\n", OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; @@ -2062,7 +2062,7 @@ test_object_copy_basic(void) } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", grp_name); goto error; } @@ -2075,14 +2075,14 @@ test_object_copy_basic(void) if ((tmp_attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, OBJECT_COPY_BASIC_TEST_GROUP_NAME); goto error; } if (H5Aclose(tmp_attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } @@ -2091,7 +2091,7 @@ test_object_copy_basic(void) /* Create the test dataset object, along with the attributes attached to it. */ if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_BASIC_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME); goto error; } @@ -2103,14 +2103,14 @@ test_object_copy_basic(void) if ((tmp_attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, OBJECT_COPY_BASIC_TEST_DSET_NAME); goto error; } if (H5Aclose(tmp_attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } @@ -2118,14 +2118,14 @@ test_object_copy_basic(void) /* Create the test committed datatype object, along with the attributes attached to it. */ if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_BASIC_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME); goto error; } @@ -2137,55 +2137,55 @@ test_object_copy_basic(void) if ((tmp_attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, OBJECT_COPY_BASIC_TEST_DTYPE_NAME); goto error; } if (H5Aclose(tmp_attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ocopy_group) { - TESTING_2_API("H5Ocopy on a group (default copy options)"); + TESTING_2("H5Ocopy on a group (default copy options)"); if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_GROUP_NAME, group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_GROUP_NAME, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied group exists\n", OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } /* Ensure that the new group has all the members of the copied group, and all its attributes */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } memset(&group_info, 0, sizeof(group_info)); @@ -2197,16 +2197,16 @@ test_object_copy_basic(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if (group_info.nlinks != OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group contained %d members instead of %d members after a deep copy!\n", (int)group_info.nlinks, OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } memset(&object_info, 0, sizeof(object_info)); @@ -2218,38 +2218,38 @@ test_object_copy_basic(void) object_info.num_attrs = 0; if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if (object_info.num_attrs == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group didn't contain any attributes after copy operation!\n"); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } /* Check the attribute names, types, etc. */ i = 0; if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over copied group's attributes\n"); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf( " number of attributes on copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group copy\n"); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } /* @@ -2264,9 +2264,9 @@ test_object_copy_basic(void) OBJECT_COPY_BASIC_TEST_NUM_NESTED_OBJS - 1); if ((tmp_group_id = H5Gopen2(group_id, grp_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group '%s'\n", OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } memset(&group_info, 0, sizeof(group_info)); @@ -2278,26 +2278,26 @@ test_object_copy_basic(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if (group_info.nlinks != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group's immediate members didn't contain nested members after a " "deep copy!\n"); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", OBJECT_COPY_BASIC_TEST_DEEP_NESTED_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group); + PART_ERROR(H5Ocopy_group); } } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_group); @@ -2312,36 +2312,36 @@ test_object_copy_basic(void) PART_BEGIN(H5Ocopy_dset) { - TESTING_2_API("H5Ocopy on a dataset (default copy options)"); + TESTING_2("H5Ocopy on a dataset (default copy options)"); if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_DSET_NAME, group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DSET_NAME, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied dataset exists\n", OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied dataset didn't exist!\n", OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } /* Ensure that the new dataset has all of the attributes of the copied dataset */ if ((tmp_dset_id = H5Dopen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } memset(&object_info, 0, sizeof(object_info)); @@ -2353,41 +2353,41 @@ test_object_copy_basic(void) object_info.num_attrs = 0; if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } if (object_info.num_attrs == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied dataset didn't contain any attributes after copy operation!\n"); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } /* Check the attribute names, types, etc. */ i = 0; if (H5Aiterate2(tmp_dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over copied dataset's attributes\n"); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of attributes on copied dataset (%llu) didn't match expected number " "(%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } if (H5Dclose(tmp_dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close dataset copy\n"); - PART_ERROR_API(H5Ocopy_dset); + PART_ERROR(H5Ocopy_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_dset); @@ -2402,36 +2402,36 @@ test_object_copy_basic(void) PART_BEGIN(H5Ocopy_dtype) { - TESTING_2_API("H5Ocopy on a committed datatype (default copy options)"); + TESTING_2("H5Ocopy on a committed datatype (default copy options)"); if (H5Ocopy(group_id, OBJECT_COPY_BASIC_TEST_DTYPE_NAME, group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_BASIC_TEST_DTYPE_NAME, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied datatype exists\n", OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied datatype didn't exist!\n", OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } /* Ensure that the new committed datatype has all the attributes of the copied datatype */ if ((tmp_dtype_id = H5Topen2(group_id, OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open datatype copy '%s'\n", OBJECT_COPY_BASIC_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } memset(&object_info, 0, sizeof(object_info)); @@ -2443,41 +2443,41 @@ test_object_copy_basic(void) object_info.num_attrs = 0; if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } if (object_info.num_attrs == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied committed datatype didn't contain any attributes after copy operation!\n"); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } /* Check the attribute names, types, etc. */ i = 0; if (H5Aiterate2(tmp_dtype_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over copied datatype's attributes\n"); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } if (i != OBJECT_COPY_BASIC_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of attributes on copied datatype (%llu) didn't match expected number " "(%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BASIC_TEST_NUM_ATTRS); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } if (H5Tclose(tmp_dtype_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close datatype copy\n"); - PART_ERROR_API(H5Ocopy_dtype); + PART_ERROR(H5Ocopy_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_dtype); @@ -2492,7 +2492,7 @@ test_object_copy_basic(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -2513,7 +2513,7 @@ test_object_copy_basic(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2563,29 +2563,29 @@ test_object_copy_already_existing(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, dataset, or stored datatype aren't " "supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_SUBGROUP_NAME); goto error; @@ -2600,7 +2600,7 @@ test_object_copy_already_existing(void) /* Create the test group object */ if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_GROUP_NAME); goto error; } @@ -2608,32 +2608,32 @@ test_object_copy_already_existing(void) /* Create the test dataset object */ if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DSET_NAME); goto error; } /* Create the test committed datatype object */ if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_ALREADY_EXISTING_TEST_DTYPE_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ocopy_already_existing_group) { - TESTING_2_API("H5Ocopy group to location where group already exists"); + TESTING_2("H5Ocopy group to location where group already exists"); H5E_BEGIN_TRY { @@ -2643,18 +2643,18 @@ test_object_copy_already_existing(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" group copy succeeded in location where group already exists!\n"); - PART_ERROR_API(H5Ocopy_already_existing_group); + PART_ERROR(H5Ocopy_already_existing_group); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_already_existing_group); PART_BEGIN(H5Ocopy_already_existing_dset) { - TESTING_2_API("H5Ocopy dataset to location where dataset already exists"); + TESTING_2("H5Ocopy dataset to location where dataset already exists"); H5E_BEGIN_TRY { @@ -2664,18 +2664,18 @@ test_object_copy_already_existing(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" dataset copy succeeded in location where dataset already exists!\n"); - PART_ERROR_API(H5Ocopy_already_existing_dset); + PART_ERROR(H5Ocopy_already_existing_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_already_existing_dset); PART_BEGIN(H5Ocopy_already_existing_dtype) { - TESTING_2_API("H5Ocopy committed datatype to location where committed datatype already exists"); + TESTING_2("H5Ocopy committed datatype to location where committed datatype already exists"); H5E_BEGIN_TRY { @@ -2685,19 +2685,19 @@ test_object_copy_already_existing(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" committed datatype copy succeeded in location where committed datatype already " "exists!\n"); - PART_ERROR_API(H5Ocopy_already_existing_dtype); + PART_ERROR(H5Ocopy_already_existing_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_already_existing_dtype); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(space_id) < 0) TEST_ERROR; @@ -2716,7 +2716,7 @@ test_object_copy_already_existing(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2754,33 +2754,33 @@ test_object_copy_shallow_group_copy(void) hid_t tmp_group_id = H5I_INVALID_HID; hid_t ocpypl_id = H5I_INVALID_HID; - TESTING_API("object copying with H5O_COPY_SHALLOW_HIERARCHY_FLAG flag"); + TESTING("object copying with H5O_COPY_SHALLOW_HIERARCHY_FLAG flag"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, or link aren't supported with this " "connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_SHALLOW_TEST_SUBGROUP_NAME); goto error; } @@ -2788,7 +2788,7 @@ test_object_copy_shallow_group_copy(void) /* Create the test group object, along with its nested members. */ if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME); goto error; } @@ -2799,7 +2799,7 @@ test_object_copy_shallow_group_copy(void) snprintf(grp_name, OBJECT_COPY_SHALLOW_TEST_BUF_SIZE, "grp%d", (int)i); if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s' under group '%s'\n", grp_name, OBJECT_COPY_SHALLOW_TEST_GROUP_NAME); goto error; @@ -2809,7 +2809,7 @@ test_object_copy_shallow_group_copy(void) if (i == (OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS - 1)) { if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create nested group '%s' under group '%s'\n", OBJECT_COPY_SHALLOW_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; @@ -2817,27 +2817,27 @@ test_object_copy_shallow_group_copy(void) } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", grp_name); goto error; } } if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create OCopyPL\n"); goto error; } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_SHALLOW_HIERARCHY_FLAG) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set object copying options\n"); goto error; } if (H5Ocopy(group_id, OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_SHALLOW_TEST_GROUP_NAME, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; @@ -2845,14 +2845,14 @@ test_object_copy_shallow_group_copy(void) if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied group exists\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; } @@ -2861,7 +2861,7 @@ test_object_copy_shallow_group_copy(void) * Ensure that the new group has only the immediate members of the copied group. */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group copy '%s'\n", OBJECT_COPY_SHALLOW_TEST_NEW_GROUP_NAME); goto error; } @@ -2875,13 +2875,13 @@ test_object_copy_shallow_group_copy(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); goto error; } if (group_info.nlinks != OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group contained %d members instead of %d members after a shallow copy!\n", (int)group_info.nlinks, OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS); goto error; @@ -2902,7 +2902,7 @@ test_object_copy_shallow_group_copy(void) OBJECT_COPY_SHALLOW_TEST_NUM_NESTED_OBJS - 1); if ((tmp_group_id = H5Gopen2(group_id, grp_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group '%s'\n", grp_name); goto error; } @@ -2916,19 +2916,19 @@ test_object_copy_shallow_group_copy(void) group_info.nlinks = 1; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); goto error; } if (group_info.nlinks != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group's immediate members contained nested members after a shallow copy!\n"); goto error; } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", grp_name); goto error; } @@ -2945,7 +2945,7 @@ test_object_copy_shallow_group_copy(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -2997,29 +2997,29 @@ test_object_copy_no_attributes(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, link, dataset, attribute, or stored " "datatype aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_SUBGROUP_NAME); goto error; } @@ -3036,7 +3036,7 @@ test_object_copy_no_attributes(void) /* Create the test group object, along with the attributes attached to it. */ if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME); goto error; } @@ -3048,14 +3048,14 @@ test_object_copy_no_attributes(void) if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } @@ -3064,7 +3064,7 @@ test_object_copy_no_attributes(void) /* Create the test dataset object, along with the attributes attached to it. */ if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME); goto error; } @@ -3076,14 +3076,14 @@ test_object_copy_no_attributes(void) if ((attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } @@ -3091,14 +3091,14 @@ test_object_copy_no_attributes(void) /* Create the test committed datatype object, along with the attributes attached to it. */ if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME); goto error; } @@ -3110,68 +3110,68 @@ test_object_copy_no_attributes(void) if ((attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ocopy_group_no_attributes) { - TESTING_2_API("H5Ocopy on a group (without attributes)"); + TESTING_2("H5Ocopy on a group (without attributes)"); if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create OCopyPL\n"); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set object copying options\n"); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_GROUP_NAME, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied group exists\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } /* Ensure that the new group has no attributes */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } memset(&object_info, 0, sizeof(object_info)); @@ -3183,30 +3183,30 @@ test_object_copy_no_attributes(void) object_info.num_attrs = 1; if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } if (object_info.num_attrs != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group contained attributes after a non-attribute copy!\n"); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Pclose(ocpypl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close OCopyPL\n"); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group copy\n"); - PART_ERROR_API(H5Ocopy_group_no_attributes); + PART_ERROR(H5Ocopy_group_no_attributes); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_group_no_attributes); @@ -3229,49 +3229,49 @@ test_object_copy_no_attributes(void) PART_BEGIN(H5Ocopy_dset_no_attributes) { - TESTING_2_API("H5Ocopy on a dataset (without attributes)"); + TESTING_2("H5Ocopy on a dataset (without attributes)"); if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create OCopyPL\n"); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set object copying options\n"); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, ocpypl_id, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy dataset '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DSET_NAME, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied dataset exists\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied dataset didn't exist!\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } /* Ensure that the new dataset doesn't have any attributes */ if ((tmp_dset_id = H5Dopen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } memset(&object_info, 0, sizeof(object_info)); @@ -3283,30 +3283,30 @@ test_object_copy_no_attributes(void) object_info.num_attrs = 1; if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } if (object_info.num_attrs != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied dataset contained attributes after a non-attribute copy!\n"); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Pclose(ocpypl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close OCopyPL\n"); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } if (H5Dclose(tmp_dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close dataset copy\n"); - PART_ERROR_API(H5Ocopy_dset_no_attributes); + PART_ERROR(H5Ocopy_dset_no_attributes); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_dset_no_attributes); @@ -3329,49 +3329,49 @@ test_object_copy_no_attributes(void) PART_BEGIN(H5Ocopy_dtype_no_attributes) { - TESTING_2_API("H5Ocopy on a committed datatype (without attributes)"); + TESTING_2("H5Ocopy on a committed datatype (without attributes)"); if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create OCopyPL\n"); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_WITHOUT_ATTR_FLAG) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set object copying options\n"); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Ocopy(group_id, OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, ocpypl_id, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy datatype '%s' to '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_DTYPE_NAME, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied datatype exists\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied datatype didn't exist!\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } /* Ensure that the new committed datatype doesn't have any attributes */ if ((tmp_dtype_id = H5Topen2(group_id, OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset copy '%s'\n", OBJECT_COPY_NO_ATTRS_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } memset(&object_info, 0, sizeof(object_info)); @@ -3383,30 +3383,30 @@ test_object_copy_no_attributes(void) object_info.num_attrs = 1; if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } if (object_info.num_attrs != 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied committed datatype contained attributes after a non-attribute copy!\n"); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Pclose(ocpypl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close OCopyPL\n"); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } if (H5Tclose(tmp_dtype_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close datatype copy\n"); - PART_ERROR_API(H5Ocopy_dtype_no_attributes); + PART_ERROR(H5Ocopy_dtype_no_attributes); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_dtype_no_attributes); @@ -3429,7 +3429,7 @@ test_object_copy_no_attributes(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -3450,7 +3450,7 @@ test_object_copy_no_attributes(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3505,29 +3505,29 @@ test_object_copy_by_soft_link(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, link, dataset, attribute, iterate, or " "soft link aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME); goto error; } @@ -3539,7 +3539,7 @@ test_object_copy_by_soft_link(void) /* Create the test group object, along with its nested members and the attributes attached to it. */ if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); goto error; } @@ -3550,7 +3550,7 @@ test_object_copy_by_soft_link(void) snprintf(grp_name, OBJECT_COPY_SOFT_LINK_TEST_BUF_SIZE, "grp%d", (int)i); if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s' under group '%s'\n", grp_name, OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); goto error; @@ -3560,7 +3560,7 @@ test_object_copy_by_soft_link(void) if (i == (OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS - 1)) { if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create nested group '%s' under group '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; @@ -3568,7 +3568,7 @@ test_object_copy_by_soft_link(void) } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", grp_name); goto error; } @@ -3581,75 +3581,75 @@ test_object_copy_by_soft_link(void) if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ocopy_through_soft_link) { - TESTING_2_API("H5Ocopy through use of a soft link"); + TESTING_2("H5Ocopy through use of a soft link"); if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME "/" OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME, group_id, OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s' to group for copying\n", OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if (H5Ocopy(group_id, OBJECT_COPY_SOFT_LINK_TEST_SOFT_LINK_NAME, group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_GROUP_NAME, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied group exists\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } /* Make sure the new object is an actual group and not another soft link */ memset(&link_info, 0, sizeof(link_info)); if (H5Lget_info2(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, &link_info, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve info for link '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if (link_info.type != H5L_TYPE_HARD) { - H5_FAILED_API(); + H5_FAILED(); printf( " after group copy through soft link, group's new link type wasn't H5L_TYPE_HARD!\n"); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } /* @@ -3658,9 +3658,9 @@ test_object_copy_by_soft_link(void) */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group copy '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } memset(&group_info, 0, sizeof(group_info)); @@ -3672,16 +3672,16 @@ test_object_copy_by_soft_link(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if (group_info.nlinks != OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group contained %d members instead of %d members after a shallow copy!\n", (int)group_info.nlinks, OBJECT_COPY_SOFT_LINK_TEST_NUM_NESTED_OBJS); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } memset(&object_info, 0, sizeof(object_info)); @@ -3693,41 +3693,41 @@ test_object_copy_by_soft_link(void) object_info.num_attrs = 0; if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if (object_info.num_attrs == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group didn't contain any attributes after copy operation!\n"); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } /* Check the attribute names, types, etc. */ i = 0; if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over copied group's attributes\n"); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if (i != OBJECT_COPY_SOFT_LINK_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf( " number of attributes on copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_SOFT_LINK_TEST_NUM_ATTRS); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group copy\n"); - PART_ERROR_API(H5Ocopy_through_soft_link); + PART_ERROR(H5Ocopy_through_soft_link); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_through_soft_link); @@ -3744,16 +3744,16 @@ test_object_copy_by_soft_link(void) { herr_t err_ret; - TESTING_2_API("H5Ocopy through use of a dangling soft link"); + TESTING_2("H5Ocopy through use of a dangling soft link"); if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_COPY_SOFT_LINK_TEST_SUBGROUP_NAME "/nonexistent_object", group_id, OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create dangling soft link '%s'\n", OBJECT_COPY_SOFT_LINK_TEST_DANGLING_LINK_NAME); - PART_ERROR_API(H5Ocopy_through_dangling_soft_link); + PART_ERROR(H5Ocopy_through_dangling_soft_link); } H5E_BEGIN_TRY @@ -3765,18 +3765,18 @@ test_object_copy_by_soft_link(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied non-existent object through use of a dangling soft link!\n"); - PART_ERROR_API(H5Ocopy_through_dangling_soft_link); + PART_ERROR(H5Ocopy_through_dangling_soft_link); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_through_dangling_soft_link); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -3789,7 +3789,7 @@ test_object_copy_by_soft_link(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -3834,30 +3834,30 @@ test_object_copy_group_with_soft_links(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_LINK_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, link, iterate, or soft link aren't " "supported with " "this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME); goto error; @@ -3866,7 +3866,7 @@ test_object_copy_group_with_soft_links(void) /* Create the test group object. */ if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME); goto error; } @@ -3886,67 +3886,67 @@ test_object_copy_group_with_soft_links(void) grp_name); if ((tmp_group_id = H5Gcreate2(group_id, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s' under group '%s'\n", grp_name, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_SUBGROUP_NAME); goto error; } if (H5Lcreate_soft(lnk_target, group_id2, lnk_name, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to create soft link '%s'\n", lnk_name); goto error; } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", grp_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ocopy_dont_expand_soft_links) { - TESTING_2_API("H5Ocopy on group with soft links (soft links not expanded)"); + TESTING_2("H5Ocopy on group with soft links (soft links not expanded)"); if (H5Ocopy(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } if ((object_link_exists = H5Lexists(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied group exists\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } /* Ensure that the number of links is the same */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group copy '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } memset(&group_info, 0, sizeof(group_info)); @@ -3958,16 +3958,16 @@ test_object_copy_group_with_soft_links(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (group_info.nlinks != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group contained %d members instead of %d members after copy!\n", (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } /* @@ -3977,27 +3977,27 @@ test_object_copy_group_with_soft_links(void) i = 0; if (H5Literate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_soft_link_non_expand_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over links in group '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NON_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (i != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of links in copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group copy\n"); - PART_ERROR_API(H5Ocopy_dont_expand_soft_links); + PART_ERROR(H5Ocopy_dont_expand_soft_links); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_dont_expand_soft_links); @@ -4012,52 +4012,52 @@ test_object_copy_group_with_soft_links(void) PART_BEGIN(H5Ocopy_expand_soft_links) { - TESTING_2_API("H5Ocopy on group with soft links (soft links expanded)"); + TESTING_2("H5Ocopy on group with soft links (soft links expanded)"); if ((ocpypl_id = H5Pcreate(H5P_OBJECT_COPY)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create OCopyPL\n"); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if (H5Pset_copy_object(ocpypl_id, H5O_COPY_EXPAND_SOFT_LINK_FLAG) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set object copying options\n"); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if (H5Ocopy(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, ocpypl_id, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy group '%s' to '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_GROUP_NAME, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if ((object_link_exists = H5Lexists( group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied group exists\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied group didn't exist!\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } /* Ensure that the number of links is the same */ if ((tmp_group_id = H5Gopen2(group_id, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group copy '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } memset(&group_info, 0, sizeof(group_info)); @@ -4069,16 +4069,16 @@ test_object_copy_group_with_soft_links(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if (group_info.nlinks != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group contained %d members instead of %d members after copy!\n", (int)group_info.nlinks, OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } /* @@ -4089,33 +4089,33 @@ test_object_copy_group_with_soft_links(void) i = 0; if (H5Literate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_soft_link_expand_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over links in group '%s'\n", OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_EXPAND_GROUP_NAME); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if (i != OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of links in copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_GROUP_WITH_SOFT_LINKS_TEST_NUM_NESTED_OBJS); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if (H5Pclose(ocpypl_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close OCopyPL\n"); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group copy\n"); - PART_ERROR_API(H5Ocopy_expand_soft_links); + PART_ERROR(H5Ocopy_expand_soft_links); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_expand_soft_links); @@ -4138,7 +4138,7 @@ test_object_copy_group_with_soft_links(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id2) < 0) TEST_ERROR; @@ -4149,7 +4149,7 @@ test_object_copy_group_with_soft_links(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -4205,44 +4205,44 @@ test_object_copy_between_files(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_MORE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, link, dataset, attribute, stored " "datatype, or iterate aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); /* * Create the second file for the between file copying tests. */ if (prefix_filename(test_path_prefix, OBJECT_COPY_BETWEEN_FILES_TEST_FILE_NAME, &obj_copy_filename) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create filename for object copy test file\n"); goto error; } if ((file_id2 = H5Fcreate(obj_copy_filename, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_SUBGROUP_NAME); goto error; } @@ -4260,7 +4260,7 @@ test_object_copy_between_files(void) /* Create the test group object, along with its nested members and the attributes attached to it. */ if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); goto error; } @@ -4271,7 +4271,7 @@ test_object_copy_between_files(void) snprintf(grp_name, OBJECT_COPY_BETWEEN_FILES_TEST_BUF_SIZE, "grp%d", (int)i); if ((tmp_group_id = H5Gcreate2(group_id2, grp_name, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s' under group '%s'\n", grp_name, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); goto error; @@ -4281,7 +4281,7 @@ test_object_copy_between_files(void) if (i == (OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS - 1)) { if (H5Gclose(H5Gcreate2(tmp_group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create nested group '%s' under group '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DEEP_NESTED_GROUP_NAME, grp_name); goto error; @@ -4289,7 +4289,7 @@ test_object_copy_between_files(void) } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", grp_name); goto error; } @@ -4302,14 +4302,14 @@ test_object_copy_between_files(void) if ((attr_id = H5Acreate2(group_id2, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on group '%s'\n", attr_name, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } @@ -4318,7 +4318,7 @@ test_object_copy_between_files(void) /* Create the test dataset object, along with the attributes attached to it. */ if ((dset_id = H5Dcreate2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, dset_dtype, space_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME); goto error; } @@ -4330,14 +4330,14 @@ test_object_copy_between_files(void) if ((attr_id = H5Acreate2(dset_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on dataset '%s'\n", attr_name, OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } @@ -4345,14 +4345,14 @@ test_object_copy_between_files(void) /* Create the test committed datatype object, along with the attributes attached to it. */ if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype\n"); goto error; } if (H5Tcommit2(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME); goto error; } @@ -4364,57 +4364,57 @@ test_object_copy_between_files(void) if ((attr_id = H5Acreate2(dtype_id, attr_name, H5T_NATIVE_INT, attr_space_id, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create attribute '%s' on committed datatype '%s'\n", attr_name, OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME); goto error; } if (H5Aclose(attr_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close attribute '%s'\n", attr_name); goto error; } } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ocopy_group_between_files) { - TESTING_2_API("H5Ocopy on group between different files"); + TESTING_2("H5Ocopy on group between different files"); if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy group '%s' to second file '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_GROUP_NAME, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if ((object_link_exists = H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied group exists\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied group in second file '%s' didn't exist!\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, obj_copy_filename); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } /* Ensure that the new group has all the members of the copied group, and all its attributes */ if ((tmp_group_id = H5Gopen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group copy '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_GROUP_NAME); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } memset(&group_info, 0, sizeof(group_info)); @@ -4426,16 +4426,16 @@ test_object_copy_between_files(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if (group_info.nlinks != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group contained %d members instead of %d members after a deep copy!\n", (int)group_info.nlinks, OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } memset(&object_info, 0, sizeof(object_info)); @@ -4447,38 +4447,38 @@ test_object_copy_between_files(void) object_info.num_attrs = 0; if (H5Oget_info3(tmp_group_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if (object_info.num_attrs == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group didn't contain any attributes after copy operation!\n"); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } /* Check the attribute names, types, etc. */ i = 0; if (H5Aiterate2(tmp_group_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over copied group's attributes\n"); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf( " number of attributes on copied group (%llu) didn't match expected number (%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group copy\n"); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } /* @@ -4493,9 +4493,9 @@ test_object_copy_between_files(void) OBJECT_COPY_BETWEEN_FILES_TEST_NUM_NESTED_OBJS - 1); if ((tmp_group_id = H5Gopen2(file_id2, grp_name, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open group '%s'\n", grp_name); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } memset(&group_info, 0, sizeof(group_info)); @@ -4507,26 +4507,26 @@ test_object_copy_between_files(void) group_info.nlinks = 0; if (H5Gget_info(tmp_group_id, &group_info) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve group info\n"); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if (group_info.nlinks != 1) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied group's immediate members didn't contain nested members after a " "deep copy!\n"); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } if (H5Gclose(tmp_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close group '%s'\n", grp_name); - PART_ERROR_API(H5Ocopy_group_between_files); + PART_ERROR(H5Ocopy_group_between_files); } } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_group_between_files); @@ -4541,39 +4541,39 @@ test_object_copy_between_files(void) PART_BEGIN(H5Ocopy_dset_between_files) { - TESTING_2_API("H5Ocopy on dataset between different files"); + TESTING_2("H5Ocopy on dataset between different files"); if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy dataset '%s' to second file '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DSET_NAME, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } if ((object_link_exists = H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied dataset exists\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied dataset in second file '%s' didn't exist!\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, obj_copy_filename); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } /* Ensure that the new dataset has all the attributes of the copied dataset */ if ((tmp_dset_id = H5Dopen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open dataset copy '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DSET_NAME); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } memset(&object_info, 0, sizeof(object_info)); @@ -4585,41 +4585,41 @@ test_object_copy_between_files(void) object_info.num_attrs = 0; if (H5Oget_info3(tmp_dset_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } if (object_info.num_attrs == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied dataset didn't contain any attributes after copy operation!\n"); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } /* Check the attribute names, types, etc. */ i = 0; if (H5Aiterate2(tmp_dset_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over copied dataset's attributes\n"); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of attributes on copied dataset (%llu) didn't match expected number " "(%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } if (H5Dclose(tmp_dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close dataset copy\n"); - PART_ERROR_API(H5Ocopy_dset_between_files); + PART_ERROR(H5Ocopy_dset_between_files); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_dset_between_files); @@ -4634,40 +4634,40 @@ test_object_copy_between_files(void) PART_BEGIN(H5Ocopy_dtype_between_files) { - TESTING_2_API("H5Ocopy on committed datatype between different files"); + TESTING_2("H5Ocopy on committed datatype between different files"); if (H5Ocopy(group_id, OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to copy committed datatype '%s' to second file '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_DTYPE_NAME, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } if ((object_link_exists = H5Lexists(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't determine if link '%s' to copied committed datatype exists\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } if (!object_link_exists) { - H5_FAILED_API(); + H5_FAILED(); printf(" link '%s' to copied committed datatype in second file '%s' didn't exist!\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, obj_copy_filename); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } /* Ensure that the new committed datatype has all the attributes of the copied committed datatype */ if ((tmp_dtype_id = H5Topen2(file_id2, OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to open committed datatype copy '%s'\n", OBJECT_COPY_BETWEEN_FILES_TEST_NEW_DTYPE_NAME); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } memset(&object_info, 0, sizeof(object_info)); @@ -4679,41 +4679,41 @@ test_object_copy_between_files(void) object_info.num_attrs = 0; if (H5Oget_info3(tmp_dtype_id, &object_info, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to retrieve object info\n"); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } if (object_info.num_attrs == 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" copied committed datatype didn't contain any attributes after copy operation!\n"); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } /* Check the attribute names, types, etc. */ i = 0; if (H5Aiterate2(tmp_dtype_id, H5_INDEX_NAME, H5_ITER_INC, NULL, object_copy_attribute_iter_callback, &i) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to iterate over copied datatype's attributes\n"); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } if (i != OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS) { - H5_FAILED_API(); + H5_FAILED(); printf(" number of attributes on copied datatype (%llu) didn't match expected number " "(%llu)!\n", (unsigned long long)i, (unsigned long long)OBJECT_COPY_BETWEEN_FILES_TEST_NUM_ATTRS); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } if (H5Tclose(tmp_dtype_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" failed to close committed datatype copy\n"); - PART_ERROR_API(H5Ocopy_dtype_between_files); + PART_ERROR(H5Ocopy_dtype_between_files); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_dtype_between_files); @@ -4728,7 +4728,7 @@ test_object_copy_between_files(void) } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(attr_space_id) < 0) TEST_ERROR; @@ -4751,7 +4751,7 @@ test_object_copy_between_files(void) if (H5Fclose(file_id) < 0) TEST_ERROR; free(obj_copy_filename); - PASSED_API(); + PASSED(); return 0; @@ -4797,28 +4797,28 @@ test_object_copy_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_MORE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or object aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_COPY_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; @@ -4826,18 +4826,18 @@ test_object_copy_invalid_params(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_COPY_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ocopy_invalid_src_loc_id) { - TESTING_2_API("H5Ocopy with an invalid source location ID"); + TESTING_2("H5Ocopy with an invalid source location ID"); H5E_BEGIN_TRY { @@ -4847,18 +4847,18 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with an invalid source location ID!\n"); - PART_ERROR_API(H5Ocopy_invalid_src_loc_id); + PART_ERROR(H5Ocopy_invalid_src_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_invalid_src_loc_id); PART_BEGIN(H5Ocopy_invalid_src_obj_name) { - TESTING_2_API("H5Ocopy with an invalid source object name"); + TESTING_2("H5Ocopy with an invalid source object name"); H5E_BEGIN_TRY { @@ -4868,9 +4868,9 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with a NULL source object name!\n"); - PART_ERROR_API(H5Ocopy_invalid_src_obj_name); + PART_ERROR(H5Ocopy_invalid_src_obj_name); } H5E_BEGIN_TRY @@ -4881,18 +4881,18 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with an invalid source object name of ''!\n"); - PART_ERROR_API(H5Ocopy_invalid_src_obj_name); + PART_ERROR(H5Ocopy_invalid_src_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_invalid_src_obj_name); PART_BEGIN(H5Ocopy_invalid_dst_loc_id) { - TESTING_2_API("H5Ocopy with an invalid destination location ID"); + TESTING_2("H5Ocopy with an invalid destination location ID"); H5E_BEGIN_TRY { @@ -4902,18 +4902,18 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with an invalid destination location ID!\n"); - PART_ERROR_API(H5Ocopy_invalid_dst_loc_id); + PART_ERROR(H5Ocopy_invalid_dst_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_invalid_dst_loc_id); PART_BEGIN(H5Ocopy_invalid_dst_obj_name) { - TESTING_2_API("H5Ocopy with an invalid destination object name"); + TESTING_2("H5Ocopy with an invalid destination object name"); H5E_BEGIN_TRY { @@ -4923,9 +4923,9 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with a NULL destination object name!\n"); - PART_ERROR_API(H5Ocopy_invalid_dst_obj_name); + PART_ERROR(H5Ocopy_invalid_dst_obj_name); } H5E_BEGIN_TRY @@ -4936,18 +4936,18 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with an invalid destination object name of ''!\n"); - PART_ERROR_API(H5Ocopy_invalid_dst_obj_name); + PART_ERROR(H5Ocopy_invalid_dst_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_invalid_dst_obj_name); PART_BEGIN(H5Ocopy_invalid_ocpypl) { - TESTING_2_API("H5Ocopy with an invalid OcpyPL"); + TESTING_2("H5Ocopy with an invalid OcpyPL"); H5E_BEGIN_TRY { @@ -4957,18 +4957,18 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with an invalid OcpyPL!\n"); - PART_ERROR_API(H5Ocopy_invalid_ocpypl); + PART_ERROR(H5Ocopy_invalid_ocpypl); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_invalid_ocpypl); PART_BEGIN(H5Ocopy_invalid_lcpl) { - TESTING_2_API("H5Ocopy with an invalid LCPL"); + TESTING_2("H5Ocopy with an invalid LCPL"); H5E_BEGIN_TRY { @@ -4978,18 +4978,18 @@ test_object_copy_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ocopy succeeded with an invalid LCPL!\n"); - PART_ERROR_API(H5Ocopy_invalid_lcpl); + PART_ERROR(H5Ocopy_invalid_lcpl); } - PASSED_API(); + PASSED(); } PART_END(H5Ocopy_invalid_lcpl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id2) < 0) TEST_ERROR; @@ -5000,7 +5000,7 @@ test_object_copy_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5023,9 +5023,9 @@ test_object_copy_invalid_params(void) static int test_object_comments(void) { - TESTING_API("object comments"); + TESTING("object comments"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -5037,9 +5037,9 @@ test_object_comments(void) static int test_object_comments_invalid_params(void) { - TESTING_API("object comment "); + TESTING("object comment "); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -5069,35 +5069,35 @@ test_object_visit(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, dataset, attribute, stored datatype, or " "iterate aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -5105,7 +5105,7 @@ test_object_visit(void) if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_VISIT_TEST_SUBGROUP_NAME); goto error; } @@ -5117,33 +5117,33 @@ test_object_visit(void) TEST_ERROR; if ((type_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME); goto error; } if ((group_id2 = H5Gcreate2(group_id, OBJECT_VISIT_TEST_GROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_VISIT_TEST_GROUP_NAME); goto error; } if ((dset_id = H5Dcreate2(group_id, OBJECT_VISIT_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_VISIT_TEST_DSET_NAME); goto error; } if (H5Tcommit2(group_id, OBJECT_VISIT_TEST_TYPE_NAME, type_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_VISIT_TEST_TYPE_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -5156,57 +5156,57 @@ test_object_visit(void) PART_BEGIN(H5Ovisit_obj_name_increasing) { - TESTING_2_API("H5Ovisit by object name in increasing order"); + TESTING_2("H5Ovisit by object name in increasing order"); i = 0; if (H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by object name in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_obj_name_increasing); + PART_ERROR(H5Ovisit_obj_name_increasing); } if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_obj_name_increasing); + PART_ERROR(H5Ovisit_obj_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_obj_name_increasing); PART_BEGIN(H5Ovisit_obj_name_decreasing) { - TESTING_2_API("H5Ovisit by object name in decreasing order"); + TESTING_2("H5Ovisit by object name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = OBJECT_VISIT_TEST_NUM_OBJS_VISITED; if (H5Ovisit3(group_id, H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by object name in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_obj_name_decreasing); + PART_ERROR(H5Ovisit_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_obj_name_decreasing); + PART_ERROR(H5Ovisit_obj_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_obj_name_decreasing); PART_BEGIN(H5Ovisit_create_order_increasing) { - TESTING_2_API("H5Ovisit by creation order in increasing order"); + TESTING_2("H5Ovisit by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_increasing); } @@ -5216,27 +5216,27 @@ test_object_visit(void) if (H5Ovisit3(group_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by creation order in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_create_order_increasing); + PART_ERROR(H5Ovisit_create_order_increasing); } if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_create_order_increasing); + PART_ERROR(H5Ovisit_create_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_create_order_increasing); PART_BEGIN(H5Ovisit_create_order_decreasing) { - TESTING_2_API("H5Ovisit by creation order in decreasing order"); + TESTING_2("H5Ovisit by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_decreasing); } @@ -5246,67 +5246,67 @@ test_object_visit(void) if (H5Ovisit3(group_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by creation order in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_create_order_decreasing); + PART_ERROR(H5Ovisit_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_create_order_decreasing); + PART_ERROR(H5Ovisit_create_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_create_order_decreasing); PART_BEGIN(H5Ovisit_file) { - TESTING_2_API("H5Ovisit on a file ID"); + TESTING_2("H5Ovisit on a file ID"); /* * XXX: */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Ovisit_file); } PART_END(H5Ovisit_file); PART_BEGIN(H5Ovisit_dset) { - TESTING_2_API("H5Ovisit on a dataset ID"); + TESTING_2("H5Ovisit on a dataset ID"); if (H5Ovisit3(dset_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_dset_callback, NULL, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit failed\n"); - PART_ERROR_API(H5Ovisit_dset); + PART_ERROR(H5Ovisit_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_dset); PART_BEGIN(H5Ovisit_dtype) { - TESTING_2_API("H5Ovisit on a committed datatype ID"); + TESTING_2("H5Ovisit on a committed datatype ID"); if (H5Ovisit3(type_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_dtype_callback, NULL, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit failed\n"); - PART_ERROR_API(H5Ovisit_dtype); + PART_ERROR(H5Ovisit_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_dtype); PART_BEGIN(H5Ovisit_by_name_obj_name_increasing) { - TESTING_2_API("H5Ovisit_by_name by object name in increasing order"); + TESTING_2("H5Ovisit_by_name by object name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -5314,15 +5314,15 @@ test_object_visit(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -5330,24 +5330,24 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_obj_name_increasing); PART_BEGIN(H5Ovisit_by_name_obj_name_decreasing) { - TESTING_2_API("H5Ovisit_by_name by object name in decreasing order"); + TESTING_2("H5Ovisit_by_name by object name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = OBJECT_VISIT_TEST_NUM_OBJS_VISITED; @@ -5355,15 +5355,15 @@ test_object_visit(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -5371,27 +5371,27 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_NAME, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_obj_name_decreasing); PART_BEGIN(H5Ovisit_by_name_create_order_increasing) { - TESTING_2_API("H5Ovisit_by_name by creation order in increasing order"); + TESTING_2("H5Ovisit_by_name by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_increasing); } @@ -5402,15 +5402,15 @@ test_object_visit(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -5418,27 +5418,27 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_create_order_increasing); PART_BEGIN(H5Ovisit_by_name_create_order_decreasing) { - TESTING_2_API("H5Ovisit_by_name by creation order in decreasing order"); + TESTING_2("H5Ovisit_by_name by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_decreasing); } @@ -5449,15 +5449,15 @@ test_object_visit(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(group_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -5465,67 +5465,67 @@ test_object_visit(void) if (H5Ovisit_by_name3(container_group, OBJECT_VISIT_TEST_SUBGROUP_NAME, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_create_order_decreasing); PART_BEGIN(H5Ovisit_by_name_file) { - TESTING_2_API("H5Ovisit_by_name on a file ID"); + TESTING_2("H5Ovisit_by_name on a file ID"); /* * XXX: */ - SKIPPED_API(); + SKIPPED(); PART_EMPTY(H5Ovisit_by_name_file); } PART_END(H5Ovisit_by_name_file); PART_BEGIN(H5Ovisit_by_name_dset) { - TESTING_2_API("H5Ovisit_by_name on a dataset ID"); + TESTING_2("H5Ovisit_by_name on a dataset ID"); if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_TEST_DSET_NAME, H5_INDEX_NAME, H5_ITER_INC, object_visit_dset_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name failed\n"); - PART_ERROR_API(H5Ovisit_by_name_dset); + PART_ERROR(H5Ovisit_by_name_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_dset); PART_BEGIN(H5Ovisit_by_name_dtype) { - TESTING_2_API("H5Ovisit_by_name on a committed datatype ID"); + TESTING_2("H5Ovisit_by_name on a committed datatype ID"); if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_TEST_TYPE_NAME, H5_INDEX_NAME, H5_ITER_INC, object_visit_dtype_callback, NULL, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name failed\n"); - PART_ERROR_API(H5Ovisit_by_name_dtype); + PART_ERROR(H5Ovisit_by_name_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_dtype); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -5546,7 +5546,7 @@ test_object_visit(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -5593,35 +5593,35 @@ test_object_visit_soft_link(void) if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE) || !(vol_cap_flags_g & H5VL_CAP_FLAG_SOFT_LINKS)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, soft link, or iterate " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((gcpl_id = H5Pcreate(H5P_GROUP_CREATE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create a GCPL\n"); goto error; } if (vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER) { if (H5Pset_link_creation_order(gcpl_id, H5P_CRT_ORDER_TRACKED | H5P_CRT_ORDER_INDEXED) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't enable link creation order tracking and indexing on GCPL\n"); goto error; } @@ -5629,7 +5629,7 @@ test_object_visit_soft_link(void) if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME); goto error; } @@ -5637,7 +5637,7 @@ test_object_visit_soft_link(void) /* Create group to hold soft links */ if ((subgroup_id = H5Gcreate2(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1); goto error; } @@ -5645,7 +5645,7 @@ test_object_visit_soft_link(void) /* Create group to hold objects pointed to by soft links */ if ((subgroup_id2 = H5Gcreate2(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2); goto error; } @@ -5653,45 +5653,45 @@ test_object_visit_soft_link(void) /* Create objects under subgroup 2 */ if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1); goto error; } if (H5Gclose(linked_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1); goto error; } if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2); goto error; } if (H5Gclose(linked_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2); goto error; } if ((linked_group_id = H5Gcreate2(subgroup_id2, OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3, H5P_DEFAULT, gcpl_id, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3); goto error; } if (H5Gclose(linked_group_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3); goto error; } if (H5Gclose(subgroup_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2); goto error; } @@ -5700,7 +5700,7 @@ test_object_visit_soft_link(void) if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME1, subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME1); goto error; } @@ -5708,7 +5708,7 @@ test_object_visit_soft_link(void) if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME2, subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME2); goto error; } @@ -5716,12 +5716,12 @@ test_object_visit_soft_link(void) if (H5Lcreate_soft("/" OBJECT_TEST_GROUP_NAME "/" OBJECT_VISIT_SOFT_LINK_TEST_SUBGROUP_NAME "/" OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME2 "/" OBJECT_VISIT_SOFT_LINK_TEST_OBJ_NAME3, subgroup_id, OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create soft link '%s'\n", OBJECT_VISIT_SOFT_LINK_TEST_LINK_NAME3); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { @@ -5734,57 +5734,57 @@ test_object_visit_soft_link(void) PART_BEGIN(H5Ovisit_obj_name_increasing) { - TESTING_2_API("H5Ovisit by object name in increasing order"); + TESTING_2("H5Ovisit by object name in increasing order"); i = 0; if (H5Ovisit3(subgroup_id, H5_INDEX_NAME, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by object name in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_obj_name_increasing); + PART_ERROR(H5Ovisit_obj_name_increasing); } if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_obj_name_increasing); + PART_ERROR(H5Ovisit_obj_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_obj_name_increasing); PART_BEGIN(H5Ovisit_obj_name_decreasing) { - TESTING_2_API("H5Ovisit by object name in decreasing order"); + TESTING_2("H5Ovisit by object name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED; if (H5Ovisit3(subgroup_id, H5_INDEX_NAME, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by object name in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_obj_name_decreasing); + PART_ERROR(H5Ovisit_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_obj_name_decreasing); + PART_ERROR(H5Ovisit_obj_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_obj_name_decreasing); PART_BEGIN(H5Ovisit_create_order_increasing) { - TESTING_2_API("H5Ovisit by creation order in increasing order"); + TESTING_2("H5Ovisit by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_increasing); } @@ -5794,27 +5794,27 @@ test_object_visit_soft_link(void) if (H5Ovisit3(subgroup_id, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by creation order in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_create_order_increasing); + PART_ERROR(H5Ovisit_create_order_increasing); } if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_create_order_increasing); + PART_ERROR(H5Ovisit_create_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_create_order_increasing); PART_BEGIN(H5Ovisit_create_order_decreasing) { - TESTING_2_API("H5Ovisit by creation order in decreasing order"); + TESTING_2("H5Ovisit by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_create_order_decreasing); } @@ -5824,24 +5824,24 @@ test_object_visit_soft_link(void) if (H5Ovisit3(subgroup_id, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit by creation order in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_create_order_decreasing); + PART_ERROR(H5Ovisit_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_create_order_decreasing); + PART_ERROR(H5Ovisit_create_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_create_order_decreasing); PART_BEGIN(H5Ovisit_by_name_obj_name_increasing) { - TESTING_2_API("H5Ovisit_by_name by object name in increasing order"); + TESTING_2("H5Ovisit_by_name by object name in increasing order"); /* Reset the counter to the appropriate value for the next test */ i = 0; @@ -5849,15 +5849,15 @@ test_object_visit_soft_link(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -5867,24 +5867,24 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1, H5_INDEX_NAME, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } if (i != OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_increasing); + PART_ERROR(H5Ovisit_by_name_obj_name_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_obj_name_increasing); PART_BEGIN(H5Ovisit_by_name_obj_name_decreasing) { - TESTING_2_API("H5Ovisit_by_name by object name in decreasing order"); + TESTING_2("H5Ovisit_by_name by object name in decreasing order"); /* Reset the counter to the appropriate value for the next test */ i = OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED; @@ -5892,15 +5892,15 @@ test_object_visit_soft_link(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_NAME, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -5910,27 +5910,27 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1, H5_INDEX_NAME, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by object name in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } if (i != 2 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_obj_name_decreasing); + PART_ERROR(H5Ovisit_by_name_obj_name_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_obj_name_decreasing); PART_BEGIN(H5Ovisit_by_name_create_order_increasing) { - TESTING_2_API("H5Ovisit_by_name by creation order in increasing order"); + TESTING_2("H5Ovisit_by_name by creation order in increasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_increasing); } @@ -5941,15 +5941,15 @@ test_object_visit_soft_link(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -5959,27 +5959,27 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1, H5_INDEX_CRT_ORDER, H5_ITER_INC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in increasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } if (i != 3 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_increasing); + PART_ERROR(H5Ovisit_by_name_create_order_increasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_create_order_increasing); PART_BEGIN(H5Ovisit_by_name_create_order_decreasing) { - TESTING_2_API("H5Ovisit_by_name by creation order in decreasing order"); + TESTING_2("H5Ovisit_by_name by creation order in decreasing order"); if (!(vol_cap_flags_g & H5VL_CAP_FLAG_CREATION_ORDER)) { - SKIPPED_API(); + SKIPPED(); printf(" creation order tracking isn't supported with this VOL connector\n"); PART_EMPTY(H5Ovisit_by_name_create_order_decreasing); } @@ -5990,15 +5990,15 @@ test_object_visit_soft_link(void) /* First, test visiting using "." for the object name */ if (H5Ovisit_by_name3(subgroup_id, ".", H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } /* Reset the special counter and repeat the test using an indirect object name. */ @@ -6008,24 +6008,24 @@ test_object_visit_soft_link(void) if (H5Ovisit_by_name3(group_id, OBJECT_VISIT_SOFT_LINK_TEST_GROUP_NAME1, H5_INDEX_CRT_ORDER, H5_ITER_DEC, object_visit_soft_link_callback, &i, H5O_INFO_ALL, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name by creation order in decreasing order failed\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } if (i != 4 * OBJECT_VISIT_SOFT_LINK_TEST_NUM_OBJS_VISITED) { - H5_FAILED_API(); + H5_FAILED(); printf(" some objects were not visited!\n"); - PART_ERROR_API(H5Ovisit_by_name_create_order_decreasing); + PART_ERROR(H5Ovisit_by_name_create_order_decreasing); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_create_order_decreasing); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Pclose(gcpl_id) < 0) TEST_ERROR; @@ -6038,7 +6038,7 @@ test_object_visit_soft_link(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6075,28 +6075,28 @@ test_object_visit_invalid_params(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & H5VL_CAP_FLAG_FILE_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ITERATE)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or iterate aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_VISIT_INVALID_PARAMS_TEST_SUBGROUP_NAME); goto error; @@ -6104,18 +6104,18 @@ test_object_visit_invalid_params(void) if ((group_id2 = H5Gcreate2(group_id, OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_VISIT_INVALID_PARAMS_TEST_GROUP_NAME); goto error; } - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Ovisit_invalid_obj_id) { - TESTING_2_API("H5Ovisit with an invalid object ID"); + TESTING_2("H5Ovisit with an invalid object ID"); H5E_BEGIN_TRY { @@ -6125,18 +6125,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit succeeded with an invalid object ID!\n"); - PART_ERROR_API(H5Ovisit_invalid_obj_id); + PART_ERROR(H5Ovisit_invalid_obj_id); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_invalid_obj_id); PART_BEGIN(H5Ovisit_invalid_index_type) { - TESTING_2_API("H5Ovisit with an invalid index type"); + TESTING_2("H5Ovisit with an invalid index type"); H5E_BEGIN_TRY { @@ -6146,9 +6146,9 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Ovisit_invalid_index_type); + PART_ERROR(H5Ovisit_invalid_index_type); } H5E_BEGIN_TRY @@ -6159,18 +6159,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Ovisit_invalid_index_type); + PART_ERROR(H5Ovisit_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_invalid_index_type); PART_BEGIN(H5Ovisit_invalid_iter_order) { - TESTING_2_API("H5Ovisit with an invalid iteration ordering"); + TESTING_2("H5Ovisit with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -6180,9 +6180,9 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Ovisit_invalid_iter_order); + PART_ERROR(H5Ovisit_invalid_iter_order); } H5E_BEGIN_TRY @@ -6193,18 +6193,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Ovisit_invalid_iter_order); + PART_ERROR(H5Ovisit_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_invalid_iter_order); PART_BEGIN(H5Ovisit_by_name_invalid_loc_id) { - TESTING_2_API("H5Ovisit_by_name with an invalid location ID"); + TESTING_2("H5Ovisit_by_name with an invalid location ID"); H5E_BEGIN_TRY { @@ -6214,18 +6214,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with an invalid location ID!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_loc_id); + PART_ERROR(H5Ovisit_by_name_invalid_loc_id); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_invalid_loc_id); PART_BEGIN(H5Ovisit_by_name_invalid_obj_name) { - TESTING_2_API("H5Ovisit_by_name with an invalid object name"); + TESTING_2("H5Ovisit_by_name with an invalid object name"); H5E_BEGIN_TRY { @@ -6235,9 +6235,9 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with a NULL object name!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_obj_name); + PART_ERROR(H5Ovisit_by_name_invalid_obj_name); } H5E_BEGIN_TRY @@ -6248,18 +6248,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with an invalid object name of ''!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_obj_name); + PART_ERROR(H5Ovisit_by_name_invalid_obj_name); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_invalid_obj_name); PART_BEGIN(H5Ovisit_by_name_invalid_index_type) { - TESTING_2_API("H5Ovisit_by_name with an invalid index type"); + TESTING_2("H5Ovisit_by_name with an invalid index type"); H5E_BEGIN_TRY { @@ -6269,9 +6269,9 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with invalid index type H5_INDEX_UNKNOWN!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_index_type); + PART_ERROR(H5Ovisit_by_name_invalid_index_type); } H5E_BEGIN_TRY @@ -6282,18 +6282,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with invalid index type H5_INDEX_N!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_index_type); + PART_ERROR(H5Ovisit_by_name_invalid_index_type); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_invalid_index_type); PART_BEGIN(H5Ovisit_by_name_invalid_iter_order) { - TESTING_2_API("H5Ovisit_by_name with an invalid iteration ordering"); + TESTING_2("H5Ovisit_by_name with an invalid iteration ordering"); H5E_BEGIN_TRY { @@ -6303,9 +6303,9 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_UNKNOWN!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_iter_order); + PART_ERROR(H5Ovisit_by_name_invalid_iter_order); } H5E_BEGIN_TRY @@ -6316,18 +6316,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with invalid iteration ordering H5_ITER_N!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_iter_order); + PART_ERROR(H5Ovisit_by_name_invalid_iter_order); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_invalid_iter_order); PART_BEGIN(H5Ovisit_by_name_invalid_lapl) { - TESTING_2_API("H5Ovisit_by_name with an invalid LAPL"); + TESTING_2("H5Ovisit_by_name with an invalid LAPL"); H5E_BEGIN_TRY { @@ -6337,18 +6337,18 @@ test_object_visit_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Ovisit_by_name succeeded with an invalid LAPL!\n"); - PART_ERROR_API(H5Ovisit_by_name_invalid_lapl); + PART_ERROR(H5Ovisit_by_name_invalid_lapl); } - PASSED_API(); + PASSED(); } PART_END(H5Ovisit_by_name_invalid_lapl); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Gclose(group_id2) < 0) TEST_ERROR; @@ -6359,7 +6359,7 @@ test_object_visit_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6397,29 +6397,29 @@ test_close_object(void) !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_DATASET_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_ATTR_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_STORED_DATATYPES)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, object, dataset, attribute, or stored datatype " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_CLOSE_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container subgroup '%s'\n", OBJECT_CLOSE_TEST_GROUP_NAME); goto error; } @@ -6430,19 +6430,19 @@ test_close_object(void) if ((dset_dtype = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Oclose_group) { - TESTING_2_API("H5Oclose on a group"); + TESTING_2("H5Oclose on a group"); if ((group_id2 = H5Gcreate2(group_id, OBJECT_CLOSE_TEST_GRP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create group '%s'\n", OBJECT_CLOSE_TEST_GRP_NAME); - PART_ERROR_API(H5Oclose_group); + PART_ERROR(H5Oclose_group); } H5E_BEGIN_TRY @@ -6452,30 +6452,30 @@ test_close_object(void) H5E_END_TRY if ((group_id2 = H5Oopen(group_id, OBJECT_CLOSE_TEST_GRP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open group '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_GRP_NAME); - PART_ERROR_API(H5Oclose_group); + PART_ERROR(H5Oclose_group); } if (H5Oclose(group_id2) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close group '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_GRP_NAME); - PART_ERROR_API(H5Oclose_group); + PART_ERROR(H5Oclose_group); } - PASSED_API(); + PASSED(); } PART_END(H5Oclose_group); PART_BEGIN(H5Oclose_dset) { - TESTING_2_API("H5Oclose on a dataset"); + TESTING_2("H5Oclose on a dataset"); if ((dset_id = H5Dcreate2(group_id, OBJECT_CLOSE_TEST_DSET_NAME, dset_dtype, fspace_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create dataset '%s'\n", OBJECT_CLOSE_TEST_DSET_NAME); - PART_ERROR_API(H5Oclose_dset); + PART_ERROR(H5Oclose_dset); } H5E_BEGIN_TRY @@ -6485,36 +6485,36 @@ test_close_object(void) H5E_END_TRY if ((dset_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_DSET_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open dataset '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_DSET_NAME); - PART_ERROR_API(H5Oclose_dset); + PART_ERROR(H5Oclose_dset); } if (H5Oclose(dset_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close dataset '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_DSET_NAME); - PART_ERROR_API(H5Oclose_dset); + PART_ERROR(H5Oclose_dset); } - PASSED_API(); + PASSED(); } PART_END(H5Oclose_dset); PART_BEGIN(H5Oclose_dtype) { - TESTING_2_API("H5Oclose on a committed datatype"); + TESTING_2("H5Oclose on a committed datatype"); if ((dtype_id = generate_random_datatype(H5T_NO_CLASS, FALSE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME); - PART_ERROR_API(H5Oclose_dtype); + PART_ERROR(H5Oclose_dtype); } if (H5Tcommit2(group_id, OBJECT_CLOSE_TEST_TYPE_NAME, dtype_id, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't commit datatype '%s'\n", OBJECT_CLOSE_TEST_TYPE_NAME); - PART_ERROR_API(H5Oclose_dtype); + PART_ERROR(H5Oclose_dtype); } H5E_BEGIN_TRY @@ -6524,24 +6524,24 @@ test_close_object(void) H5E_END_TRY if ((dtype_id = H5Oopen(group_id, OBJECT_CLOSE_TEST_TYPE_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open datatype '%s' with H5Oopen\n", OBJECT_CLOSE_TEST_TYPE_NAME); - PART_ERROR_API(H5Oclose_dtype); + PART_ERROR(H5Oclose_dtype); } if (H5Oclose(dtype_id) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't close datatype '%s' with H5Oclose\n", OBJECT_CLOSE_TEST_TYPE_NAME); - PART_ERROR_API(H5Oclose_dtype); + PART_ERROR(H5Oclose_dtype); } - PASSED_API(); + PASSED(); } PART_END(H5Oclose_dtype); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Sclose(fspace_id) < 0) TEST_ERROR; @@ -6554,7 +6554,7 @@ test_close_object(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6585,17 +6585,17 @@ test_close_object_invalid_params(void) herr_t err_ret = -1; hid_t file_id = H5I_INVALID_HID; - TESTING_API("H5Oclose with an invalid object ID"); + TESTING("H5Oclose with an invalid object ID"); /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file or object aren't supported with this connector\n"); return 0; } if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } @@ -6607,7 +6607,7 @@ test_close_object_invalid_params(void) H5E_END_TRY if (err_ret >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oclose succeeded with an invalid object ID!\n"); goto error; } @@ -6615,7 +6615,7 @@ test_close_object_invalid_params(void) if (H5Fclose(file_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6649,32 +6649,32 @@ test_close_invalid_objects(void) /* Make sure the connector supports the API functions being tested */ if (!(vol_cap_flags_g & (H5VL_CAP_FLAG_FILE_BASIC)) || !(vol_cap_flags_g & H5VL_CAP_FLAG_GROUP_BASIC) || !(vol_cap_flags_g & H5VL_CAP_FLAG_OBJECT_BASIC)) { - SKIPPED_API(); + SKIPPED(); printf(" API functions for basic file, group, or object " "aren't supported with this connector\n"); return 0; } - TESTING_2_API("test setup"); + TESTING_2("test setup"); if ((fapl_id = H5Pcreate(H5P_FILE_ACCESS)) < 0) TEST_ERROR; if ((file_id = H5Fopen(H5_API_TEST_FILENAME, H5F_ACC_RDWR, fapl_id)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open file '%s'\n", H5_API_TEST_FILENAME); goto error; } if ((container_group = H5Gopen2(file_id, OBJECT_TEST_GROUP_NAME, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't open container group '%s'\n", OBJECT_TEST_GROUP_NAME); goto error; } if ((group_id = H5Gcreate2(container_group, OBJECT_CLOSE_INVALID_TEST_GROUP_NAME, H5P_DEFAULT, H5P_DEFAULT, H5P_DEFAULT)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create container sub-group '%s'\n", OBJECT_OPEN_TEST_GROUP_NAME); goto error; } @@ -6690,13 +6690,13 @@ test_close_invalid_objects(void) H5P_DEFAULT, H5P_DEFAULT)) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); BEGIN_MULTIPART { PART_BEGIN(H5Oclose_file) { - TESTING_2_API("H5Oclose with an invalid object - file"); + TESTING_2("H5Oclose with an invalid object - file"); H5E_BEGIN_TRY { @@ -6705,18 +6705,18 @@ test_close_invalid_objects(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oclose succeeded with an invalid object (file)!\n"); - PART_ERROR_API(H5Oclose_file); + PART_ERROR(H5Oclose_file); } - PASSED_API(); + PASSED(); } PART_END(H5Oclose_file); PART_BEGIN(H5Oclose_plist) { - TESTING_2_API("H5Oclose with an invalid object - property list"); + TESTING_2("H5Oclose with an invalid object - property list"); H5E_BEGIN_TRY { @@ -6725,18 +6725,18 @@ test_close_invalid_objects(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oclose succeeded with an invalid object (property list)!\n"); - PART_ERROR_API(H5Oclose_plist); + PART_ERROR(H5Oclose_plist); } - PASSED_API(); + PASSED(); } PART_END(H5Oclose_plist); PART_BEGIN(H5Oclose_dspace) { - TESTING_2_API("H5Oclose with an invalid object - data space"); + TESTING_2("H5Oclose with an invalid object - data space"); H5E_BEGIN_TRY { @@ -6745,18 +6745,18 @@ test_close_invalid_objects(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oclose succeeded with an invalid object (data space)!\n"); - PART_ERROR_API(H5Oclose_dspace); + PART_ERROR(H5Oclose_dspace); } - PASSED_API(); + PASSED(); } PART_END(H5Oclose_dspace); PART_BEGIN(H5Oclose_attribute) { - TESTING_2_API("H5Oclose with an invalid object - attribute"); + TESTING_2("H5Oclose with an invalid object - attribute"); H5E_BEGIN_TRY { @@ -6765,18 +6765,18 @@ test_close_invalid_objects(void) H5E_END_TRY if (status >= 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" H5Oclose succeeded with an invalid object (attribute)!\n"); - PART_ERROR_API(H5Oclose_attribute); + PART_ERROR(H5Oclose_attribute); } - PASSED_API(); + PASSED(); } PART_END(H5Oclose_attribute); } END_MULTIPART; - TESTING_2_API("test cleanup"); + TESTING_2("test cleanup"); if (H5Tclose(attr_dtype) < 0) TEST_ERROR; @@ -6793,7 +6793,7 @@ test_close_invalid_objects(void) if (H5Pclose(fapl_id) < 0) TEST_ERROR; - PASSED_API(); + PASSED(); return 0; @@ -6819,9 +6819,9 @@ test_close_invalid_objects(void) static int test_flush_object(void) { - TESTING_API("H5Oflush"); + TESTING("H5Oflush"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -6833,9 +6833,9 @@ test_flush_object(void) static int test_flush_object_invalid_params(void) { - TESTING_API("H5Oflush with invalid parameters"); + TESTING("H5Oflush with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -6846,9 +6846,9 @@ test_flush_object_invalid_params(void) static int test_refresh_object(void) { - TESTING_API("H5Orefresh"); + TESTING("H5Orefresh"); - SKIPPED_API(); + SKIPPED(); return 0; } @@ -6860,9 +6860,9 @@ test_refresh_object(void) static int test_refresh_object_invalid_params(void) { - TESTING_API("H5Orefresh with invalid parameters"); + TESTING("H5Orefresh with invalid parameters"); - SKIPPED_API(); + SKIPPED(); return 0; } diff --git a/test/API/H5_api_test_util.c b/test/API/H5_api_test_util.c index 4f2dfb40bde..ee19644fe7e 100644 --- a/test/API/H5_api_test_util.c +++ b/test/API/H5_api_test_util.c @@ -363,13 +363,13 @@ generate_random_datatype_string(H5T_class_t H5_ATTR_UNUSED parent_class, hbool_t else { if ((datatype = H5Tcreate(H5T_STRING, H5T_VARIABLE)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't create variable-length string datatype\n"); goto done; } if (H5Tset_strpad(datatype, H5T_STR_NULLTERM) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't set H5T_STR_NULLTERM for variable-length string type\n"); goto done; } @@ -478,7 +478,7 @@ generate_random_datatype_reference(H5T_class_t H5_ATTR_UNUSED parent_class, hboo } else { if ((datatype = H5Tcopy(H5T_STD_REF_DSETREG)) < 0) { - H5_FAILED_API(); + H5_FAILED(); printf(" couldn't copy region reference datatype\n"); goto done; } diff --git a/test/h5test.c b/test/h5test.c index 35276029c14..8d8acdff36e 100644 --- a/test/h5test.c +++ b/test/h5test.c @@ -110,10 +110,17 @@ const char *LIBVER_NAMES[] = {"earliest", /* H5F_LIBVER_EARLIEST = 0 */ static H5E_auto2_t err_func = NULL; /* Global variables for testing */ +#ifdef H5_HAVE_MULTITHREAD +_Atomic size_t n_tests_run_g = 0; +_Atomic size_t n_tests_passed_g = 0; +_Atomic size_t n_tests_failed_g = 0; +_Atomic size_t n_tests_skipped_g = 0; +#else size_t n_tests_run_g = 0; size_t n_tests_passed_g = 0; size_t n_tests_failed_g = 0; size_t n_tests_skipped_g = 0; +#endif /* H5_HAVE_MULTITHREAD */ /* Value of currently registered optional dynamic VOL operation */ int reg_opt_curr_op_val = 0; diff --git a/test/h5test.h b/test/h5test.h index 3dfe02c9a0a..dd71e2be0c9 100644 --- a/test/h5test.h +++ b/test/h5test.h @@ -24,6 +24,10 @@ #include "H5private.h" #include "H5Eprivate.h" +#ifdef H5_HAVE_MULTITHREAD +#include +#endif + /* * Predefined test verbosity levels. * @@ -112,6 +116,28 @@ extern pthread_key_t thread_info_key_g; printf(" at %s:%d in %s()...\n", __FILE__, __LINE__, __func__); \ } while (0) +/* + * Muli-thread-compatible testing macros for use in API tests + */ +#ifdef H5_HAVE_MULTITHREAD + +/* Increment global atomic testing variable. Used for MT testing by + * tests that don't define threadlocal test information */ +#define INCR_TEST_STAT_GLOBAL(field_name) atomic_fetch_add(&field_name, 1); + +#define INCR_TEST_STAT(field_name) \ + do { \ + if (pthread_getspecific(thread_info_key_g) != NULL) {\ + ((thread_info_t*)pthread_getspecific(thread_info_key_g))->field_name++;\ + } else {\ + /* Use global value instead of TL */\ + INCR_TEST_STAT_GLOBAL(field_name);\ + }\ + } while (0) + +#else +#define INCR_TEST_STAT(field_name) field_name++ +#endif /* * The name of the test is printed by saying TESTING("something") which will @@ -126,31 +152,25 @@ extern pthread_key_t thread_info_key_g; do { \ printf("Testing %-62s", WHAT); \ fflush(stdout); \ - n_tests_run_g++; \ + INCR_TEST_STAT(n_tests_run_g); \ } while (0) #define TESTING_2(WHAT) \ do { \ printf(" Testing %-60s", WHAT); \ fflush(stdout); \ - n_tests_run_g++; \ + INCR_TEST_STAT(n_tests_run_g); \ } while (0) #define PASSED() \ do { \ HDputs(" PASSED"); \ fflush(stdout); \ - n_tests_passed_g++; \ + INCR_TEST_STAT(n_tests_passed_g); \ } while (0) #define H5_FAILED() \ do { \ HDputs("*FAILED*"); \ fflush(stdout); \ - n_tests_failed_g++; \ - } while (0) -#define H5_FAILED_API() \ - do { \ - HDputs("*FAILED*"); \ - fflush(stdout); \ - INCR_TEST_STAT(n_tests_failed_g); \ + INCR_TEST_STAT(n_tests_failed_g); \ } while (0) #define H5_WARNING() \ do { \ @@ -161,7 +181,7 @@ extern pthread_key_t thread_info_key_g; do { \ HDputs(" -SKIP-"); \ fflush(stdout); \ - n_tests_skipped_g++; \ + INCR_TEST_STAT(n_tests_skipped_g); \ } while (0) #define PUTS_ERROR(s) \ do { \ @@ -232,7 +252,7 @@ extern pthread_key_t thread_info_key_g; part_##part_name##_end: #define PART_ERROR(part_name) \ do { \ - n_tests_failed_g++; \ + INCR_TEST_STAT(n_tests_failed_g); \ part_nerrors++; \ goto part_##part_name##_end; \ } while (0) @@ -253,70 +273,6 @@ extern pthread_key_t thread_info_key_g; goto part_##part_name##_end; \ } while (0) -/* - * Muli-thread-compatible testing macros for use in API tests - */ -#ifdef H5_HAVE_MULTITHREAD -#define INCR_TEST_STAT(field_name) \ - do { \ - if (pthread_getspecific(thread_info_key_g) != NULL) \ - ((thread_info_t*)pthread_getspecific(thread_info_key_g))->field_name++;\ - } while (0) -#else -#define INCR_TEST_STAT(field_name) field_name++ -#endif - -#define TESTING_API(WHAT) \ -do { \ - printf("Testing %-62s", WHAT); \ - fflush(stdout); \ - INCR_TEST_STAT(n_tests_run_g); \ -} while (0) -#define TESTING_2_API(WHAT) \ - do { \ - printf(" Testing %-60s", WHAT); \ - fflush(stdout); \ - INCR_TEST_STAT(n_tests_run_g); \ - } while (0) -#define PASSED_API() \ - do { \ - HDputs(" PASSED"); \ - fflush(stdout); \ - INCR_TEST_STAT(n_tests_passed_g); \ - } while (0) -#define SKIPPED_API() \ - do { \ - HDputs(" -SKIP-"); \ - fflush(stdout); \ - INCR_TEST_STAT(n_tests_skipped_g); \ - } while (0) -#define TEST_ERROR_API \ - do { \ - H5_FAILED_API(); \ - AT(); \ - goto error; \ - } while (0) -#define FAIL_PUTS_ERROR_API(s) \ - do { \ - H5_FAILED_API(); \ - AT(); \ - HDputs(s); \ - goto error; \ - } while (0) -#define PART_ERROR_API(part_name) \ - do { \ - INCR_TEST_STAT(n_tests_failed_g); \ - part_nerrors++; \ - goto part_##part_name##_end; \ - } while (0) -#define PART_TEST_ERROR_API(part_name) \ - do { \ - H5_FAILED_API(); \ - AT(); \ - part_nerrors++; \ - goto part_##part_name##_end; \ - } while (0) - /* Number of seconds to wait before killing a test (requires alarm(2)) */ #define H5_ALARM_SEC 1200 /* default is 20 minutes */ @@ -441,10 +397,18 @@ H5TEST_DLL char *getenv_all(MPI_Comm comm, int root, const char *name); /* Extern global variables */ H5TEST_DLLVAR int TestVerbosity; /* Global variables for testing */ +#ifdef H5_HAVE_MULTITHREAD +H5TEST_DLLVAR _Atomic size_t n_tests_run_g; +H5TEST_DLLVAR _Atomic size_t n_tests_passed_g; +H5TEST_DLLVAR _Atomic size_t n_tests_failed_g; +H5TEST_DLLVAR _Atomic size_t n_tests_skipped_g; +#else H5TEST_DLLVAR size_t n_tests_run_g; H5TEST_DLLVAR size_t n_tests_passed_g; H5TEST_DLLVAR size_t n_tests_failed_g; H5TEST_DLLVAR size_t n_tests_skipped_g; +#endif + H5TEST_DLLVAR uint64_t vol_cap_flags_g; H5TEST_DLL void h5_send_message(const char *file, const char *arg1, const char *arg2); @@ -465,4 +429,4 @@ H5TEST_DLLVAR int reg_opt_curr_op_val; #ifdef __cplusplus } #endif -#endif +#endif \ No newline at end of file