You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@apr.apache.org by yl...@apache.org on 2014/07/16 19:42:22 UTC
svn commit: r1611110 - /apr/apr/trunk/test/testskiplist.c
Author: ylavic
Date: Wed Jul 16 17:42:22 2014
New Revision: 1611110
URL: http://svn.apache.org/r1611110
Log:
Improve skiplist tests.
Modified:
apr/apr/trunk/test/testskiplist.c
Modified: apr/apr/trunk/test/testskiplist.c
URL: http://svn.apache.org/viewvc/apr/apr/trunk/test/testskiplist.c?rev=1611110&r1=1611109&r2=1611110&view=diff
==============================================================================
--- apr/apr/trunk/test/testskiplist.c (original)
+++ apr/apr/trunk/test/testskiplist.c Wed Jul 16 17:42:22 2014
@@ -30,6 +30,201 @@
#include <string.h>
#endif
+static apr_pool_t *ptmp = NULL;
+static apr_skiplist *skiplist = NULL;
+
+/* apr_skiplist_size() is missing in 1.5.x, wrap it */
+static int apr_skiplist_size(apr_skiplist *sl)
+{
+ int size = 0;
+ apr_skiplistnode *n;
+ for (n = apr_skiplist_getlist(sl); n; apr_skiplist_next(sl, &n)) {
+ ++size;
+ }
+ return size;
+}
+
+static void skiplist_init(abts_case *tc, void *data)
+{
+ apr_time_t now = apr_time_now();
+ srand((unsigned int)(((now >> 32) ^ now) & 0xffffffff));
+
+ ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&skiplist, p));
+ ABTS_PTR_NOTNULL(tc, skiplist);
+ apr_skiplist_set_compare(skiplist, (void*)strcmp, (void*)strcmp);
+}
+
+static void skiplist_find(abts_case *tc, void *data)
+{
+ const char *val;
+
+ apr_skiplist_insert(skiplist, "baton");
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "baton", val);
+}
+
+static void skiplist_dontfind(abts_case *tc, void *data)
+{
+ const char *val;
+
+ val = apr_skiplist_find(skiplist, "keynotthere", NULL);
+ ABTS_PTR_EQUAL(tc, NULL, (void *)val);
+}
+
+static void skiplist_insert(abts_case *tc, void *data)
+{
+ const char *val;
+ int i;
+
+ for (i = 0; i < 10; ++i) {
+ apr_skiplist_insert(skiplist, "baton");
+ ABTS_INT_EQUAL(tc, 1, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "baton", val);
+ }
+
+ apr_skiplist_insert(skiplist, "foo");
+ ABTS_INT_EQUAL(tc, 2, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "foo", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "foo", val);
+}
+
+static void skiplist_add(abts_case *tc, void *data)
+{
+ const char *val;
+ size_t i, n = apr_skiplist_size(skiplist);
+
+ for (i = 0; i < 100; ++i) {
+ n++;
+ apr_skiplist_add(skiplist, "daton");
+ ABTS_INT_EQUAL(tc, n, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "daton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "daton", val);
+
+ n++;
+ apr_skiplist_add(skiplist, "baton");
+ ABTS_INT_EQUAL(tc, n, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "baton", val);
+
+ n++;
+ apr_skiplist_add(skiplist, "caton");
+ ABTS_INT_EQUAL(tc, n, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "caton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "caton", val);
+
+ n++;
+ apr_skiplist_add(skiplist, "aaton");
+ ABTS_INT_EQUAL(tc, n, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "aaton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "aaton", val);
+ }
+}
+
+static void skiplist_destroy(abts_case *tc, void *data)
+{
+ apr_skiplist_destroy(skiplist, NULL);
+ ABTS_INT_EQUAL(tc, 0, apr_skiplist_size(skiplist));
+}
+
+static void skiplist_size(abts_case *tc, void *data)
+{
+ const char *val;
+
+ ABTS_INT_EQUAL(tc, 0, apr_skiplist_size(skiplist));
+
+ apr_skiplist_insert(skiplist, "abc");
+ apr_skiplist_insert(skiplist, "ghi");
+ apr_skiplist_insert(skiplist, "def");
+ val = apr_skiplist_find(skiplist, "abc", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "abc", val);
+ val = apr_skiplist_find(skiplist, "ghi", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "ghi", val);
+ val = apr_skiplist_find(skiplist, "def", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "def", val);
+
+ ABTS_INT_EQUAL(tc, 3, apr_skiplist_size(skiplist));
+ apr_skiplist_destroy(skiplist, NULL);
+}
+
+static void skiplist_remove(abts_case *tc, void *data)
+{
+ const char *val;
+
+ ABTS_INT_EQUAL(tc, 0, apr_skiplist_size(skiplist));
+
+ apr_skiplist_add(skiplist, "baton");
+ ABTS_INT_EQUAL(tc, 1, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "baton", val);
+
+ apr_skiplist_add(skiplist, "baton");
+ ABTS_INT_EQUAL(tc, 2, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "baton", val);
+
+ apr_skiplist_remove(skiplist, "baton", NULL);
+ ABTS_INT_EQUAL(tc, 1, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "baton", val);
+
+ apr_skiplist_add(skiplist, "baton");
+ ABTS_INT_EQUAL(tc, 2, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, "baton", val);
+
+ /* remove all "baton"s */
+ while (apr_skiplist_remove(skiplist, "baton", NULL))
+ ;
+ ABTS_INT_EQUAL(tc, 0, apr_skiplist_size(skiplist));
+ val = apr_skiplist_find(skiplist, "baton", NULL);
+ ABTS_PTR_EQUAL(tc, NULL, val);
+}
+
+#define NUM_RAND (100)
+#define NUM_FIND (3 * NUM_RAND)
+static void skiplist_random_loop(abts_case *tc, void *data)
+{
+ char **batons;
+ apr_skiplist *sl;
+ const char *val;
+ int i;
+
+ ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&sl, ptmp));
+ apr_skiplist_set_compare(sl, (void*)strcmp, (void*)strcmp);
+ batons = apr_palloc(ptmp, NUM_FIND * sizeof(char*));
+
+ for (i = 0; i < NUM_FIND; ++i) {
+ if (i < NUM_RAND) {
+ batons[i] = apr_psprintf(ptmp, "%.6u", rand() % 1000000);
+ }
+ else {
+ batons[i] = apr_pstrdup(ptmp, batons[i % NUM_RAND]);
+ }
+ apr_skiplist_add(sl, batons[i]);
+ val = apr_skiplist_find(sl, batons[i], NULL);
+ ABTS_PTR_NOTNULL(tc, val);
+ ABTS_STR_EQUAL(tc, batons[i], val);
+ }
+
+ apr_pool_clear(ptmp);
+}
+
+
static void add_int_to_skiplist(apr_skiplist *list, int n){
int* a = apr_skiplist_alloc(list, sizeof(int));
*a = n;
@@ -40,7 +235,6 @@ static int comp(void *a, void *b){
return *((int*) a) - *((int*) b);
}
-
static int compk(void *a, void *b){
return comp(a, b);
}
@@ -50,10 +244,8 @@ static void skiplist_test(abts_case *tc,
int i = 0, j = 0;
int *val = NULL;
apr_skiplist * list = NULL;
- apr_pool_t *p;
- apr_pool_create(&p, NULL);
- apr_skiplist_init(&list, p);
+ ABTS_INT_EQUAL(tc, APR_SUCCESS, apr_skiplist_init(&list, ptmp));
apr_skiplist_set_compare(list, comp, compk);
/* insert 10 objects */
@@ -87,14 +279,31 @@ static void skiplist_test(abts_case *tc,
/* empty */
val = apr_skiplist_pop(list, NULL);
ABTS_PTR_EQUAL(tc, val, NULL);
+
+ apr_pool_clear(ptmp);
}
+
abts_suite *testskiplist(abts_suite *suite)
{
suite = ADD_SUITE(suite)
+ apr_pool_create(&ptmp, p);
+
+ abts_run_test(suite, skiplist_init, NULL);
+ abts_run_test(suite, skiplist_find, NULL);
+ abts_run_test(suite, skiplist_dontfind, NULL);
+ abts_run_test(suite, skiplist_insert, NULL);
+ abts_run_test(suite, skiplist_add, NULL);
+ abts_run_test(suite, skiplist_destroy, NULL);
+ abts_run_test(suite, skiplist_size, NULL);
+ abts_run_test(suite, skiplist_remove, NULL);
+ abts_run_test(suite, skiplist_random_loop, NULL);
+
abts_run_test(suite, skiplist_test, NULL);
+ apr_pool_destroy(ptmp);
+
return suite;
}