[tor-commits] [tor/master] Fix obsolete usage of test_{str_}, eq macros

[nickm at torproject.org]

commit 108808e98ebc76bb8859dcaba213ae3e614e7488
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jan 6 15:25:20 2015 -0500

    Fix obsolete usage of test_{str_},eq macros
---
 src/test/test_dir.c |   70 +++++++++++++++++++++++++--------------------------
 1 file changed, 35 insertions(+), 35 deletions(-)

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 9da44ed..c6594f8 100644
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -845,41 +845,41 @@ test_dir_versions(void *arg)
   tt_int_op(VER_RELEASE,OP_EQ, ver1.status);
   tt_str_op("",OP_EQ, ver1.status_tag);
 
-  test_eq(0, tor_version_parse("10.1", &ver1));
-  test_eq(10, ver1.major);
-  test_eq(1, ver1.minor);
-  test_eq(0, ver1.micro);
-  test_eq(0, ver1.patchlevel);
-  test_eq(VER_RELEASE, ver1.status);
-  test_streq("", ver1.status_tag);
-  test_eq(0, tor_version_parse("5.99.999", &ver1));
-  test_eq(5, ver1.major);
-  test_eq(99, ver1.minor);
-  test_eq(999, ver1.micro);
-  test_eq(0, ver1.patchlevel);
-  test_eq(VER_RELEASE, ver1.status);
-  test_streq("", ver1.status_tag);
-  test_eq(0, tor_version_parse("10.1-alpha", &ver1));
-  test_eq(10, ver1.major);
-  test_eq(1, ver1.minor);
-  test_eq(0, ver1.micro);
-  test_eq(0, ver1.patchlevel);
-  test_eq(VER_RELEASE, ver1.status);
-  test_streq("alpha", ver1.status_tag);
-  test_eq(0, tor_version_parse("2.1.700-alpha", &ver1));
-  test_eq(2, ver1.major);
-  test_eq(1, ver1.minor);
-  test_eq(700, ver1.micro);
-  test_eq(0, ver1.patchlevel);
-  test_eq(VER_RELEASE, ver1.status);
-  test_streq("alpha", ver1.status_tag);
-  test_eq(0, tor_version_parse("1.6.8-alpha-dev", &ver1));
-  test_eq(1, ver1.major);
-  test_eq(6, ver1.minor);
-  test_eq(8, ver1.micro);
-  test_eq(0, ver1.patchlevel);
-  test_eq(VER_RELEASE, ver1.status);
-  test_streq("alpha-dev", ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("10.1", &ver1));
+  tt_int_op(10, OP_EQ, ver1.major);
+  tt_int_op(1, OP_EQ, ver1.minor);
+  tt_int_op(0, OP_EQ, ver1.micro);
+  tt_int_op(0, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("5.99.999", &ver1));
+  tt_int_op(5, OP_EQ, ver1.major);
+  tt_int_op(99, OP_EQ, ver1.minor);
+  tt_int_op(999, OP_EQ, ver1.micro);
+  tt_int_op(0, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("10.1-alpha", &ver1));
+  tt_int_op(10, OP_EQ, ver1.major);
+  tt_int_op(1, OP_EQ, ver1.minor);
+  tt_int_op(0, OP_EQ, ver1.micro);
+  tt_int_op(0, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("alpha", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("2.1.700-alpha", &ver1));
+  tt_int_op(2, OP_EQ, ver1.major);
+  tt_int_op(1, OP_EQ, ver1.minor);
+  tt_int_op(700, OP_EQ, ver1.micro);
+  tt_int_op(0, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("alpha", OP_EQ, ver1.status_tag);
+  tt_int_op(0, OP_EQ, tor_version_parse("1.6.8-alpha-dev", &ver1));
+  tt_int_op(1, OP_EQ, ver1.major);
+  tt_int_op(6, OP_EQ, ver1.minor);
+  tt_int_op(8, OP_EQ, ver1.micro);
+  tt_int_op(0, OP_EQ, ver1.patchlevel);
+  tt_int_op(VER_RELEASE, OP_EQ, ver1.status);
+  tt_str_op("alpha-dev", OP_EQ, ver1.status_tag);
 
 #define tt_versionstatus_op(vs1, op, vs2)                               \
   tt_assert_test_type(vs1,vs2,#vs1" "#op" "#vs2,version_status_t,       \