[Commits] 890e027: MDEV-5313 Improving audit api.

Alexey Botchkov holyfoot at askmonty.org
Thu Jan 17 08:30:50 EET 2019


revision-id: 890e0278706768e18b28582329418c8943d6a6bd (mariadb-10.4.1-94-g890e027)
parent(s): 294d9bf2484abfd3409d4ac25a3b3b695d66b0ec
committer: Alexey Botchkov
timestamp: 2019-01-17 10:30:09 +0400
message:

MDEV-5313 Improving audit api.

json_t unittest added.

---
 unittest/strings/json-t.c | 58 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/unittest/strings/json-t.c b/unittest/strings/json-t.c
new file mode 100644
index 0000000..8af8636
--- /dev/null
+++ b/unittest/strings/json-t.c
@@ -0,0 +1,58 @@
+/* Copyright (c) 2019, MariaDB Corporation
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; version 2 of the License.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA */
+
+#include <tap.h>
+#include <my_sys.h>
+#include <json_lib.h>
+
+int main()
+{
+  const char *json="{\"int\":1, \"str\":\"foo bar\", "
+                   "\"array\":[10,20,{\"c\":\"d\"}],\"bool\":false}";
+  const char *json_ar="[1, \"foo bar\", " "[10,20,{\"c\":\"d\"}], false]";
+  enum json_types value_type;
+  const char *value_start;
+  int value_len;
+
+  plan(10);
+
+#define do_json(V)                                                      \
+  do {                                                                  \
+    value_type= json_get_object_key(json, json+strlen(json),            \
+                  V, V + (sizeof(V) - 1),&value_start, &value_len);     \
+    ok(value_type != JSV_BAD_JSON, V);                                  \
+    diag("type=%d, value=\"%.*s\"", value_type, (int)value_len, value_start); \
+  } while(0)
+#define do_json_ar(N)                                                 \
+  do {                                                                \
+    value_type= json_get_array_item(json_ar, json_ar+strlen(json_ar), \
+                  N, &value_start, &value_len);                       \
+    ok(value_type != JSV_BAD_JSON, #N);                      \
+    diag("type=%d, value=\"%.*s\"", value_type, (int)value_len, value_start); \
+  } while(0)
+
+  do_json("int");
+  do_json("str");
+  do_json("bool");
+  do_json("c");
+  do_json("array");
+
+  do_json_ar(0);
+  do_json_ar(1);
+  do_json_ar(2);
+  do_json_ar(3);
+  do_json_ar(4);
+  return exit_status();
+}


More information about the commits mailing list