Merge pull request #86 from painless-security/jennifer/aaa_server_port

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

diff --git a/mon/tests/test_mon_resp_encode.c b/mon/tests/test_mon_resp_encode.c
index 9f9a3bb..c9d6d2c 100644 (file)
--- a/mon/tests/test_mon_resp_encode.c
+++ b/mon/tests/test_mon_resp_encode.c
@@ -7,87 +7,52 @@
 #include <assert.h>
 #include <string.h>
 
-#include <tr_mon.h>
+#include <mon_internal.h>
 
 #define JSON_DUMP_OPTS 0
 
-static char *reconfigure(TR_MON_RESP_CODE code, const char *message)
-{
-  TR_MON_REQ *req = NULL;
-  TR_MON_RESP *resp = NULL;
-  json_t *resp_json = NULL;
-  char *result = NULL;
-
-  req = tr_mon_req_new(NULL, MON_CMD_RECONFIGURE);
-  assert(req);
-
-  resp = tr_mon_resp_new(NULL, req, code, message, NULL);
-  assert(resp);
-
-  resp_json = tr_mon_resp_encode(resp);
-  assert(resp_json);
-
-  result = json_dumps(resp_json, JSON_DUMP_OPTS);
-  assert(result);
-
-  json_decref(resp_json);
-  tr_mon_resp_free(resp);
-  tr_mon_req_free(req);
-  return result;
-}
-
-static char *reconfigure_success()
-{
-  return reconfigure(MON_RESP_SUCCESS, "success");
-}
-
-static char *reconfigure_error()
-{
-  return reconfigure(MON_RESP_ERROR, "error");
-}
-
 static char *show_success()
 {
-  TR_MON_REQ *req = NULL;
-  TR_MON_RESP *resp = NULL;
+  MON_REQ *req = NULL;
+  MON_RESP *resp = NULL;
   json_t *resp_json = NULL;
   json_t *payload = NULL;
   char *result = NULL;
 
-  req = tr_mon_req_new(NULL, MON_CMD_SHOW);
+  req = mon_req_new(NULL, MON_CMD_SHOW);
   // Only need the command to be set in req, don't actually need the options
   assert(req);
 
   payload = json_object();
   assert(payload);
   assert(! json_object_set_new(payload,
-                               opt_type_to_string(OPT_TYPE_SHOW_VERSION),
+                               mon_opt_type_to_string(OPT_TYPE_SHOW_VERSION),
                                json_string("1.2.3-4")));
   assert(! json_object_set_new(payload,
-                               opt_type_to_string(OPT_TYPE_SHOW_SERIAL),
+                               mon_opt_type_to_string(OPT_TYPE_SHOW_CONFIG_FILES),
                                json_integer(1234567890)));
   assert(! json_object_set_new(payload,
-                               opt_type_to_string(OPT_TYPE_SHOW_SERIAL),
+                               mon_opt_type_to_string(OPT_TYPE_SHOW_CONFIG_FILES),
                                json_integer(86400)));
   assert(! json_object_set_new(payload,
-                               opt_type_to_string(OPT_TYPE_SHOW_TID_REQ_PENDING),
+                               mon_opt_type_to_string(OPT_TYPE_SHOW_TID_REQ_PENDING),
                                json_integer(13)));
   assert(! json_object_set_new(payload,
-                               opt_type_to_string(OPT_TYPE_SHOW_TID_REQ_COUNT),
+                               mon_opt_type_to_string(OPT_TYPE_SHOW_TID_REQ_COUNT),
                                json_integer(1432)));
 
-  resp = tr_mon_resp_new(NULL, req, MON_RESP_SUCCESS, "success", payload);
+  resp = mon_resp_new(NULL, MON_RESP_SUCCESS, "success", payload);
   assert(resp);
 
-  resp_json = tr_mon_resp_encode(resp);
+  resp_json = mon_resp_encode(resp);
   assert(resp_json);
 
   result = json_dumps(resp_json, JSON_DUMP_OPTS);
   assert(result);
 
   json_decref(resp_json);
-  tr_mon_resp_free(resp);
-  tr_mon_req_free(req);
+  mon_resp_free(resp);
+  mon_req_free(req);
   return result;
 }
 
@@ -123,8 +88,6 @@ int run_test(const char *filename, char *(generator)())
 
 int main(void)
 {
-  assert(run_test("resp_reconfigure_success.test", reconfigure_success));
-  assert(run_test("resp_reconfigure_error.test", reconfigure_error));
   assert(run_test("resp_show_success.test", show_success));
   return 0;
 }