Changes in tester.c [3f6555d:4123da1]

File:

• tester.c (modified) (4 diffs)

tester.c

@@ -16 +16 @@
 int main(int argc, char **argv, char **env)
 {
-  /* initialize a fake ncurses, detached from std{in,out} */
-  FILE *rnull = fopen("/dev/null", "r");
-  FILE *wnull = fopen("/dev/null", "w");
-  newterm("xterm", wnull, rnull);
-  /* initialize global structures */
-  owl_global_init(&g);
+  owl_errqueue_init(owl_global_get_errqueue(&g));
+  owl_obarray_init(&(g.obarray));
+  g.context_stack = NULL;
+  owl_global_push_context(&g, OWL_CTX_STARTUP, NULL, NULL);
 
   numtests = 0;
@@ -33 +31 @@
   numfailures += owl_variable_regtest();
   numfailures += owl_filter_regtest();
+  numfailures += owl_obarray_regtest();
   numfailures += owl_editwin_regtest();
   if (numfailures) {
@@ -38 +37 @@
   }
   printf("1..%d\n", numtests);
-
-  /* probably not necessary, but tear down the screen */
-  endwin();
-  fclose(rnull);
-  fclose(wnull);
-
   return(numfailures);
 }
@@ -300 +293 @@
 }
 
+
+int owl_obarray_regtest(void) {
+  int numfailed = 0;
+  const char *p,*p2;
+
+  owl_obarray oa;
+  owl_obarray_init(&oa);
+
+  printf("# BEGIN testing owl_obarray\n");
+
+  p = owl_obarray_insert(&oa, "test");
+  FAIL_UNLESS("returned string is equal", p && !strcmp(p, "test"));
+  p2 = owl_obarray_insert(&oa, "test");
+  FAIL_UNLESS("returned string is equal", p2 && !strcmp(p2, "test"));
+  FAIL_UNLESS("returned the same string", p2 && p == p2);
+
+  p = owl_obarray_insert(&oa, "test2");
+  FAIL_UNLESS("returned string is equal", p && !strcmp(p, "test2"));
+  p2 = owl_obarray_find(&oa, "test2");
+  FAIL_UNLESS("returned the same string", p2 && !strcmp(p2, "test2"));
+
+  p = owl_obarray_find(&oa, "nothere");
+  FAIL_UNLESS("Didn't find a string that isn't there", p == NULL);
+
+  printf("# END testing owl_obarray (%d failures)\n", numfailed);
+
+  return numfailed;
+}
+
 int owl_editwin_regtest(void) {
   int numfailed = 0;