Changeset 8bce750 for filter.c

Timestamp:

Aug 17, 2009, 9:52:16 PM (15 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

e30ed92

Parents:

a2b3289

git-author:

Nelson Elhage <nelhage@mit.edu> (08/17/09 21:51:29)

git-committer:

Nelson Elhage <nelhage@mit.edu> (08/17/09 21:52:16)

Message:

Move all regression tests into tester.c.

File:

• filter.c (modified) (1 diff)

filter.c

@@ -263 +263 @@
   if (f->name) owl_free(f->name);
 }
-
-/**************************************************************************/
-/************************* REGRESSION TESTS *******************************/
-/**************************************************************************/
-
-#ifdef OWL_INCLUDE_REG_TESTS
-
-int owl_filter_test_string(const char * filt, const owl_message *m, int shouldmatch) /* noproto */ {
-  owl_filter f;
-  int ok;
-  int failed = 0;
-  if(owl_filter_init_fromstring(&f, "test-filter", filt)) {
-    printf("not ok can't parse %s\n", filt);
-    failed = 1;
-    goto out;
-  }
-  ok = owl_filter_message_match(&f, m);
-  if((shouldmatch && !ok) || (!shouldmatch && ok)) {
-    printf("not ok match %s (got %d, expected %d)\n", filt, ok, shouldmatch);
-    failed = 1;
-  }
- out:
-  owl_filter_free(&f);
-  if(!failed) {
-    printf("ok %s %s\n", shouldmatch ? "matches" : "doesn't match", filt);
-  }
-  return failed;
-}
-
-
-#include "test.h"
-
-
-int owl_filter_regtest(void) {
-  int numfailed=0;
-  owl_message m;
-  owl_filter f1, f2, f3, f4, f5;
-
-  owl_list_create(&(g.filterlist));
-  owl_message_init(&m);
-  owl_message_set_type_zephyr(&m);
-  owl_message_set_direction_in(&m);
-  owl_message_set_class(&m, "owl");
-  owl_message_set_instance(&m, "tester");
-  owl_message_set_sender(&m, "owl-user");
-  owl_message_set_recipient(&m, "joe");
-  owl_message_set_attribute(&m, "foo", "bar");
-
-#define TEST_FILTER(f, e) do {                          \
-    numtests++;                                         \
-    numfailed += owl_filter_test_string(f, &m, e);      \
-      } while(0)
-
-  TEST_FILTER("true", 1);
-  TEST_FILTER("false", 0);
-  TEST_FILTER("( true )", 1);
-  TEST_FILTER("not false", 1);
-  TEST_FILTER("( true ) or ( false )", 1);
-  TEST_FILTER("true and false", 0);
-  TEST_FILTER("( true or true ) or ( ( false ) )", 1);
-
-  TEST_FILTER("class owl", 1);
-  TEST_FILTER("class ^owl$", 1);
-  TEST_FILTER("instance test", 1);
-  TEST_FILTER("instance ^test$", 0);
-  TEST_FILTER("instance ^tester$", 1);
-
-  TEST_FILTER("foo bar", 1);
-  TEST_FILTER("class owl and instance tester", 1);
-  TEST_FILTER("type ^zephyr$ and direction ^in$ and ( class ^owl$ or instance ^owl$ )", 1);
-
-  /* Order of operations and precedence */
-  TEST_FILTER("not true or false", 0);
-  TEST_FILTER("true or true and false", 0);
-  TEST_FILTER("true and true and false or true", 1);
-  TEST_FILTER("false and false or true", 1);
-  TEST_FILTER("true and false or false", 0);
-
-  owl_filter_init_fromstring(&f1, "f1", "class owl");
-  owl_global_add_filter(&g, &f1);
-  TEST_FILTER("filter f1", 1);
-
-  /* Test recursion prevention */
-  FAIL_UNLESS("self reference", owl_filter_init_fromstring(&f2, "test", "filter test"));
-
-  /* mutual recursion */
-  owl_filter_init_fromstring(&f3, "f3", "filter f4");
-  owl_global_add_filter(&g, &f3);
-  FAIL_UNLESS("mutual recursion",   owl_filter_init_fromstring(&f4, "f4", "filter f3"));
-
-  /* support referencing a filter several times */
-  FAIL_UNLESS("DAG", !owl_filter_init_fromstring(&f5, "dag", "filter f1 or filter f1"));
-
-  return 0;
-}
-
-
-#endif /* OWL_INCLUDE_REG_TESTS */