projects
/
trust_router.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Clean up monitoring format/naming
[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
..
d3ae49c
100644
(file)
--- a/
mon/tests/test_mon_req_encode.c
+++ b/
mon/tests/test_mon_req_encode.c
@@
-8,57
+8,57
@@
#include <string.h>
#include <glib.h>
#include <string.h>
#include <glib.h>
-#include <
tr_mon
.h>
+#include <
mon_internal
.h>
#define JSON_DUMP_OPTS 0
static char *reconfigure()
{
#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);
+
MON_REQ *req =
mon_req_new(NULL, MON_CMD_RECONFIGURE);
+ 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);
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_plain()
{
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);
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;
}
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) {
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++;
}
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);
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;
}
return result;
}
@@
-78,7
+78,7
@@
static char *read_file(const char *filename)
int main(void)
{
char *s = NULL;
int main(void)
{
char *s = NULL;
-
TR_
MON_OPT_TYPE opts[10];
+ MON_OPT_TYPE opts[10];
char *expected = NULL;
// Test reconfigure command
char *expected = NULL;
// Test reconfigure command
@@
-107,7
+107,7
@@
int main(void)
free(expected);
// Test show with many options
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[1] = OPT_TYPE_SHOW_VERSION;
opts[2] = OPT_TYPE_SHOW_UPTIME;
opts[3] = OPT_TYPE_SHOW_TID_REQ_COUNT;