Merge pull request #99 from painless-security/jennifer/count_failed_reqs

[trust_router.git] / mon / tests / test_mon_req_encode.c

diff --git a/mon/tests/test_mon_req_encode.c b/mon/tests/test_mon_req_encode.c
index 60fe9ca..9fe9b1b 100644 (file)
--- a/mon/tests/test_mon_req_encode.c
+++ b/mon/tests/test_mon_req_encode.c
@@ -8,57 +8,44 @@
 #include <string.h>
 #include <glib.h>
 
-#include <tr_mon.h>
+#include <mon_internal.h>
 
 #define JSON_DUMP_OPTS 0
 
-static char *reconfigure()
-{
-  TR_MON_REQ *req = tr_mon_req_new(NULL, MON_CMD_RECONFIGURE);
-  json_t *req_json = tr_mon_req_encode(req);
-  char *result = json_dumps(req_json, JSON_DUMP_OPTS);
-  assert(req);
-  assert(req_json);
-  assert(result);
-  json_decref(req_json);
-  tr_mon_req_free(req);
-  return result;
-}
-
 static char *show_plain()
 {
-  TR_MON_REQ *req = tr_mon_req_new(NULL, MON_CMD_SHOW);
-  json_t *req_json = tr_mon_req_encode(req);
+  MON_REQ *req = mon_req_new(NULL, MON_CMD_SHOW);
+  json_t *req_json = mon_req_encode(req);
   char *result = json_dumps(req_json, JSON_DUMP_OPTS);
   assert(req);
   assert(req_json);
   assert(result);
   json_decref(req_json);
-  tr_mon_req_free(req);
+  mon_req_free(req);
   return result;
 }
 
-static char *show_options(const TR_MON_OPT_TYPE *opts)
+static char *show_options(const MON_OPT_TYPE *opts)
 {
-  TR_MON_REQ *req = tr_mon_req_new(NULL, MON_CMD_SHOW);
+  MON_REQ *req = mon_req_new(NULL, MON_CMD_SHOW);
   json_t *req_json = NULL;
   char *result = NULL;
 
   assert(req);
 
   while (*opts != OPT_TYPE_UNKNOWN) {
-    assert(TR_MON_SUCCESS == tr_mon_req_add_option(req, *opts));
+    assert(MON_SUCCESS == mon_req_add_option(req, *opts));
     opts++;
   }
 
-  req_json = tr_mon_req_encode(req);
+  req_json = mon_req_encode(req);
   assert(req_json);
 
   result = json_dumps(req_json, JSON_DUMP_OPTS);
   assert(result);
 
   json_decref(req_json);
-  tr_mon_req_free(req);
+  mon_req_free(req);
   return result;
 }
 
@@ -78,17 +65,9 @@ static char *read_file(const char *filename)
 int main(void)
 {
   char *s = NULL;
-  TR_MON_OPT_TYPE opts[10];
+  MON_OPT_TYPE opts[10];
   char *expected = NULL;
 
-  // Test reconfigure command
-  s = reconfigure();
-  expected = read_file("req_reconfigure.test");
-  assert(expected);
-  assert(strcmp(expected, s) == 0);
-  free(s);
-  free(expected);
-
   // Test show without options
   s = show_plain();
   expected = read_file("req_show_no_options.test");
@@ -107,11 +86,11 @@ int main(void)
   free(expected);
 
   // Test show with many options
-  opts[0] = OPT_TYPE_SHOW_SERIAL;
+  opts[0] = OPT_TYPE_SHOW_CONFIG_FILES;
   opts[1] = OPT_TYPE_SHOW_VERSION;
   opts[2] = OPT_TYPE_SHOW_UPTIME;
-  opts[3] = OPT_TYPE_SHOW_TID_REQ_COUNT;
-  opts[4] = OPT_TYPE_SHOW_TID_REQ_PENDING;
+  opts[3] = OPT_TYPE_SHOW_TID_REQS_PROCESSED;
+  opts[4] = OPT_TYPE_SHOW_TID_REQS_PENDING;
   opts[5] = OPT_TYPE_SHOW_ROUTES;
   opts[6] = OPT_TYPE_SHOW_COMMUNITIES;
   opts[7] = OPT_TYPE_UNKNOWN;