Changeset ce68f23 for tester.c

Timestamp:

Jun 25, 2011, 3:26:16 AM (13 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.8, release-1.9

Children:

c266281

Parents:

3cdd6d2

git-author:

David Benjamin <davidben@mit.edu> (06/11/11 20:06:46)

git-committer:

David Benjamin <davidben@mit.edu> (06/25/11 03:26:16)

Message:

Make owl_dict_get_keys return a GPtrArray

Almost all the remaining uses of owl_list are tightly coupled into this
one giant blob.

File:

• tester.c (modified) (2 diffs)

tester.c

@@ -230 +230 @@
 int owl_dict_regtest(void) {
   owl_dict d;
-  owl_list l;
+  GPtrArray *l;
   int numfailed=0;
   char *av = g_strdup("aval"), *bv = g_strdup("bval"), *cv = g_strdup("cval"),
@@ -251 +251 @@
 
   FAIL_UNLESS("get_size", 3==owl_dict_get_size(&d));
-  owl_list_create(&l);
-  owl_dict_get_keys(&d, &l);
-  FAIL_UNLESS("get_keys result size", 3==owl_list_get_size(&l));
+  l = owl_dict_get_keys(&d);
+  FAIL_UNLESS("get_keys result size", 3 == l->len);
   
   /* these assume the returned keys are sorted */
-  FAIL_UNLESS("get_keys result val",0==strcmp("a",owl_list_get_element(&l,0)));
-  FAIL_UNLESS("get_keys result val",0==strcmp("b",owl_list_get_element(&l,1)));
-  FAIL_UNLESS("get_keys result val",0==strcmp("c",owl_list_get_element(&l,2)));
-
-  owl_list_cleanup(&l, g_free);
+  FAIL_UNLESS("get_keys result val", 0 == strcmp("a", l->pdata[0]));
+  FAIL_UNLESS("get_keys result val", 0 == strcmp("b", l->pdata[1]));
+  FAIL_UNLESS("get_keys result val", 0 == strcmp("c", l->pdata[2]));
+
+  owl_ptr_array_free(l, g_free);
   owl_dict_cleanup(&d, NULL);