checkpoint basic protover backend

4 files changed, 94 insertions, 0 deletions

diff --git a/src/test/include.am b/src/test/include.am
index 2e91f7c9dc..a64310d918 100644
--- a/src/test/include.am
+++ b/src/test/include.am
@@ -107,6 +107,7 @@ src_test_test_SOURCES = \
 	src/test/test_options.c \
 	src/test/test_policy.c \
 	src/test/test_procmon.c \
+	src/test/test_protover.c \
 	src/test/test_pt.c \
 	src/test/test_pubsub.c \
 	src/test/test_relay.c \
diff --git a/src/test/test.c b/src/test/test.c
index 2f10c7e90b..9a41b976b8 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1214,6 +1214,7 @@ struct testgroup_t testgroups[] = {
   { "options/", options_tests },
   { "policy/" , policy_tests },
   { "procmon/", procmon_tests },
+  { "protover/", protover_tests },
   { "pt/", pt_tests },
   { "relay/" , relay_tests },
   { "relaycell/", relaycell_tests },
diff --git a/src/test/test.h b/src/test/test.h
index c0643e154d..d9ea57d367 100644
--- a/src/test/test.h
+++ b/src/test/test.h
@@ -206,6 +206,7 @@ extern struct testcase_t oos_tests[];
 extern struct testcase_t options_tests[];
 extern struct testcase_t policy_tests[];
 extern struct testcase_t procmon_tests[];
+extern struct testcase_t protover_tests[];
 extern struct testcase_t pubsub_tests[];
 extern struct testcase_t pt_tests[];
 extern struct testcase_t relay_tests[];
diff --git a/src/test/test_protover.c b/src/test/test_protover.c
new file mode 100644
index 0000000000..606ca57b1b
--- /dev/null
+++ b/src/test/test_protover.c
@@ -0,0 +1,91 @@
+/* Copyright (c) 2016, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#define PROTOVER_PRIVATE
+
+#include "orconfig.h"
+#include "test.h"
+
+#include "protover.h"
+
+static void
+test_protover_parse(void *arg)
+{
+  (void) arg;
+  char *re_encoded = NULL;
+
+  const char *orig = "Foo=1,3 Bar=3 Baz= Quux=9-12,14,15-16,900";
+  smartlist_t *elts = parse_protocol_list(orig);
+
+  tt_assert(elts);
+  tt_int_op(smartlist_len(elts), OP_EQ, 4);
+
+  const proto_entry_t *e;
+  const proto_range_t *r;
+  e = smartlist_get(elts, 0);
+  tt_str_op(e->name, OP_EQ, "Foo");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 2);
+  {
+    r = smartlist_get(e->ranges, 0);
+    tt_int_op(r->low, OP_EQ, 1);
+    tt_int_op(r->high, OP_EQ, 1);
+
+    r = smartlist_get(e->ranges, 1);
+    tt_int_op(r->low, OP_EQ, 3);
+    tt_int_op(r->high, OP_EQ, 3);
+  }
+
+  e = smartlist_get(elts, 1);
+  tt_str_op(e->name, OP_EQ, "Bar");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 1);
+  {
+    r = smartlist_get(e->ranges, 0);
+    tt_int_op(r->low, OP_EQ, 3);
+    tt_int_op(r->high, OP_EQ, 3);
+  }
+
+  e = smartlist_get(elts, 2);
+  tt_str_op(e->name, OP_EQ, "Baz");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 0);
+
+  e = smartlist_get(elts, 3);
+  tt_str_op(e->name, OP_EQ, "Quux");
+  tt_int_op(smartlist_len(e->ranges), OP_EQ, 4);
+  {
+    r = smartlist_get(e->ranges, 0);
+    tt_int_op(r->low, OP_EQ, 9);
+    tt_int_op(r->high, OP_EQ, 12);
+
+    r = smartlist_get(e->ranges, 1);
+    tt_int_op(r->low, OP_EQ, 14);
+    tt_int_op(r->high, OP_EQ, 14);
+
+    r = smartlist_get(e->ranges, 2);
+    tt_int_op(r->low, OP_EQ, 15);
+    tt_int_op(r->high, OP_EQ, 16);
+
+    r = smartlist_get(e->ranges, 3);
+    tt_int_op(r->low, OP_EQ, 900);
+    tt_int_op(r->high, OP_EQ, 900);
+  }
+
+  re_encoded = encode_protocol_list(elts);
+  tt_assert(re_encoded);
+  tt_str_op(re_encoded, OP_EQ, orig);
+
+ done:
+  if (elts)
+    SMARTLIST_FOREACH(elts, proto_entry_t *, ent, proto_entry_free(ent));
+  smartlist_free(elts);
+  tor_free(re_encoded);
+}
+
+
+#define PV_TEST(name, flags)                       \
+  { #name, test_protover_ ##name, (flags), NULL, NULL }
+
+struct testcase_t protover_tests[] = {
+  PV_TEST(parse, 0),
+  END_OF_TESTCASES
+};
+