summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2007-10-12 01:29:45 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2007-10-12 01:29:45 (GMT)
commitca0b287d21f4d73bc7d197ee7f6e92ca2631e373 (patch)
tree22153cbcb36f9313fcbe536b47445db2721476cb /test
parent637fa77ea7e720eb7b5a932ceeb0d05beeefb978 (diff)
downloadhdf5-ca0b287d21f4d73bc7d197ee7f6e92ca2631e373.zip
hdf5-ca0b287d21f4d73bc7d197ee7f6e92ca2631e373.tar.gz
hdf5-ca0b287d21f4d73bc7d197ee7f6e92ca2631e373.tar.bz2
[svn-r14204] Description:
Move H5Pinsert() out of old "compat v1.6" section and into API versioning, switching internal usage to H5Pinsert2(). Add regression test for H5Pinsert1() Clean up some other minor warnings. Tested on: FreeBSD/32 6.2 (duty) in debug mode FreeBSD/64 6.2 (liberty) w/C++ & FORTRAN, in debug mode Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe, in debug mode Linux/64-amd64 2.6 (smirom) w/default API=1.6.x, w/C++ & FORTRAN, in production mode Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN, in production mode Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN, w/szip filter, in production mode Mac OS X/32 10.4.10 (amazon) in debug mode
Diffstat (limited to 'test')
-rw-r--r--test/gen_bogus.c2
-rw-r--r--test/links.c6
-rw-r--r--test/tgenprop.c126
3 files changed, 89 insertions, 45 deletions
diff --git a/test/gen_bogus.c b/test/gen_bogus.c
index a4daedc..a8b88bf 100644
--- a/test/gen_bogus.c
+++ b/test/gen_bogus.c
@@ -53,7 +53,7 @@ int main(void)
if((dcpl = H5Pcreate(H5P_DATASET_CREATE)) < 0) goto error;
/* Add property for bogus message flags */
- if(H5Pinsert(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, H5O_BOGUS_MSG_FLAGS_SIZE, &bogus_flags, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error;
+ if(H5Pinsert2(dcpl, H5O_BOGUS_MSG_FLAGS_NAME, H5O_BOGUS_MSG_FLAGS_SIZE, &bogus_flags, NULL, NULL, NULL, NULL, NULL, NULL) < 0) goto error;
/* Create dataset with "bogus" message, but no message flags */
if((did = H5Dcreate2(fid, "/Dataset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, dcpl, H5P_DEFAULT)) < 0) goto error;
diff --git a/test/links.c b/test/links.c
index 52d76cd..e99dd37 100644
--- a/test/links.c
+++ b/test/links.c
@@ -4550,11 +4550,7 @@ lapl_udata(hid_t fapl, hbool_t new_format)
/* Create a non-default lapl with a new property pointing to group a*/
if((plist_id = H5Pcreate(H5P_LINK_ACCESS)) < 0) TEST_ERROR
HDstrcpy(group_a_name, "group_a");
-#ifdef H5_WANT_H5_V1_6_COMPAT
- if(H5Pinsert(plist_id, DEST_PROP_NAME, (size_t)NAME_BUF_SIZE, group_a_name, NULL, NULL, NULL, NULL, NULL) < 0) TEST_ERROR
-#else /* H5_WANT_H5_V1_6_COMPAT */
- if(H5Pinsert(plist_id, DEST_PROP_NAME, (size_t)NAME_BUF_SIZE, group_a_name, NULL, NULL, NULL, NULL, NULL, NULL) < 0) TEST_ERROR
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+ if(H5Pinsert2(plist_id, DEST_PROP_NAME, (size_t)NAME_BUF_SIZE, group_a_name, NULL, NULL, NULL, NULL, NULL, NULL) < 0) TEST_ERROR
/* Try opening group through UD link */
if((gid = H5Oopen(fid, "ud_link", plist_id)) < 0) TEST_ERROR
diff --git a/test/tgenprop.c b/test/tgenprop.c
index efc2b3b..931133e 100644
--- a/test/tgenprop.c
+++ b/test/tgenprop.c
@@ -650,20 +650,12 @@ test_genprop_basic_list_prop(void)
/* Add temporary properties */
/* Insert first temporary property into class (with no callbacks) */
-#ifdef H5_WANT_H5_V1_6_COMPAT
- ret = H5Pinsert(lid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, NULL, NULL, NULL, NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
- ret = H5Pinsert(lid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
- CHECK_I(ret, "H5Pinsert");
+ ret = H5Pinsert2(lid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
+ CHECK_I(ret, "H5Pinsert2");
/* Insert second temporary property into class (with no callbacks) */
-#ifdef H5_WANT_H5_V1_6_COMPAT
- ret = H5Pinsert(lid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, NULL, NULL, NULL, NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
- ret = H5Pinsert(lid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
- CHECK_I(ret, "H5Pinsert");
+ ret = H5Pinsert2(lid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
+ CHECK_I(ret, "H5Pinsert2");
/* Check the number of properties in list */
ret = H5Pget_nprops(lid1,&nprops);
@@ -824,20 +816,12 @@ test_genprop_list_iter(void)
/* Add temporary properties */
/* Insert first temporary property into class (with no callbacks) */
-#ifdef H5_WANT_H5_V1_6_COMPAT
- ret = H5Pinsert(lid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, NULL, NULL, NULL, NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
- ret = H5Pinsert(lid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
- CHECK_I(ret, "H5Pinsert");
+ ret = H5Pinsert2(lid1, PROP3_NAME, PROP3_SIZE, PROP3_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
+ CHECK_I(ret, "H5Pinsert2");
/* Insert second temporary property into class (with no callbacks) */
-#ifdef H5_WANT_H5_V1_6_COMPAT
- ret = H5Pinsert(lid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, NULL, NULL, NULL, NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
- ret = H5Pinsert(lid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
- CHECK_I(ret, "H5Pinsert");
+ ret = H5Pinsert2(lid1, PROP4_NAME, PROP4_SIZE, PROP4_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
+ CHECK_I(ret, "H5Pinsert2");
/* Check the number of properties in list */
ret = H5Pget_nprops(lid1,&nprops);
@@ -984,7 +968,6 @@ test_genprop_prop_cop_cb1(const char *name, size_t size, void *value)
return(SUCCEED);
}
-#ifndef H5_WANT_H5_V1_6_COMPAT
/****************************************************************
**
** test_genprop_prop_cmp_cb1(): Property comparison callback for test_genprop_list_callback
@@ -998,7 +981,6 @@ test_genprop_prop_cmp_cb1(const void UNUSED *value1, const void UNUSED *value2,
return(0);
}
-#endif /* H5_WANT_H5_V1_6_COMPAT */
/****************************************************************
**
@@ -1191,14 +1173,12 @@ test_genprop_list_callback(void)
VERIFY(cop_cb_struct.count, 1, "H5Pcopy");
VERIFY(cop_cb_struct.id, lid2, "H5Pcopy");
-#ifndef H5_WANT_H5_V1_6_COMPAT
/* Compare the two lists */
ret = H5Pequal(lid1,lid2);
VERIFY(ret, 1, "H5Pequal");
/* Verify compare callback information for properties tracked */
VERIFY(prop1_cb_info.cmp_count, 1, "H5Pequal");
-#endif /* H5_WANT_H5_V1_6_COMPAT */
/* Close first list */
ret = H5Pclose(lid1);
@@ -1267,12 +1247,8 @@ test_genprop_list_addprop(void)
CHECK(pid, FAIL, "H5Pcreate");
/* Insert temporary property into class (with no callbacks) */
-#ifdef H5_WANT_H5_V1_6_COMPAT
- ret = H5Pinsert(pid, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
- ret = H5Pinsert(pid, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
- CHECK_I(ret, "H5Pinsert");
+ ret = H5Pinsert2(pid, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL, NULL);
+ CHECK_I(ret, "H5Pinsert2");
/* Check existence of added property */
ret = H5Pexist(pid, PROP1_NAME);
@@ -1599,12 +1575,12 @@ test_genprop_refcount(void)
#ifndef H5_NO_DEPRECATED_SYMBOLS
/****************************************************************
**
-** test_genprop_deprec(): Test basic generic property list code.
-** Tests deprecated API routines.
+** test_genprop_deprec_class(): Test basic generic property list code.
+** Tests deprecated property class API routines.
**
****************************************************************/
static void
-test_genprop_deprec(void)
+test_genprop_deprec_class(void)
{
hid_t cid1; /* Generic Property class ID */
size_t size; /* Size of property */
@@ -1723,7 +1699,78 @@ test_genprop_deprec(void)
/* Close class */
ret = H5Pclose_class(cid1);
CHECK_I(ret, "H5Pclose_class");
-} /* end test_genprop_deprec() */
+} /* end test_genprop_deprec_class() */
+
+/****************************************************************
+**
+** test_genprop_deprec2(): Test basic generic property list code.
+** Tests deprecated property list API routines.
+**
+****************************************************************/
+static void
+test_genprop_deprec_list(void)
+{
+ hid_t fid; /* File ID */
+ hid_t did; /* Dataset ID */
+ hid_t sid; /* Dataspace ID */
+ hid_t pid; /* Property List ID */
+ int prop1_value; /* Value for property #1 */
+ herr_t ret; /* Generic return value */
+
+ /* Create file */
+ fid = H5Fcreate(FILENAME, H5F_ACC_TRUNC, H5P_DEFAULT, H5P_DEFAULT);
+ CHECK(fid, FAIL, "H5Fcreate");
+
+ /* Create scalar dataspace for dataset */
+ sid = H5Screate(H5S_SCALAR);
+ CHECK(sid, FAIL, "H5Screate");
+
+ /* Create a dataset creation property list */
+ pid = H5Pcreate(H5P_DATASET_CREATE);
+ CHECK(pid, FAIL, "H5Pcreate");
+
+ /* Insert temporary property into class (with no callbacks) */
+ ret = H5Pinsert1(pid, PROP1_NAME, PROP1_SIZE, PROP1_DEF_VALUE, NULL, NULL, NULL, NULL, NULL);
+ CHECK_I(ret, "H5Pinsert1");
+
+ /* Check existence of added property */
+ ret = H5Pexist(pid, PROP1_NAME);
+ VERIFY(ret, 1, "H5Pexist");
+
+ /* Check values of property (set with default value) */
+ ret = H5Pget(pid, PROP1_NAME,&prop1_value);
+ CHECK_I(ret, "H5Pget");
+ VERIFY(prop1_value, *PROP1_DEF_VALUE, "H5Pget");
+
+ /* Create a dataset */
+ did = H5Dcreate2(fid, "Dataset1", H5T_NATIVE_INT, sid, H5P_DEFAULT, pid, H5P_DEFAULT);
+ CHECK(did, FAIL, "H5Dcreate2");
+
+ /* Check existence of added property (after using property list) */
+ ret = H5Pexist(pid, PROP1_NAME);
+ VERIFY(ret, 1, "H5Pexist");
+
+ /* Check values of property (set with default value) (after using property list) */
+ ret = H5Pget(pid, PROP1_NAME, &prop1_value);
+ CHECK_I(ret, "H5Pget");
+ VERIFY(prop1_value, *PROP1_DEF_VALUE, "H5Pget");
+
+ /* Close property list */
+ ret = H5Pclose(pid);
+ CHECK(ret, FAIL, "H5Pclose");
+
+ /* Close disk dataspace */
+ ret = H5Sclose(sid);
+ CHECK(ret, FAIL, "H5Sclose");
+
+ /* Close Dataset */
+ ret = H5Dclose(did);
+ CHECK(ret, FAIL, "H5Dclose");
+
+ /* Close file */
+ ret = H5Fclose(fid);
+ CHECK(ret, FAIL, "H5Fclose");
+} /* end test_genprop_deprec_list() */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
/****************************************************************
@@ -1756,7 +1803,8 @@ test_genprop(void)
test_genprop_refcount(); /* Tests for class reference counting */
#ifndef H5_NO_DEPRECATED_SYMBOLS
- test_genprop_deprec(); /* Tests for deprecated routines */
+ test_genprop_deprec_class(); /* Tests for deprecated routines */
+ test_genprop_deprec_list(); /* Tests for deprecated routines */
#endif /* H5_NO_DEPRECATED_SYMBOLS */
} /* test_genprop() */