Enforce numeric application IDs

[src/app-framework-main.git] / src / tests / test-unit / test-unit.c

diff --git a/src/tests/test-unit/test-unit.c b/src/tests/test-unit/test-unit.c
index 5912dbc..a879a12 100644 (file)
--- a/src/tests/test-unit/test-unit.c
+++ b/src/tests/test-unit/test-unit.c
@@ -1,5 +1,5 @@
 /*
- Copyright 2016, 2017 IoT.bzh
+ Copyright (C) 2016-2019 IoT.bzh
 
  author: José Bollo <jose.bollo@iot.bzh>
 
@@ -46,7 +46,8 @@ static int processunit(const struct unitdesc *desc)
        const char *content = desc->content;
 
 printf("\n##########################################################");
-printf("\n### usr=%d sys=%d soc=%d srv=%d    name  %s%s", isuser, issystem, issock, isserv, name?:"?", issock?".socket":isserv?".service":"");
+printf("\n### usr=%d sys=%d soc=%d srv=%d    name  %s%s", isuser, issystem, issock,
+                       isserv, name?:"?", issock?".socket":isserv?".service":"");
 printf("\n##########################################################");
 printf("\n%s\n\n",content);
        return 0;
@@ -55,11 +56,21 @@ printf("\n%s\n\n",content);
 static int process(void *closure, const struct generatedesc *desc)
 {
        int i;
+printf("\n##########################################################");
+printf("\n###### J S O N D E S C    AFTER                    #######");
+printf("\n##########################################################");
+puts(json_object_to_json_string_ext(desc->desc, JSON_C_TO_STRING_PRETTY));
        for (i = 0 ; i < desc->nunits ; i++)
                processunit(&desc->units[i]);
        return 0;
 }
 
+static int new_afid()
+{
+       static int r = 1;
+       return r++;
+}
+
 int main(int ac, char **av)
 {
        struct unitconf conf;
@@ -68,8 +79,9 @@ int main(int ac, char **av)
 
        conf.installdir = "INSTALL-DIR";
        conf.icondir = "ICONS-DIR";
-       conf.port = 666;
-       rc = unit_generator_on(*++av);
+       conf.new_afid = new_afid;
+       conf.base_http_ports = 20000;
+       rc = unit_generator_open_template(*++av);
        if (rc < 0)
                error("can't read template %s: %m",*av);
        while(*++av) {
@@ -77,7 +89,10 @@ int main(int ac, char **av)
                if (!obj)
                        error("can't read widget config at %s: %m",*av);
 
-               puts(json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PRETTY));
+printf("\n##########################################################");
+printf("\n###### J S O N D E S C    BEFORE                   #######");
+printf("\n##########################################################");
+puts(json_object_to_json_string_ext(obj, JSON_C_TO_STRING_PRETTY));
                rc = unit_generator_process(obj, &conf, process, NULL);
                if (rc)
                        error("can't apply generate units, error %d",rc);