[tor-commits] [tor/master] Add some unit tests.

[nickm@xxxxxxxxxxxxxx]

commit ce419a78c56e38fedcb3bce66fc08283648aed9f
Author: George Kadianakis <desnacked@xxxxxxxxx>
Date:   Wed Jul 13 19:06:14 2011 +0200

    Add some unit tests.
---
 src/test/Makefile.am |    1 +
 src/test/test.c      |    2 +
 src/test/test_pt.c   |  149 ++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 152 insertions(+), 0 deletions(-)

diff --git a/src/test/Makefile.am b/src/test/Makefile.am
index a4f93d1..0597b65 100644
--- a/src/test/Makefile.am
+++ b/src/test/Makefile.am
@@ -19,6 +19,7 @@ test_SOURCES = \
 	test_data.c \
 	test_dir.c \
 	test_microdesc.c \
+	test_pt.c \
 	test_util.c \
 	tinytest.c
 
diff --git a/src/test/test.c b/src/test/test.c
index e2f8b11..6aba200 100644
--- a/src/test/test.c
+++ b/src/test/test.c
@@ -1261,6 +1261,7 @@ extern struct testcase_t container_tests[];
 extern struct testcase_t util_tests[];
 extern struct testcase_t dir_tests[];
 extern struct testcase_t microdesc_tests[];
+extern struct testcase_t pt_tests[];
 
 static struct testgroup_t testgroups[] = {
   { "", test_array },
@@ -1270,6 +1271,7 @@ static struct testgroup_t testgroups[] = {
   { "util/", util_tests },
   { "dir/", dir_tests },
   { "dir/md/", microdesc_tests },
+  { "pt/", pt_tests },
   END_OF_GROUPS
 };
 
diff --git a/src/test/test_pt.c b/src/test/test_pt.c
new file mode 100644
index 0000000..02950b8
--- /dev/null
+++ b/src/test/test_pt.c
@@ -0,0 +1,149 @@
+/* Copyright (c) 2001-2004, Roger Dingledine.
+ * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson.
+ * Copyright (c) 2007-2011, The Tor Project, Inc. */
+/* See LICENSE for licensing information */
+
+#include "orconfig.h"
+#define PT_PRIVATE
+#include "or.h"
+#include "pluggable_transports.h"
+#include "circuitbuild.h"
+#include "test.h"
+
+static void
+reset_mp(managed_proxy_t *mp)
+{
+  mp->conf_state = PT_PROTO_INFANT;
+  SMARTLIST_FOREACH(mp->transports, transport_t *, t, transport_free(t));
+  smartlist_clear(mp->transports);
+  smartlist_free(mp->transports);
+  mp->transports = smartlist_create();
+}
+
+static void
+test_pt_parsing(void)
+{
+  char line[200];
+
+  managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t));
+  mp->conf_state = PT_PROTO_INFANT;
+  mp->transports = smartlist_create();
+
+  /* incomplete cmethod */
+  strcpy(line,"CMETHOD trebuchet");
+  test_assert(parse_cmethod_line(line, mp) < 0);
+
+  reset_mp(mp);
+
+  /* wrong proxy type */
+  strcpy(line,"CMETHOD trebuchet dog 127.0.0.1:1999");
+  test_assert(parse_cmethod_line(line, mp) < 0);
+
+  reset_mp(mp);
+
+  /* wrong addrport */
+  strcpy(line,"CMETHOD trebuchet socks4 abcd");
+  test_assert(parse_cmethod_line(line, mp) < 0);
+
+  reset_mp(mp);
+
+  /* correct line */
+  strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999");
+  test_assert(parse_cmethod_line(line, mp) == 0);
+  test_assert(smartlist_len(mp->transports));
+
+  reset_mp(mp);
+
+  /* incomplete smethod */
+  strcpy(line,"SMETHOD trebuchet");
+  test_assert(parse_smethod_line(line, mp) < 0);
+
+  reset_mp(mp);
+
+  /* wrong addr type */
+  strcpy(line,"SMETHOD trebuchet abcd");
+  test_assert(parse_smethod_line(line, mp) < 0);
+
+  reset_mp(mp);
+
+  /* cowwect */
+  strcpy(line,"SMETHOD trebuchy 127.0.0.1:1999");
+  test_assert(parse_smethod_line(line, mp) == 0);
+
+  reset_mp(mp);
+
+  /* unsupported version */
+  strcpy(line,"VERSION 666");
+  test_assert(parse_version(line, mp) < 0);
+
+  /* incomplete VERSION */
+  strcpy(line,"VERSION ");
+  test_assert(parse_version(line, mp) < 0);
+
+  /* correct VERSION */
+  strcpy(line,"VERSION 1");
+  test_assert(parse_version(line, mp) == 0);
+
+ done:
+  tor_free(mp);
+}
+
+static void
+test_pt_protocol(void)
+{
+  char line[200];
+
+  managed_proxy_t *mp = tor_malloc(sizeof(managed_proxy_t));
+  mp->conf_state = PT_PROTO_INFANT;
+  mp->transports = smartlist_create();
+
+  /* various wrong protocol runs: */
+
+  strcpy(line, "TEST TEST");
+  handle_proxy_line(line, mp);
+  test_assert(mp->conf_state == PT_PROTO_BROKEN);
+
+  reset_mp(mp);
+
+  strcpy(line,"VERSION 1");
+  handle_proxy_line(line, mp);
+  test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS);
+
+  strcpy(line,"VERSION 1");
+  handle_proxy_line(line, mp);
+  test_assert(mp->conf_state == PT_PROTO_BROKEN);
+
+  reset_mp(mp);
+
+  strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999");
+  handle_proxy_line(line, mp);
+  test_assert(mp->conf_state == PT_PROTO_BROKEN);
+
+  reset_mp(mp);
+
+  /* correct protocol run: */
+  strcpy(line,"VERSION 1");
+  handle_proxy_line(line, mp);
+  test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS);
+
+  strcpy(line,"CMETHOD trebuchet socks5 127.0.0.1:1999");
+  handle_proxy_line(line, mp);
+  test_assert(mp->conf_state == PT_PROTO_ACCEPTING_METHODS);
+
+  strcpy(line,"CMETHODS DONE");
+  handle_proxy_line(line, mp);
+  test_assert(mp->conf_state == PT_PROTO_CONFIGURED);
+
+ done:
+  tor_free(mp);
+}
+
+#define PT_LEGACY(name)                                               \
+  { #name, legacy_test_helper, 0, &legacy_setup, test_pt_ ## name }
+
+struct testcase_t pt_tests[] = {
+  PT_LEGACY(parsing),
+  PT_LEGACY(protocol),
+  END_OF_TESTCASES
+};
+



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits