Merge pull request #20129 from bergzand/pr/mjson/initial

mjson: Initial include of package

pkg/Kconfig

@@ -54,6 +54,7 @@ rsource "micro-ecc/Kconfig"
 rsource "microcoap/Kconfig"
 rsource "micropython/Kconfig"
 rsource "minmea/Kconfig"
+rsource "mjson/Kconfig"
 rsource "monocypher/Kconfig"
 rsource "mynewt-core/Kconfig"
 rsource "nanocbor/Kconfig"

pkg/mjson/Kconfig

@@ -0,0 +1,9 @@
+# Copyright (c) 2023 Koen Zandberg
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+
+config PACKAGE_MJSON
+    bool "mjson"
+    depends on TEST_KCONFIG

pkg/mjson/Makefile

@@ -0,0 +1,10 @@
+PKG_NAME=mjson
+PKG_URL=https://github.com/cesanta/mjson
+# v1.2.7
+PKG_VERSION=032a2eaca1a989e56d88218f2a3cb91a68afebe8
+PKG_LICENSE=MIT
+
+include $(RIOTBASE)/pkg/pkg.mk
+
+all:
+	$(QQ)"$(MAKE)" -C $(PKG_SOURCE_DIR)/src -f $(CURDIR)/$(PKG_NAME).mk

pkg/mjson/Makefile.include

@@ -0,0 +1 @@
+INCLUDES += -I$(PKGDIRBASE)/mjson/src

pkg/mjson/doc.txt

@@ -0,0 +1,16 @@
+/**
+ * @defgroup pkg_mjson   mjson
+ * @ingroup  pkg
+ * @brief    mjson - a JSON parser + emitter + JSON-RPC engine
+ *
+ * # Introduction
+ *
+ * mjson is a small, embedded-friendly JSON parser, emitter and JSON-RPC
+ * engine.
+ *
+ * # License
+ *
+ * Licensed under MIT.
+ *
+ * @see      https://github.com/cesanta/mjson
+ */

pkg/mjson/mjson.mk

@@ -0,0 +1,7 @@
+MODULE = mjson
+
+# The mjson_merge function requires an alloca implementation, disabled to
+# prevent stack memory allocations
+CFLAGS += -DMJSON_ENABLE_MERGE=0
+
+include $(RIOTBASE)/Makefile.base

tests/pkg/mjson/Makefile

@@ -0,0 +1,6 @@
+include ../Makefile.pkg_common
+
+USEMODULE += embunit
+USEPKG += mjson
+
+include $(RIOTBASE)/Makefile.include

tests/pkg/mjson/Makefile.ci

@@ -0,0 +1,6 @@
+BOARD_INSUFFICIENT_MEMORY := \
+    atmega8 \
+    nucleo-l011k4 \
+    samd10-xmini \
+    stm32f030f4-demo \
+    #

tests/pkg/mjson/app.config.test

@@ -0,0 +1,2 @@
+CONFIG_MODULE_EMBUNIT=y
+CONFIG_PACKAGE_MJSON=y

tests/pkg/mjson/main.c

@@ -0,0 +1,80 @@
+/*
+ * Copyright (C) 2023 Koen Zandberg
+ *
+ * This file is subject to the terms and conditions of the GNU Lesser
+ * General Public License v2.1. See the file LICENSE in the top level
+ * directory for more details.
+ */
+
+/**
+ * @ingroup     tests
+ * @{
+ *
+ * @file
+ * @brief       Test application for mjson
+ *
+ * @author      Koen Zandberg <koen@bergzand.net>
+ *
+ * @}
+ */
+
+#include <stdio.h>
+#include "embUnit.h"
+#include "mjson.h"
+
+void test_mjson_encode(void)
+{
+    /* Print into a statically allocated buffer */
+    char buf[100];
+    mjson_snprintf(buf, sizeof(buf), "{%Q:%d}", "a", 123);
+
+    static const char expected[] = "{\"a\":123}";
+
+    TEST_ASSERT_EQUAL_INT(0, strcmp(expected, buf));
+}
+
+void test_mjson_decode(void)
+{
+    static const char input[] = "{\"a\":1,\"b\":[2,false]}";  /* {"a":1,"b":[2,false]} */
+
+    double dval = 0;
+    int res = mjson_get_number(input, strlen(input), "$.a", &dval);
+    TEST_ASSERT_EQUAL_INT(1, res);
+    TEST_ASSERT_EQUAL_INT(1, dval);
+
+    const char *buf;
+    int buf_len;
+    res = mjson_find(input, strlen(input), "$.b", &buf, &buf_len);
+    TEST_ASSERT_EQUAL_INT(91, res);
+    TEST_ASSERT_EQUAL_INT(0, memcmp(buf, "[2,false]", buf_len));
+
+    res = mjson_get_number(input, strlen(input), "$.b[0]", &dval);
+    TEST_ASSERT_EQUAL_INT(1, res);
+    TEST_ASSERT_EQUAL_INT(2, dval);
+
+    int ival = 0;
+    res = mjson_get_bool(input, strlen(input), "$.b[1]", &ival);
+    TEST_ASSERT_EQUAL_INT(1, res);
+    TEST_ASSERT_EQUAL_INT(0, ival);
+
+}
+
+Test *tests_mjson(void)
+{
+    EMB_UNIT_TESTFIXTURES(fixtures) {
+        new_TestFixture(test_mjson_encode),
+        new_TestFixture(test_mjson_decode),
+    };
+
+    EMB_UNIT_TESTCALLER(mjson_tests, NULL, NULL, fixtures);
+    return (Test*)&mjson_tests;
+}
+
+int main(void)
+{
+    TESTS_START();
+    TESTS_RUN(tests_mjson());
+    TESTS_END();
+
+    return 0;
+}

tests/pkg/mjson/tests/01-run.py

@@ -0,0 +1,14 @@
+#!/usr/bin/env python3
+
+# Copyright (C) 2023 Koen Zandberg
+#
+# This file is subject to the terms and conditions of the GNU Lesser
+# General Public License v2.1. See the file LICENSE in the top level
+# directory for more details.
+
+import sys
+from testrunner import run_check_unittests
+
+
+if __name__ == "__main__":
+    sys.exit(run_check_unittests())