Wed, 22 Jan 2025 21:02:46 +0100
remove token_escape bool from CxJson struct
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1 | /* |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
2 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
3 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
4 | * Copyright 2024 Mike Becker, Olaf Wintermann All rights reserved. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
5 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
6 | * Redistribution and use in source and binary forms, with or without |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
7 | * modification, are permitted provided that the following conditions are met: |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
8 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
9 | * 1. Redistributions of source code must retain the above copyright |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
10 | * notice, this list of conditions and the following disclaimer. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
11 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
12 | * 2. Redistributions in binary form must reproduce the above copyright |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
13 | * notice, this list of conditions and the following disclaimer in the |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
14 | * documentation and/or other materials provided with the distribution. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
15 | * |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
16 | * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
17 | * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
18 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
19 | * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
20 | * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
21 | * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
22 | * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
23 | * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
24 | * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
25 | * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
26 | * POSSIBILITY OF SUCH DAMAGE. |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
27 | */ |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
28 | |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
29 | #include "util_allocator.h" |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
30 | #include "cx/test.h" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
31 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
32 | #include "cx/json.h" |
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
33 | #include "cx/compare.h" |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
34 | |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
35 | CX_TEST(test_json_init_default) { |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
36 | CxJson json; |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
37 | CX_TEST_DO { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
38 | cxJsonInit(&json, NULL); |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
39 | CX_TEST_ASSERT(json.states == json.states_internal); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
40 | CX_TEST_ASSERT(json.states_size == 1); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
41 | CX_TEST_ASSERT(json.states_capacity >= 8); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
42 | CX_TEST_ASSERT(json.vbuf == json.vbuf_internal); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
43 | CX_TEST_ASSERT(json.vbuf_size == 0); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
44 | CX_TEST_ASSERT(json.vbuf_capacity >= 8); |
1032
aaad28e23dac
fix memory leaks in json tests
Mike Becker <universe@uap-core.de>
parents:
1015
diff
changeset
|
45 | cxJsonDestroy(&json); |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
46 | } |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
47 | } |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
48 | |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
49 | CX_TEST(test_json_simple_object) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
50 | cxstring text = cx_str( |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
51 | "{\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
52 | "\t\"message\":\"success\",\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
53 | "\t\"position\":{\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
54 | "\t\t\"longitude\":-94.7099,\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
55 | "\t\t\"latitude\":51.5539\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
56 | "\t},\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
57 | "\t\"timestamp\":1729348561,\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
58 | "\t\"alive\":true\n" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
59 | "}" |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
60 | ); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
61 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
62 | CX_TEST_DO { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
63 | CxJsonStatus result; |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
64 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
65 | CxJson json; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
66 | cxJsonInit(&json, NULL); |
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
67 | cxJsonFill(&json, text); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
68 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
69 | // parse the big fat object |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
70 | CxJsonValue *obj; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
71 | result = cxJsonNext(&json, &obj); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
72 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
73 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
74 | // check the contents |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
75 | CX_TEST_ASSERT(cxJsonIsObject(obj)); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
76 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
77 | CxJsonValue *message = cxJsonObjGet(obj, "message"); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
78 | CX_TEST_ASSERT(cxJsonIsString(message)); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
79 | CX_TEST_ASSERT(0 == cx_strcmp( |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
80 | cxJsonAsCxString(message), |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
81 | cx_str("success")) |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
82 | ); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
83 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
84 | CxJsonValue *position = cxJsonObjGet(obj, "position"); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
85 | CX_TEST_ASSERT(cxJsonIsObject(position)); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
86 | CxJsonValue *longitude = cxJsonObjGet(position, "longitude"); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
87 | CX_TEST_ASSERT(cxJsonIsNumber(longitude)); |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
88 | CX_TEST_ASSERT(!cxJsonIsInteger(longitude)); |
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
89 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(longitude), -94.7099)); |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
90 | CX_TEST_ASSERT(cxJsonAsInteger(longitude) == -94); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
91 | CxJsonValue *latitude = cxJsonObjGet(position, "latitude"); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
92 | CX_TEST_ASSERT(cxJsonIsNumber(latitude)); |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
93 | CX_TEST_ASSERT(!cxJsonIsInteger(latitude)); |
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
94 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(latitude), 51.5539)); |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
95 | CX_TEST_ASSERT(cxJsonAsInteger(latitude) == 51); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
96 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
97 | CxJsonValue *timestamp = cxJsonObjGet(obj, "timestamp"); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
98 | CX_TEST_ASSERT(cxJsonIsInteger(timestamp)); |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
99 | CX_TEST_ASSERT(cxJsonIsNumber(timestamp)); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
100 | CX_TEST_ASSERT(cxJsonAsInteger(timestamp) == 1729348561); |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
101 | CX_TEST_ASSERT(cxJsonAsDouble(timestamp) == 1729348561.0); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
102 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
103 | CxJsonValue *alive = cxJsonObjGet(obj, "alive"); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
104 | CX_TEST_ASSERT(cxJsonIsBool(alive)); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
105 | CX_TEST_ASSERT(cxJsonIsTrue(alive)); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
106 | CX_TEST_ASSERT(!cxJsonIsFalse(alive)); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
107 | CX_TEST_ASSERT(cxJsonAsBool(alive)); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
108 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
109 | // this recursively frees everything else |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
110 | cxJsonValueFree(obj); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
111 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
112 | // we only have one object that already contained all the data |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
113 | result = cxJsonNext(&json, &obj); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
114 | CX_TEST_ASSERT(result == CX_JSON_NO_DATA); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
115 | |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
116 | cxJsonDestroy(&json); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
117 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
118 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
119 | |
1015 | 120 | CX_TEST(test_json_escaped_strings) { |
121 | cxstring text = cx_str( | |
122 | "{\n" | |
123 | "\t\"object\":\"{\\n\\t\\\"object\\\":null\\n}\"}\"\n" | |
124 | "}" | |
125 | ); | |
126 | ||
127 | CxJson json; | |
128 | cxJsonInit(&json, NULL); | |
129 | CX_TEST_DO { | |
130 | cxJsonFill(&json, text); | |
131 | CxJsonValue *obj; | |
132 | CxJsonStatus result = cxJsonNext(&json, &obj); | |
133 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
134 | CX_TEST_ASSERT(cxJsonIsObject(obj)); | |
135 | CxJsonValue *object = cxJsonObjGet(obj, "object"); | |
136 | CX_TEST_ASSERT(cxJsonIsString(object)); | |
137 | CX_TEST_ASSERT(0 == cx_strcmp( | |
138 | cxJsonAsCxString(object), | |
139 | CX_STR("{\n\t\"object\":null\n}")) | |
140 | ); | |
1032
aaad28e23dac
fix memory leaks in json tests
Mike Becker <universe@uap-core.de>
parents:
1015
diff
changeset
|
141 | cxJsonValueFree(obj); |
1015 | 142 | } |
143 | cxJsonDestroy(&json); | |
144 | } | |
145 | ||
1139
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
146 | CX_TEST(test_json_escaped_end_of_string) { |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
147 | CxJson json; |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
148 | cxJsonInit(&json, NULL); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
149 | CX_TEST_DO { |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
150 | // first test, normal scenario |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
151 | cxJsonFill(&json, "\"a \\\"test\\\" string\""); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
152 | CxJsonValue *val; |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
153 | CxJsonStatus result = cxJsonNext(&json, &val); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
154 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
155 | CX_TEST_ASSERT(cxJsonIsString(val)); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
156 | CX_TEST_ASSERT(0 == cx_strcmp( |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
157 | cxJsonAsCxString(val), |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
158 | cx_str("a \"test\" string")) |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
159 | ); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
160 | cxJsonValueFree(val); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
161 | |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
162 | // second test - uncompleted token with hanging escape char |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
163 | cxJsonFill(&json, "\"a \\\"test\\"); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
164 | result = cxJsonNext(&json, &val); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
165 | CX_TEST_ASSERT(result == CX_JSON_INCOMPLETE_DATA); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
166 | cxJsonFill(&json, "\" string\""); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
167 | result = cxJsonNext(&json, &val); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
168 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
169 | CX_TEST_ASSERT(cxJsonIsString(val)); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
170 | CX_TEST_ASSERT(0 == cx_strcmp( |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
171 | cxJsonAsCxString(val), |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
172 | cx_str("a \"test\" string")) |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
173 | ); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
174 | cxJsonValueFree(val); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
175 | } |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
176 | cxJsonDestroy(&json); |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
177 | } |
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
178 | |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
179 | CX_TEST(test_json_object_incomplete_token) { |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
180 | cxstring text = cx_str( |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
181 | "{\"message\":\"success\" , \"__timestamp\":1729348561}"); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
182 | cxstring parts[16]; |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
183 | size_t nparts = 0; // split the json text into mulple parts |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
184 | for(size_t i=0;i<text.length;i+=4) { |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
185 | parts[nparts++] = cx_strsubsl(text, i, 4); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
186 | } |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
187 | |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
188 | CX_TEST_DO { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
189 | CxJsonStatus result; |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
190 | |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
191 | CxJson json; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
192 | cxJsonInit(&json, NULL); |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
193 | CxJsonValue *obj; |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
194 | |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
195 | size_t part = 0; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
196 | while(part < nparts - 1) { |
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
197 | cxJsonFill(&json, parts[part]); |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
198 | part++; |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
199 | result = cxJsonNext(&json, &obj); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
200 | CX_TEST_ASSERT(result == CX_JSON_INCOMPLETE_DATA); |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
201 | } |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
202 | cxJsonFill(&json, parts[nparts - 1]); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
203 | result = cxJsonNext(&json, &obj); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
204 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
205 | CX_TEST_ASSERT(cxJsonIsObject(obj)); |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
206 | |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
207 | CxJsonValue *message = cxJsonObjGet(obj, "message"); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
208 | CX_TEST_ASSERT(cxJsonIsString(message)); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
209 | CX_TEST_ASSERT(0 == cx_strcmp( |
966
1aa7ec3e46e7
treat integers and doubles both as JSON numbers
Mike Becker <universe@uap-core.de>
parents:
946
diff
changeset
|
210 | cxJsonAsCxString(message), |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
211 | cx_str("success")) |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
212 | ); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
213 | CxJsonValue *timestamp = cxJsonObjGet(obj, "__timestamp"); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
214 | CX_TEST_ASSERT(message->type == CX_JSON_STRING); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
215 | CX_TEST_ASSERT(cxJsonIsInteger(timestamp)); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
216 | CX_TEST_ASSERT(cxJsonAsInteger(timestamp) == 1729348561); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
217 | |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
218 | // this recursively frees everything else |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
219 | cxJsonValueFree(obj); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
220 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
221 | // now there is everything read |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
222 | result = cxJsonNext(&json, &obj); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
223 | CX_TEST_ASSERT(result == CX_JSON_NO_DATA); |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
224 | |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
225 | cxJsonDestroy(&json); |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
226 | } |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
227 | } |
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
228 | |
1015 | 229 | CX_TEST(test_json_token_wrongly_completed) { |
1075
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
230 | CxTestingAllocator talloc; |
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
231 | cx_testing_allocator_init(&talloc); |
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
232 | const CxAllocator *alloc = &talloc.base; |
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
233 | |
1015 | 234 | cxstring text = cx_str("{\"number\": 47110815!}"); |
235 | cxstring part1 = cx_strsubsl(text, 0, 16); | |
236 | cxstring part2 = cx_strsubs(text, 16); | |
237 | ||
238 | CX_TEST_DO { | |
1075
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
239 | CxJson json; |
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
240 | cxJsonInit(&json, alloc); |
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
241 | |
1015 | 242 | CxJsonStatus result; |
243 | CxJsonValue *obj; | |
244 | ||
245 | cxJsonFill(&json, part1); | |
246 | result = cxJsonNext(&json, &obj); | |
247 | CX_TEST_ASSERT(result == CX_JSON_INCOMPLETE_DATA); | |
248 | cxJsonFill(&json, part2); | |
249 | result = cxJsonNext(&json, &obj); | |
250 | CX_TEST_ASSERT(result == CX_JSON_FORMAT_ERROR_NUMBER); | |
251 | CX_TEST_ASSERT(obj->type == CX_JSON_NOTHING); | |
1075
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
252 | |
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
253 | cxJsonDestroy(&json); |
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
254 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
1015 | 255 | } |
1075
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
256 | cx_testing_allocator_destroy(&talloc); |
1015 | 257 | } |
258 | ||
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
259 | CX_TEST(test_json_subsequent_fill) { |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
260 | cxstring text = cx_str( |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
261 | "{\"message\":\"success\" , \"__timestamp\":1729348561}"); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
262 | |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
263 | cxstring part1 = cx_strsubsl(text, 0, 25); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
264 | cxstring part2 = cx_strsubs(text, 25); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
265 | |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
266 | CX_TEST_DO { |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
267 | CxJson json; |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
268 | cxJsonInit(&json, NULL); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
269 | CxJsonValue *obj; |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
270 | |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
271 | cxJsonFill(&json, part1); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
272 | cxJsonFill(&json, part2); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
273 | CxJsonStatus result = cxJsonNext(&json, &obj); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
274 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
275 | CX_TEST_ASSERT(cxJsonIsObject(obj)); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
276 | |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
277 | CxJsonValue *message = cxJsonObjGet(obj, "message"); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
278 | CX_TEST_ASSERT(cxJsonIsString(message)); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
279 | CX_TEST_ASSERT(0 == cx_strcmp( |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
280 | cxJsonAsCxString(message), |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
281 | cx_str("success")) |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
282 | ); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
283 | CxJsonValue *timestamp = cxJsonObjGet(obj, "__timestamp"); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
284 | CX_TEST_ASSERT(message->type == CX_JSON_STRING); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
285 | CX_TEST_ASSERT(cxJsonIsInteger(timestamp)); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
286 | CX_TEST_ASSERT(cxJsonAsInteger(timestamp) == 1729348561); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
287 | |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
288 | cxJsonValueFree(obj); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
289 | result = cxJsonNext(&json, &obj); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
290 | CX_TEST_ASSERT(result == CX_JSON_NO_DATA); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
291 | |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
292 | cxJsonDestroy(&json); |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
293 | } |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
294 | } |
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
295 | |
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
296 | CX_TEST(test_json_object_error) { |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
297 | cxstring text0 = cx_str( |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
298 | "{\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
299 | "\t\"message\":\"success\",\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
300 | "\t\"data\":{\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
301 | "\t\t\"obj\":{\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
302 | "\t\t\t\"array\": [1, 2, 3, ?syntaxerror? ]\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
303 | "\t\t\"}\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
304 | "\t},\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
305 | "\t\"timestamp\":1729348561,\n" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
306 | "}" |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
307 | ); |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
308 | cxstring text1 = cx_str("{ \"string\" }"); |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
309 | cxstring text2 = cx_str("{ \"a\" : }"); |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
310 | cxstring text3 = cx_str("{ \"a\" : \"b\" ]"); |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
311 | cxstring text4 = cx_str("{ \"name\": \"value\" ]"); |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
312 | |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
313 | cxstring tests[] = { text0, text1, text2, text3, text4 }; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
314 | CxJsonStatus errors[] = { |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
315 | CX_JSON_FORMAT_ERROR_NUMBER, |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
316 | CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN, |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
317 | CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN, |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
318 | CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN, |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
319 | CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
320 | }; |
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
321 | |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
322 | CX_TEST_DO { |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
323 | CxJsonStatus result; |
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
324 | CxJson json; |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
325 | CxJsonValue *obj = NULL; |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
326 | |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
327 | for(int i=0;i<5;i++) { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
328 | cxJsonInit(&json, NULL); |
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
329 | cxJsonFill(&json, tests[i]); |
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
330 | result = cxJsonNext(&json, &obj); |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
331 | |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
332 | CX_TEST_ASSERT(result == errors[i]); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
333 | CX_TEST_ASSERT(obj != NULL && obj->type == CX_JSON_NOTHING); |
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
334 | cxJsonDestroy(&json); |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
335 | } |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
336 | } |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
337 | } |
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
338 | |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
339 | CX_TEST(test_json_large_nesting_depth) { |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
340 | CxJson json; |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
341 | CxJsonValue *d1; |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
342 | cxstring text = cx_str("{\"test\": [{},{\"foo\": [[{\"bar\":[4, 2, [null, {\"key\": 47}]]}]]}]}"); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
343 | CX_TEST_DO { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
344 | cxJsonInit(&json, NULL); |
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
345 | cxJsonFill(&json, text); |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
346 | cxJsonNext(&json, &d1); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
347 | |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
348 | CX_TEST_ASSERT(d1 != NULL); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
349 | CX_TEST_ASSERT(cxJsonIsObject(d1)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
350 | CxJsonValue *d2 = cxJsonObjGet(d1, "test"); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
351 | CX_TEST_ASSERT(cxJsonIsArray(d2)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
352 | CX_TEST_ASSERT(cxJsonArrSize(d2) == 2); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
353 | CxJsonValue *d3 = cxJsonArrGet(d2, 1); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
354 | CX_TEST_ASSERT(cxJsonIsObject(d3)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
355 | CxJsonValue *d4 = cxJsonObjGet(d3, "foo"); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
356 | CX_TEST_ASSERT(cxJsonIsArray(d4)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
357 | CX_TEST_ASSERT(cxJsonArrSize(d4) == 1); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
358 | CxJsonValue *d5 = cxJsonArrGet(d4, 0); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
359 | CX_TEST_ASSERT(cxJsonIsArray(d5)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
360 | CX_TEST_ASSERT(cxJsonArrSize(d5) == 1); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
361 | CxJsonValue *d6 = cxJsonArrGet(d5, 0); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
362 | CX_TEST_ASSERT(cxJsonIsObject(d6)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
363 | CxJsonValue *d7 = cxJsonObjGet(d6, "bar"); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
364 | CX_TEST_ASSERT(cxJsonIsArray(d7)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
365 | CX_TEST_ASSERT(cxJsonArrSize(d7) == 3); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
366 | CxJsonValue *d8 = cxJsonArrGet(d7, 2); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
367 | CX_TEST_ASSERT(cxJsonIsArray(d8)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
368 | CX_TEST_ASSERT(cxJsonArrSize(d8) == 2); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
369 | CxJsonValue *d9a = cxJsonArrGet(d8, 0); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
370 | CX_TEST_ASSERT(cxJsonIsNull(d9a)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
371 | CxJsonValue *d9b = cxJsonArrGet(d8, 1); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
372 | CX_TEST_ASSERT(cxJsonIsObject(d9b)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
373 | CxJsonValue *d10 = cxJsonObjGet(d9b, "key"); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
374 | CX_TEST_ASSERT(cxJsonIsInteger(d10)); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
375 | CX_TEST_ASSERT(cxJsonAsInteger(d10) == 47); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
376 | |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
377 | CX_TEST_ASSERT(json.states != json.states_internal); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
378 | CX_TEST_ASSERT(json.states_capacity > cx_nmemb(json.states_internal)); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
379 | |
978
1da52af18ac3
fix memory leaks in json tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
977
diff
changeset
|
380 | cxJsonValueFree(d1); |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
381 | cxJsonDestroy(&json); |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
382 | } |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
383 | } |
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
384 | |
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
385 | CX_TEST(test_json_number) { |
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
386 | CxJson json; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
387 | cxJsonInit(&json, NULL); |
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
388 | CX_TEST_DO { |
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
389 | CxJsonValue *v; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
390 | CxJsonStatus result; |
1015 | 391 | |
975
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
392 | cxJsonFill(&json, "3.1415 "); |
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
393 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
394 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
975
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
395 | CX_TEST_ASSERT(cxJsonIsNumber(v)); |
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
396 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(v), 3.1415)); |
978
1da52af18ac3
fix memory leaks in json tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
977
diff
changeset
|
397 | cxJsonValueFree(v); |
1015 | 398 | |
975
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
399 | cxJsonFill(&json, "-47.11e2 "); |
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
400 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
401 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
975
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
402 | CX_TEST_ASSERT(cxJsonIsNumber(v)); |
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
403 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(v), -4711.0)); |
978
1da52af18ac3
fix memory leaks in json tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
977
diff
changeset
|
404 | cxJsonValueFree(v); |
1015 | 405 | |
406 | cxJsonFill(&json, "0.815e-3 "); | |
407 | result = cxJsonNext(&json, &v); | |
408 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
409 | CX_TEST_ASSERT(cxJsonIsNumber(v)); | |
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
410 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(v), 0.000815)); |
1032
aaad28e23dac
fix memory leaks in json tests
Mike Becker <universe@uap-core.de>
parents:
1015
diff
changeset
|
411 | cxJsonValueFree(v); |
1015 | 412 | |
413 | cxJsonFill(&json, "1.23E4 "); | |
414 | result = cxJsonNext(&json, &v); | |
415 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
416 | CX_TEST_ASSERT(cxJsonIsNumber(v)); | |
417 | CX_TEST_ASSERT(cxJsonAsInteger(v) == 12300); | |
418 | CX_TEST_ASSERT(cxJsonAsDouble(v) == 12300.0); | |
419 | cxJsonValueFree(v); | |
1060
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
420 | |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
421 | cxJsonFill(&json, "18446744073709551615.0123456789 "); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
422 | result = cxJsonNext(&json, &v); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
423 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
424 | CX_TEST_ASSERT(cxJsonIsNumber(v)); |
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
425 | // be as precise as possible |
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
426 | // TODO: this might produce format error / out of range in future implementations |
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
427 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(v), 1.8446744073709552e+19)); |
1060
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
428 | cxJsonValueFree(v); |
1015 | 429 | } |
430 | cxJsonDestroy(&json); | |
431 | } | |
432 | ||
433 | CX_TEST(test_json_number_format_errors) { | |
434 | CxJson json; | |
435 | cxJsonInit(&json, NULL); | |
436 | CX_TEST_DO { | |
437 | CxJsonValue *v; | |
438 | CxJsonStatus result; | |
439 | ||
440 | cxJsonFill(&json, "+3.1415 "); | |
441 | result = cxJsonNext(&json, &v); | |
442 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
443 | "leading plus is not RFC-8259 compliant"); | |
444 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
445 | cxJsonReset(&json); | |
446 | ||
447 | cxJsonFill(&json, "0.815e-3.0 "); | |
448 | result = cxJsonNext(&json, &v); | |
449 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
450 | "exponent must be an integer"); | |
451 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
452 | cxJsonReset(&json); | |
453 | ||
454 | cxJsonFill(&json, "3.14e "); | |
455 | result = cxJsonNext(&json, &v); | |
456 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
457 | "exponent cannot be empty"); | |
458 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
459 | cxJsonReset(&json); | |
460 | ||
461 | cxJsonFill(&json, "3.14e~7 "); | |
462 | result = cxJsonNext(&json, &v); | |
463 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
464 | "exponent cannot start with bullshit"); | |
465 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
466 | cxJsonReset(&json); | |
467 | ||
468 | cxJsonFill(&json, "1.23e4f "); | |
469 | result = cxJsonNext(&json, &v); | |
470 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
471 | "non-digits in exponent"); | |
472 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
473 | cxJsonReset(&json); | |
474 | ||
475 | cxJsonFill(&json, "1.23f "); | |
476 | result = cxJsonNext(&json, &v); | |
477 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
478 | "non-digits in value"); | |
479 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
480 | cxJsonReset(&json); | |
481 | ||
482 | cxJsonFill(&json, "1.23.45 "); | |
483 | result = cxJsonNext(&json, &v); | |
484 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
485 | "multiple decimal separators"); | |
486 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
487 | cxJsonReset(&json); | |
488 | ||
489 | cxJsonFill(&json, "184467440737095516150123456789 "); | |
490 | result = cxJsonNext(&json, &v); | |
491 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
492 | "30 digit int does not fit into 64-bit int"); | |
493 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
494 | cxJsonReset(&json); | |
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
495 | } |
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
496 | cxJsonDestroy(&json); |
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
497 | } |
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
498 | |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
499 | CX_TEST(test_json_multiple_values) { |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
500 | CxJson json; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
501 | cxJsonInit(&json, NULL); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
502 | CX_TEST_DO { |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
503 | CxJsonValue *v; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
504 | CxJsonStatus result; |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
505 | |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
506 | // read number |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
507 | cxJsonFill(&json, "10\n"); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
508 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
509 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
510 | CX_TEST_ASSERT(cxJsonIsNumber(v)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
511 | CX_TEST_ASSERT(cxJsonAsInteger(v) == 10); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
512 | cxJsonValueFree(v); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
513 | // read remaining '\n' |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
514 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
515 | CX_TEST_ASSERT(result == CX_JSON_INCOMPLETE_DATA); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
516 | // read string |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
517 | cxJsonFill(&json, "\"hello world\"\n"); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
518 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
519 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
520 | CX_TEST_ASSERT(cxJsonIsString(v)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
521 | CX_TEST_ASSERT(!cx_strcmp(cxJsonAsCxString(v), CX_STR("hello world"))); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
522 | cxJsonValueFree(v); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
523 | // don't process the remaining newline this time |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
524 | // read obj |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
525 | cxJsonFill(&json, "{ \"value\": \"test\" }\n"); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
526 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
527 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
528 | CX_TEST_ASSERT(cxJsonIsObject(v)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
529 | CxJsonValue *value = cxJsonObjGet(v, "value"); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
530 | CX_TEST_ASSERT(cxJsonAsString(value)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
531 | cxJsonValueFree(v); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
532 | // read array |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
533 | cxJsonFill(&json, "[ 0, 1, 2, 3, 4, 5 ]\n"); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
534 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
535 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
536 | CX_TEST_ASSERT(cxJsonIsArray(v)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
537 | CxJsonValue *a0 = cxJsonArrGet(v, 0); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
538 | CxJsonValue *a3 = cxJsonArrGet(v, 3); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
539 | CX_TEST_ASSERT(cxJsonIsNumber(a0)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
540 | CX_TEST_ASSERT(cxJsonAsInteger(a0) == 0); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
541 | CX_TEST_ASSERT(cxJsonIsNumber(a3)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
542 | CX_TEST_ASSERT(cxJsonAsInteger(a3) == 3); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
543 | cxJsonValueFree(v); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
544 | // read literal |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
545 | cxJsonFill(&json, "true\n"); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
546 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
547 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
548 | CX_TEST_ASSERT(cxJsonIsLiteral(v)); |
1015 | 549 | CX_TEST_ASSERT(cxJsonIsBool(v)); |
550 | CX_TEST_ASSERT(cxJsonIsTrue(v)); | |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
551 | CX_TEST_ASSERT(cxJsonAsBool(v)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
552 | cxJsonValueFree(v); |
1015 | 553 | cxJsonFill(&json, "false\n"); |
554 | result = cxJsonNext(&json, &v); | |
555 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
556 | CX_TEST_ASSERT(cxJsonIsLiteral(v)); | |
557 | CX_TEST_ASSERT(cxJsonIsBool(v)); | |
558 | CX_TEST_ASSERT(cxJsonIsFalse(v)); | |
559 | CX_TEST_ASSERT(!cxJsonAsBool(v)); | |
560 | cxJsonValueFree(v); | |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
561 | cxJsonFill(&json, "null\n"); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
562 | result = cxJsonNext(&json, &v); |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
563 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
1015 | 564 | CX_TEST_ASSERT(cxJsonIsLiteral(v)); |
565 | CX_TEST_ASSERT(!cxJsonIsBool(v)); | |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
566 | CX_TEST_ASSERT(cxJsonIsNull(v)); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
567 | cxJsonValueFree(v); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
568 | } |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
569 | cxJsonDestroy(&json); |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
570 | } |
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
571 | |
1033
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
572 | CX_TEST(test_json_array_iterator) { |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
573 | CxJson json; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
574 | cxJsonInit(&json, NULL); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
575 | CX_TEST_DO { |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
576 | CxJsonValue *v; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
577 | CxJsonStatus result; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
578 | cxJsonFill(&json, "[ 0, 3, 6, 9, 12, 15 ]\n"); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
579 | result = cxJsonNext(&json, &v); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
580 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
581 | CX_TEST_ASSERT(cxJsonIsArray(v)); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
582 | CxIterator iter = cxJsonArrIter(v); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
583 | unsigned i = 0; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
584 | cx_foreach(CxJsonValue*, elem, iter) { |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
585 | CX_TEST_ASSERT(cxJsonIsNumber(elem)); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
586 | CX_TEST_ASSERT(i == cxJsonAsInteger(elem)); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
587 | i += 3; |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
588 | } |
1051
7d17bd1103d7
fix another missing free() in json tests
Mike Becker <universe@uap-core.de>
parents:
1033
diff
changeset
|
589 | cxJsonValueFree(v); |
1033
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
590 | } |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
591 | cxJsonDestroy(&json); |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
592 | } |
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
593 | |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
594 | CX_TEST(test_json_allocator) { |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
595 | CxTestingAllocator talloc; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
596 | cx_testing_allocator_init(&talloc); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
597 | CxAllocator *allocator = &talloc.base; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
598 | |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
599 | cxstring text = cx_str( |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
600 | "{\n" |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
601 | "\t\"message\":\"success\",\n" |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
602 | "\t\"data\":[\"value1\",{\"x\":123, \"y\":523 }]\n" |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
603 | "}" |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
604 | ); |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
605 | |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
606 | CX_TEST_DO { |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
607 | CxJson json; |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
608 | cxJsonInit(&json, allocator); |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
609 | cxJsonFill(&json, text); |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
610 | |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
611 | CxJsonValue *obj; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
612 | CxJsonStatus result = cxJsonNext(&json, &obj); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
613 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
614 | CX_TEST_ASSERT(obj->allocator == allocator); |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
615 | |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
616 | // this recursively frees everything |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
617 | cxJsonValueFree(obj); |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
618 | cxJsonDestroy(&json); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
619 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
620 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
621 | } |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
622 | cx_testing_allocator_destroy(&talloc); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
623 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
624 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
625 | CX_TEST(test_json_allocator_parse_error) { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
626 | CxTestingAllocator talloc; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
627 | cx_testing_allocator_init(&talloc); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
628 | CxAllocator *allocator = &talloc.base; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
629 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
630 | cxstring text = cx_str( |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
631 | "{\n" |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
632 | "\t\"message\":\"success\"\n" // <-- missing comma |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
633 | "\t\"data\":[\"value1\",{\"x\":123, \"y\":523 }]\n" |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
634 | "}" |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
635 | ); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
636 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
637 | CX_TEST_DO { |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
638 | CxJson json; |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
639 | cxJsonInit(&json, allocator); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
640 | cxJsonFill(&json, text); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
641 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
642 | CxJsonValue *obj = NULL; |
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
643 | CxJsonStatus result = cxJsonNext(&json, &obj); |
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
644 | CX_TEST_ASSERT(result == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
645 | CX_TEST_ASSERT(obj != NULL && obj->type == CX_JSON_NOTHING); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
646 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
647 | // clean-up any left-over memory |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
648 | cxJsonDestroy(&json); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
649 | |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
650 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
651 | } |
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
652 | cx_testing_allocator_destroy(&talloc); |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
653 | } |
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
654 | |
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
655 | CX_TEST(test_json_create_value) { |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
656 | CxTestingAllocator talloc; |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
657 | cx_testing_allocator_init(&talloc); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
658 | CxAllocator *allocator = &talloc.base; |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
659 | CX_TEST_DO { |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
660 | /* |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
661 | * This is the value we want to create in this test: |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
662 | * |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
663 | * { |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
664 | * "bool": false, |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
665 | * "int": 47, |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
666 | * "strings": [ "hello", "world" ], |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
667 | * "nested": { |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
668 | * "string": "test", |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
669 | * "floats": [ 3.1415, 47.11, 8.15 ], |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
670 | * "ints": [ 4, 8, 15, 16, 23, 42 ], |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
671 | * "literals": [ true, null, false ] |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
672 | * } |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
673 | * } |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
674 | */ |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
675 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
676 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
677 | // create the object |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
678 | CxJsonValue *obj = cxJsonCreateObj(allocator); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
679 | CX_TEST_ASSERT(obj != NULL); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
680 | CX_TEST_ASSERT(cxJsonIsObject(obj)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
681 | CX_TEST_ASSERT(obj->allocator == allocator); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
682 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
683 | // add the members |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
684 | { |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
685 | cxJsonObjPutLiteral(obj, CX_STR("bool"), CX_JSON_FALSE); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
686 | cxJsonObjPutInteger(obj, CX_STR("int"), 47); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
687 | CxJsonValue *strings = cxJsonObjPutArr(obj, CX_STR("strings")); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
688 | CX_TEST_ASSERT(strings != NULL); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
689 | CX_TEST_ASSERT(cxJsonIsArray(strings)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
690 | const char* str[] = {"hello", "world"}; |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
691 | CX_TEST_ASSERT(0 == cxJsonArrAddStrings(strings, str, 2)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
692 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
693 | CxJsonValue *nested = cxJsonObjPutObj(obj, CX_STR("nested")); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
694 | CX_TEST_ASSERT(nested != NULL); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
695 | CX_TEST_ASSERT(cxJsonIsObject(nested)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
696 | cxJsonObjPutCxString(nested, CX_STR("string"), CX_STR("test")); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
697 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
698 | cxJsonArrAddNumbers(cxJsonObjPutArr(nested, CX_STR("floats")), |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
699 | (double[]){3.1415, 47.11, 8.15}, 3); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
700 | cxJsonArrAddIntegers(cxJsonObjPutArr(nested, CX_STR("ints")), |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
701 | (int64_t[]){4, 8, 15, 16, 23, 42}, 6); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
702 | cxJsonArrAddLiterals(cxJsonObjPutArr(nested, CX_STR("literals")), |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
703 | (CxJsonLiteral[]){CX_JSON_TRUE, CX_JSON_NULL, CX_JSON_FALSE}, 3); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
704 | } |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
705 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
706 | // verify the contents |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
707 | { |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
708 | CX_TEST_ASSERT(cxJsonIsFalse(cxJsonObjGet(obj, "bool"))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
709 | CX_TEST_ASSERT(47 == cxJsonAsInteger(cxJsonObjGet(obj, "int"))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
710 | CxJsonValue *strings = cxJsonObjGet(obj, "strings"); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
711 | CX_TEST_ASSERT(cxJsonIsArray(strings)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
712 | CX_TEST_ASSERT(2 == cxJsonArrSize(strings)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
713 | CX_TEST_ASSERT(0 == cx_strcmp(CX_STR("hello"), cxJsonAsCxString(cxJsonArrGet(strings, 0)))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
714 | CX_TEST_ASSERT(0 == cx_strcmp(CX_STR("world"), cxJsonAsCxString(cxJsonArrGet(strings, 1)))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
715 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
716 | CxJsonValue *nested = cxJsonObjGet(obj, "nested"); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
717 | CX_TEST_ASSERT(cxJsonIsObject(nested)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
718 | CX_TEST_ASSERT(0 == strcmp("test", cxJsonAsString(cxJsonObjGet(nested, "string")))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
719 | CxJsonValue *floats = cxJsonObjGet(nested, "floats"); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
720 | CX_TEST_ASSERT(cxJsonIsArray(floats)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
721 | CX_TEST_ASSERT(3 == cxJsonArrSize(floats)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
722 | CX_TEST_ASSERT(3.1415 == cxJsonAsDouble(cxJsonArrGet(floats, 0))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
723 | CX_TEST_ASSERT(47.11 == cxJsonAsDouble(cxJsonArrGet(floats, 1))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
724 | CX_TEST_ASSERT(8.15 == cxJsonAsDouble(cxJsonArrGet(floats, 2))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
725 | CxJsonValue *ints = cxJsonObjGet(nested, "ints"); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
726 | CX_TEST_ASSERT(cxJsonIsArray(ints)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
727 | CX_TEST_ASSERT(6 == cxJsonArrSize(ints)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
728 | CX_TEST_ASSERT(4 == cxJsonAsInteger(cxJsonArrGet(ints, 0))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
729 | CX_TEST_ASSERT(8 == cxJsonAsInteger(cxJsonArrGet(ints, 1))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
730 | CX_TEST_ASSERT(15 == cxJsonAsInteger(cxJsonArrGet(ints, 2))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
731 | CX_TEST_ASSERT(16 == cxJsonAsInteger(cxJsonArrGet(ints, 3))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
732 | CX_TEST_ASSERT(23 == cxJsonAsInteger(cxJsonArrGet(ints, 4))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
733 | CX_TEST_ASSERT(42 == cxJsonAsInteger(cxJsonArrGet(ints, 5))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
734 | CxJsonValue *literals = cxJsonObjGet(nested, "literals"); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
735 | CX_TEST_ASSERT(cxJsonIsArray(literals)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
736 | CX_TEST_ASSERT(3 == cxJsonArrSize(literals)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
737 | CX_TEST_ASSERT(cxJsonIsTrue(cxJsonArrGet(literals, 0))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
738 | CX_TEST_ASSERT(cxJsonIsNull(cxJsonArrGet(literals, 1))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
739 | CX_TEST_ASSERT(cxJsonIsFalse(cxJsonArrGet(literals, 2))); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
740 | } |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
741 | |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
742 | // destroy the value and verify the allocations |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
743 | cxJsonValueFree(obj); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
744 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
745 | } |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
746 | cx_testing_allocator_destroy(&talloc); |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
747 | } |
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
748 | |
1072
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
749 | |
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
750 | CX_TEST_SUBROUTINE(test_json_write_sub, |
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
751 | const CxAllocator *allocator, |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
752 | cxstring expected, |
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
753 | const CxJsonWriter *writer |
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
754 | ) { |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
755 | // create the value |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
756 | CxJsonValue *obj = cxJsonCreateObj(allocator); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
757 | cxJsonObjPutLiteral(obj, CX_STR("bool"), CX_JSON_FALSE); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
758 | cxJsonObjPutNumber(obj, CX_STR("int"), 47); // purposely use PutNumber to put an int |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
759 | CxJsonValue *strings = cxJsonObjPutArr(obj, CX_STR("strings")); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
760 | cxJsonArrAddCxStrings(strings, (cxstring[]) {CX_STR("hello"), CX_STR("world")}, 2); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
761 | CxJsonValue *nested = cxJsonObjPutObj(obj, CX_STR("nested")); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
762 | CxJsonValue *objects = cxJsonObjPutArr(nested, CX_STR("objects")); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
763 | CxJsonValue *obj_in_arr[2] = {cxJsonCreateObj(allocator), cxJsonCreateObj(allocator)}; |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
764 | cxJsonObjPutInteger(obj_in_arr[0], CX_STR("name1"), 1); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
765 | cxJsonObjPutInteger(obj_in_arr[0], CX_STR("name2"), 3); |
1082
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
766 | cxJsonObjPutInteger(obj_in_arr[1], CX_STR("name2"), 7); |
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
767 | cxJsonObjPutInteger(obj_in_arr[1], CX_STR("name1"), 3); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
768 | cxJsonArrAddValues(objects, obj_in_arr, 2); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
769 | cxJsonArrAddNumbers(cxJsonObjPutArr(nested, CX_STR("floats")), |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
770 | (double[]){3.1415, 47.11, 8.15}, 3); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
771 | cxJsonArrAddLiterals(cxJsonObjPutArr(nested, CX_STR("literals")), |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
772 | (CxJsonLiteral[]){CX_JSON_TRUE, CX_JSON_NULL, CX_JSON_FALSE}, 3); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
773 | CxJsonValue *ints = cxJsonObjPutArr(nested, CX_STR("ints")); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
774 | cxJsonArrAddIntegers(ints, (int64_t[]){4, 8, 15}, 3); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
775 | CxJsonValue *nested_array = cxJsonCreateArr(allocator); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
776 | cxJsonArrAddValues(ints, &nested_array, 1); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
777 | cxJsonArrAddIntegers(nested_array, (int64_t[]){16, 23}, 2); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
778 | cxJsonArrAddIntegers(ints, (int64_t[]){42}, 1); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
779 | |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
780 | // write it to a buffer |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
781 | CxBuffer buf; |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
782 | cxBufferInit(&buf, NULL, 512, NULL, CX_BUFFER_DEFAULT); |
1112
22dc2163fffd
add convenience macros to avoid a fptr cast for cxBufferRead and cxBufferWrite
Mike Becker <universe@uap-core.de>
parents:
1082
diff
changeset
|
783 | int result = cxJsonWrite(&buf, obj, cxBufferWriteFunc, writer); |
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
784 | cxBufferTerminate(&buf); // makes debugging easier |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
785 | CX_TEST_ASSERT(result == 0); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
786 | |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
787 | // compare the string |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
788 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), expected)); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
789 | |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
790 | // destroy everything |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
791 | cxBufferDestroy(&buf); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
792 | cxJsonValueFree(obj); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
793 | } |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
794 | |
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
795 | CX_TEST(test_json_write_default_format) { |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
796 | CxTestingAllocator talloc; |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
797 | cx_testing_allocator_init(&talloc); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
798 | CxAllocator *allocator = &talloc.base; |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
799 | CX_TEST_DO { |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
800 | // expected value |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
801 | cxstring expected = CX_STR( |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
802 | "{\"bool\":false," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
803 | "\"int\":47," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
804 | "\"nested\":{" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
805 | "\"floats\":[3.1415,47.11,8.15]," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
806 | "\"ints\":[4,8,15,[16,23],42]," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
807 | "\"literals\":[true,null,false]," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
808 | "\"objects\":[{" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
809 | "\"name1\":1," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
810 | "\"name2\":3" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
811 | "},{" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
812 | "\"name1\":3," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
813 | "\"name2\":7" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
814 | "}]" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
815 | "}," |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
816 | "\"strings\":[\"hello\",\"world\"]" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
817 | "}" |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
818 | ); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
819 | |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
820 | CxJsonWriter writer = cxJsonWriterCompact(); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
821 | CX_TEST_CALL_SUBROUTINE(test_json_write_sub, allocator, expected, &writer); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
822 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
823 | } |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
824 | cx_testing_allocator_destroy(&talloc); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
825 | } |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
826 | |
1078
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
827 | CX_TEST(test_json_write_pretty_default_spaces) { |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
828 | CxTestingAllocator talloc; |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
829 | cx_testing_allocator_init(&talloc); |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
830 | CxAllocator *allocator = &talloc.base; |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
831 | CX_TEST_DO { |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
832 | cxstring expected = CX_STR( |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
833 | "{\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
834 | " \"bool\": false,\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
835 | " \"int\": 47,\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
836 | " \"nested\": {\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
837 | " \"floats\": [3.1415, 47.11, 8.15],\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
838 | " \"ints\": [4, 8, 15, [16, 23], 42],\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
839 | " \"literals\": [true, null, false],\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
840 | " \"objects\": [{\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
841 | " \"name1\": 1,\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
842 | " \"name2\": 3\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
843 | " }, {\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
844 | " \"name1\": 3,\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
845 | " \"name2\": 7\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
846 | " }]\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
847 | " },\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
848 | " \"strings\": [\"hello\", \"world\"]\n" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
849 | "}" |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
850 | ); |
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
851 | |
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
852 | CxJsonWriter writer = cxJsonWriterPretty(true); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
853 | CX_TEST_CALL_SUBROUTINE(test_json_write_sub, allocator, expected, &writer); |
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
854 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
855 | } |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
856 | cx_testing_allocator_destroy(&talloc); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
857 | } |
1078
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
858 | |
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
859 | CX_TEST(test_json_write_pretty_default_tabs) { |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
860 | CxTestingAllocator talloc; |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
861 | cx_testing_allocator_init(&talloc); |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
862 | CxAllocator *allocator = &talloc.base; |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
863 | CX_TEST_DO { |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
864 | cxstring expected = CX_STR( |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
865 | "{\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
866 | "\t\"bool\": false,\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
867 | "\t\"int\": 47,\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
868 | "\t\"nested\": {\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
869 | "\t\t\"floats\": [3.1415, 47.11, 8.15],\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
870 | "\t\t\"ints\": [4, 8, 15, [16, 23], 42],\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
871 | "\t\t\"literals\": [true, null, false],\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
872 | "\t\t\"objects\": [{\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
873 | "\t\t\t\"name1\": 1,\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
874 | "\t\t\t\"name2\": 3\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
875 | "\t\t}, {\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
876 | "\t\t\t\"name1\": 3,\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
877 | "\t\t\t\"name2\": 7\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
878 | "\t\t}]\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
879 | "\t},\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
880 | "\t\"strings\": [\"hello\", \"world\"]\n" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
881 | "}" |
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
882 | ); |
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
883 | CxJsonWriter writer = cxJsonWriterPretty(false); |
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
884 | CX_TEST_CALL_SUBROUTINE(test_json_write_sub, allocator, expected, &writer); |
1072
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
885 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
886 | } |
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
887 | cx_testing_allocator_destroy(&talloc); |
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
888 | } |
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
889 | |
1082
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
890 | CX_TEST(test_json_write_pretty_preserve_order) { |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
891 | CxTestingAllocator talloc; |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
892 | cx_testing_allocator_init(&talloc); |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
893 | CxAllocator *allocator = &talloc.base; |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
894 | CX_TEST_DO { |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
895 | cxstring expected = CX_STR( |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
896 | "{\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
897 | " \"bool\": false,\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
898 | " \"int\": 47,\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
899 | " \"strings\": [\"hello\", \"world\"],\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
900 | " \"nested\": {\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
901 | " \"objects\": [{\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
902 | " \"name1\": 1,\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
903 | " \"name2\": 3\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
904 | " }, {\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
905 | " \"name2\": 7,\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
906 | " \"name1\": 3\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
907 | " }],\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
908 | " \"floats\": [3.1415, 47.11, 8.15],\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
909 | " \"literals\": [true, null, false],\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
910 | " \"ints\": [4, 8, 15, [16, 23], 42]\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
911 | " }\n" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
912 | "}" |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
913 | ); |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
914 | |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
915 | CxJsonWriter writer = cxJsonWriterPretty(true); |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
916 | writer.sort_members = false; |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
917 | CX_TEST_CALL_SUBROUTINE(test_json_write_sub, allocator, expected, &writer); |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
918 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
919 | } |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
920 | cx_testing_allocator_destroy(&talloc); |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
921 | } |
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
922 | |
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
923 | CX_TEST(test_json_write_frac_max_digits) { |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
924 | CxJsonValue* num = cxJsonCreateNumber(NULL, 3.141592653589793); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
925 | CxJsonWriter writer = cxJsonWriterCompact(); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
926 | CxBuffer buf; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
927 | cxBufferInit(&buf, NULL, 32, NULL, 0); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
928 | CX_TEST_DO { |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
929 | // test default settings (6 digits) |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
930 | cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer); |
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
931 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("3.141592"))); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
932 | |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
933 | // test too many digits |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
934 | cxBufferReset(&buf); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
935 | writer.frac_max_digits = 200; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
936 | cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
937 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("3.141592653589793"))); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
938 | |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
939 | // test 0 digits |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
940 | cxBufferReset(&buf); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
941 | writer.frac_max_digits = 0; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
942 | cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
943 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("3"))); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
944 | |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
945 | // test 2 digits |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
946 | cxBufferReset(&buf); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
947 | writer.frac_max_digits = 2; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
948 | cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
949 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("3.14"))); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
950 | |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
951 | // test 3 digits |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
952 | cxBufferReset(&buf); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
953 | writer.frac_max_digits = 3; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
954 | cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
955 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("3.141"))); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
956 | |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
957 | // test 6 digits, but two are left of the decimal point |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
958 | num->value.number = 47.110815; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
959 | cxBufferReset(&buf); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
960 | writer.frac_max_digits = 6; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
961 | cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
962 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("47.110815"))); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
963 | |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
964 | // test 4 digits with exponent |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
965 | num->value.number = 5.11223344e23; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
966 | cxBufferReset(&buf); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
967 | writer.frac_max_digits = 4; |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
968 | cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
969 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("5.1122e+23"))); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
970 | } |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
971 | cxBufferDestroy(&buf); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
972 | cxJsonValueFree(num); |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
973 | } |
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
974 | |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
975 | CX_TEST(test_json_write_string_escape) { |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
976 | /** |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
977 | * According to RFC-8259 we have to test the following characters: |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
978 | * " quotation mark |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
979 | * \ reverse solidus |
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
980 | * / solidus ---> we make this optional, see test_json_write_solidus |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
981 | * b backspace |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
982 | * f form feed |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
983 | * n line feed |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
984 | * r carriage return |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
985 | * t tab |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
986 | * And all other control characters must be encoded uXXXX - in our example the bell character. |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
987 | * Also, all unicode characters are encoded that way - in our example the 'ö'. |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
988 | */ |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
989 | CxJsonValue* str = cxJsonCreateString(NULL, |
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
990 | "hello\twörld\r\nthis is\\a \"string\"\b in \a string\f"); |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
991 | CxJsonWriter writer = cxJsonWriterCompact(); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
992 | CxBuffer buf; |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
993 | cxBufferInit(&buf, NULL, 128, NULL, 0); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
994 | CX_TEST_DO { |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
995 | cxJsonWrite(&buf, str, cxBufferWriteFunc, &writer); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
996 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), |
1130
5bcb725119b6
fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents:
1123
diff
changeset
|
997 | CX_STR("\"hello\\twörld\\r\\nthis is\\\\a \\\"string\\\"\\b in \\u0007 string\\f\""))); |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
998 | } |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
999 | cxBufferDestroy(&buf); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1000 | cxJsonValueFree(str); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1001 | } |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1002 | |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1003 | CX_TEST(test_json_write_name_escape) { |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1004 | CxJsonValue* obj = cxJsonCreateObj(NULL); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1005 | cxJsonObjPutLiteral(obj, |
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1006 | CX_STR("hello\twörld\r\nthis is\\a \"string\"\b in \a string\f"), CX_JSON_TRUE); |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1007 | CxJsonWriter writer = cxJsonWriterCompact(); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1008 | CxBuffer buf; |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1009 | cxBufferInit(&buf, NULL, 128, NULL, 0); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1010 | CX_TEST_DO { |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1011 | cxJsonWrite(&buf, obj, cxBufferWriteFunc, &writer); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1012 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), |
1130
5bcb725119b6
fix wrong accidental unicode escaping
Mike Becker <universe@uap-core.de>
parents:
1123
diff
changeset
|
1013 | CX_STR("{\"hello\\twörld\\r\\nthis is\\\\a \\\"string\\\"\\b in \\u0007 string\\f\":true}"))); |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1014 | } |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1015 | cxBufferDestroy(&buf); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1016 | cxJsonValueFree(obj); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1017 | } |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1018 | |
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1019 | CX_TEST(test_json_write_solidus) { |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1020 | CxJsonValue* str = cxJsonCreateString(NULL,"test/solidus"); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1021 | CxJsonWriter writer = cxJsonWriterCompact(); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1022 | CxBuffer buf; |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1023 | cxBufferInit(&buf, NULL, 16, NULL, 0); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1024 | CX_TEST_DO { |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1025 | // default: do not escape |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1026 | cxJsonWrite(&buf, str, cxBufferWriteFunc, &writer); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1027 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("\"test/solidus\""))); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1028 | |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1029 | // enable escaping |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1030 | writer.escape_slash = true; |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1031 | cxBufferReset(&buf); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1032 | cxJsonWrite(&buf, str, cxBufferWriteFunc, &writer); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1033 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), CX_STR("\"test\\/solidus\""))); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1034 | } |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1035 | cxBufferDestroy(&buf); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1036 | cxJsonValueFree(str); |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1037 | } |
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1038 | |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1039 | CxTestSuite *cx_test_suite_json(void) { |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1040 | CxTestSuite *suite = cx_test_suite_new("json"); |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1041 | |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
1042 | cx_test_register(suite, test_json_init_default); |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1043 | cx_test_register(suite, test_json_simple_object); |
1015 | 1044 | cx_test_register(suite, test_json_escaped_strings); |
1139
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
1045 | cx_test_register(suite, test_json_escaped_end_of_string); |
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
1046 | cx_test_register(suite, test_json_object_incomplete_token); |
1015 | 1047 | cx_test_register(suite, test_json_token_wrongly_completed); |
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
1048 | cx_test_register(suite, test_json_object_error); |
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
1049 | cx_test_register(suite, test_json_subsequent_fill); |
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
1050 | cx_test_register(suite, test_json_large_nesting_depth); |
975
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
1051 | cx_test_register(suite, test_json_number); |
1015 | 1052 | cx_test_register(suite, test_json_number_format_errors); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
1053 | cx_test_register(suite, test_json_multiple_values); |
1033
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1054 | cx_test_register(suite, test_json_array_iterator); |
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1055 | cx_test_register(suite, test_json_allocator); |
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1056 | cx_test_register(suite, test_json_allocator_parse_error); |
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1057 | cx_test_register(suite, test_json_create_value); |
1072
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
1058 | cx_test_register(suite, test_json_write_default_format); |
1078
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1059 | cx_test_register(suite, test_json_write_pretty_default_spaces); |
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1060 | cx_test_register(suite, test_json_write_pretty_default_tabs); |
1082
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1061 | cx_test_register(suite, test_json_write_pretty_preserve_order); |
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1062 | cx_test_register(suite, test_json_write_frac_max_digits); |
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1063 | cx_test_register(suite, test_json_write_string_escape); |
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1064 | cx_test_register(suite, test_json_write_name_escape); |
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1065 | cx_test_register(suite, test_json_write_solidus); |
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
1066 | |
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1067 | return suite; |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1068 | } |
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1069 |