Wed, 10 Dec 2025 22:03:08 +0100
fix that token_destroy() did not set token->allocated to false
|
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), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
81 | "success") |
|
937
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 | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
120 | CX_TEST(test_json_large_object) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
121 | CxJsonValue *obj = cxJsonCreateObj(NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
122 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
123 | cxJsonObjPutString(obj, "mystring", "test"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
124 | char buf[10]; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
125 | for (unsigned i = 0 ; i < 300 ; i++) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
126 | sprintf(buf, "key %d", i); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
127 | cxJsonObjPutInteger(obj, buf, i); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
128 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
129 | CX_TEST_ASSERT(301 == cxJsonObjSize(obj)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
130 | // some samples |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
131 | CxJsonValue *v; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
132 | v = cxJsonObjGet(obj, "key 64"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
133 | CX_TEST_ASSERT(cxJsonIsInteger(v)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
134 | CX_TEST_ASSERT(cxJsonAsInteger(v) == 64); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
135 | v = cxJsonObjGet(obj, "key 228"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
136 | CX_TEST_ASSERT(cxJsonIsInteger(v)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
137 | CX_TEST_ASSERT(cxJsonAsInteger(v) == 228); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
138 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
139 | v = cxJsonObjGet(obj, "mystring"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
140 | CX_TEST_ASSERT(cxJsonIsString(v)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
141 | CX_TEST_ASSERT(0 == cx_strcmp(cxJsonAsCxMutStr(v), "test")); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
142 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
143 | cxJsonValueFree(obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
144 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
145 | |
|
1556
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
146 | CX_TEST(test_json_from_string) { |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
147 | cxstring text = cx_str( |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
148 | "{\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
149 | "\t\"message\":\"success\",\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
150 | "\t\"position\":{\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
151 | "\t\t\"longitude\":-94.7099,\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
152 | "\t\t\"latitude\":51.5539\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
153 | "\t},\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
154 | "\t\"timestamp\":1729348561,\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
155 | "\t\"alive\":true\n" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
156 | "}" |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
157 | ); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
158 | |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
159 | CX_TEST_DO { |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
160 | CxJsonValue *obj; |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
161 | CX_TEST_ASSERT(cxJsonFromString(NULL, text, &obj) == CX_JSON_NO_ERROR); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
162 | |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
163 | // check the contents |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
164 | CX_TEST_ASSERT(cxJsonIsObject(obj)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
165 | |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
166 | CxJsonValue *message = cxJsonObjGet(obj, "message"); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
167 | CX_TEST_ASSERT(cxJsonIsString(message)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
168 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
169 | cxJsonAsCxString(message), |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
170 | "success") |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
171 | ); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
172 | |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
173 | CxJsonValue *position = cxJsonObjGet(obj, "position"); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
174 | CX_TEST_ASSERT(cxJsonIsObject(position)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
175 | CxJsonValue *longitude = cxJsonObjGet(position, "longitude"); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
176 | CX_TEST_ASSERT(cxJsonIsNumber(longitude)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
177 | CX_TEST_ASSERT(!cxJsonIsInteger(longitude)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
178 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(longitude), -94.7099)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
179 | CX_TEST_ASSERT(cxJsonAsInteger(longitude) == -94); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
180 | CxJsonValue *latitude = cxJsonObjGet(position, "latitude"); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
181 | CX_TEST_ASSERT(cxJsonIsNumber(latitude)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
182 | CX_TEST_ASSERT(!cxJsonIsInteger(latitude)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
183 | CX_TEST_ASSERT(0 == cx_vcmp_double(cxJsonAsDouble(latitude), 51.5539)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
184 | CX_TEST_ASSERT(cxJsonAsInteger(latitude) == 51); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
185 | |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
186 | CxJsonValue *timestamp = cxJsonObjGet(obj, "timestamp"); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
187 | CX_TEST_ASSERT(cxJsonIsInteger(timestamp)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
188 | CX_TEST_ASSERT(cxJsonIsNumber(timestamp)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
189 | CX_TEST_ASSERT(cxJsonAsInteger(timestamp) == 1729348561); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
190 | CX_TEST_ASSERT(cxJsonAsDouble(timestamp) == 1729348561.0); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
191 | |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
192 | CxJsonValue *alive = cxJsonObjGet(obj, "alive"); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
193 | CX_TEST_ASSERT(cxJsonIsBool(alive)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
194 | CX_TEST_ASSERT(cxJsonIsTrue(alive)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
195 | CX_TEST_ASSERT(!cxJsonIsFalse(alive)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
196 | CX_TEST_ASSERT(cxJsonAsBool(alive)); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
197 | |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
198 | cxJsonValueFree(obj); |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
199 | } |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
200 | } |
|
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
201 | |
|
1563
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
202 | CX_TEST(test_json_from_string_errors) { |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
203 | CX_TEST_DO { |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
204 | CxJsonValue *obj = NULL; |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
205 | CX_TEST_ASSERT(cxJsonFromString(NULL, "", &obj) == CX_JSON_NO_DATA); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
206 | CX_TEST_ASSERT(cxJsonFromString(NULL, cx_str(NULL), &obj) == CX_JSON_NO_DATA); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
207 | CX_TEST_ASSERT(cxJsonFromString(NULL, "\"incomplete", &obj) == CX_JSON_INCOMPLETE_DATA); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
208 | CX_TEST_ASSERT(cxJsonFromString(NULL, "{ \"incomplete\": ", &obj) == CX_JSON_INCOMPLETE_DATA); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
209 | CX_TEST_ASSERT(cxJsonFromString(NULL, "{\"number\": 47110815!}", &obj) == CX_JSON_FORMAT_ERROR_NUMBER); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
210 | CX_TEST_ASSERT(cxJsonFromString(NULL, "[ \"unexpected token\" : true ]", &obj) == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
211 | CX_TEST_ASSERT(cxJsonFromString(NULL, "} [", &obj) == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
212 | CX_TEST_ASSERT(obj && obj->type == CX_JSON_NOTHING); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
213 | } |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
214 | } |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
215 | |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
216 | CX_TEST(test_json_from_string_multiple_values) { |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
217 | CxJsonStatus status; |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
218 | CxJsonValue *obj = NULL; |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
219 | CX_TEST_DO { |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
220 | status = cxJsonFromString(NULL, "{ \"obj1\": \"hello\" }\n\"value2\"\n", &obj); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
221 | |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
222 | // TODO: what is the expected behavior here? Is this an error or do we ignore the second value? |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
223 | CX_TEST_ASSERT(status == CX_JSON_NO_ERROR); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
224 | CX_TEST_ASSERT(cxJsonIsObject(obj)); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
225 | // CX_TEST_ASSERT(status == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
226 | |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
227 | cxJsonValueFree(obj); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
228 | |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
229 | // TODO: this really should be an error in theory |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
230 | status = cxJsonFromString(NULL, "\"value\" \n ] syntax error [", &obj); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
231 | CX_TEST_ASSERT(status == CX_JSON_NO_ERROR); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
232 | CX_TEST_ASSERT(cxJsonIsString(obj)); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
233 | // CX_TEST_ASSERT(status == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
234 | |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
235 | cxJsonValueFree(obj); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
236 | } |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
237 | } |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
238 | |
| 1015 | 239 | CX_TEST(test_json_escaped_strings) { |
| 240 | cxstring text = cx_str( | |
| 241 | "{\n" | |
|
1154
afd12f31d28a
add missing test coverage for escape sequences
Mike Becker <universe@uap-core.de>
parents:
1152
diff
changeset
|
242 | "\t\"object\":\"{\\n\\t\\\"object\\\":null\\n}\",\n" |
|
afd12f31d28a
add missing test coverage for escape sequences
Mike Becker <universe@uap-core.de>
parents:
1152
diff
changeset
|
243 | "\t\"ctrl-chars\":\"\\\\foo\\r\\nbar\\f*ring\\/ring*\\b\"\n" |
| 1015 | 244 | "}" |
| 245 | ); | |
| 246 | ||
| 247 | CxJson json; | |
| 248 | cxJsonInit(&json, NULL); | |
| 249 | CX_TEST_DO { | |
| 250 | cxJsonFill(&json, text); | |
| 251 | CxJsonValue *obj; | |
| 252 | CxJsonStatus result = cxJsonNext(&json, &obj); | |
| 253 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
| 254 | CX_TEST_ASSERT(cxJsonIsObject(obj)); | |
| 255 | CxJsonValue *object = cxJsonObjGet(obj, "object"); | |
| 256 | CX_TEST_ASSERT(cxJsonIsString(object)); | |
| 257 | CX_TEST_ASSERT(0 == cx_strcmp( | |
| 258 | cxJsonAsCxString(object), | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
259 | "{\n\t\"object\":null\n}") |
| 1015 | 260 | ); |
|
1154
afd12f31d28a
add missing test coverage for escape sequences
Mike Becker <universe@uap-core.de>
parents:
1152
diff
changeset
|
261 | CxJsonValue *ctrl = cxJsonObjGet(obj, "ctrl-chars"); |
|
afd12f31d28a
add missing test coverage for escape sequences
Mike Becker <universe@uap-core.de>
parents:
1152
diff
changeset
|
262 | CX_TEST_ASSERT(cxJsonIsString(ctrl)); |
|
afd12f31d28a
add missing test coverage for escape sequences
Mike Becker <universe@uap-core.de>
parents:
1152
diff
changeset
|
263 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
afd12f31d28a
add missing test coverage for escape sequences
Mike Becker <universe@uap-core.de>
parents:
1152
diff
changeset
|
264 | cxJsonAsCxString(ctrl), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
265 | "\\foo\r\nbar\f*ring/ring*\b") |
|
1154
afd12f31d28a
add missing test coverage for escape sequences
Mike Becker <universe@uap-core.de>
parents:
1152
diff
changeset
|
266 | ); |
| 1157 | 267 | cxJsonValueFree(obj); |
| 1015 | 268 | } |
| 269 | cxJsonDestroy(&json); | |
| 270 | } | |
| 271 | ||
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
272 | CX_TEST(test_json_escaped_unicode_strings) { |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
273 | cxstring text = cx_str( |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
274 | "{\n" |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
275 | "\"ascii\":\"\\u0041\\u0053\\u0043\\u0049\\u0049\",\n" |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
276 | "\"unicode\":\"\\u00df\\u00DF\",\n" |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
277 | "\"mixed\":\"mixed ä ö \\u00e4 \\u00f6\",\n" |
|
1152
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
278 | "\"wide\":\"\\u03a3\\u29b0\",\n" |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
279 | "\"surrogatepair1\":\"\\ud83e\\udff5\",\n" |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
280 | "\"surrogatepair2\":\"test\\ud83e\\udff1AA\"\n," |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
281 | "\"mixed2\":\"123\\u03a3\\ud83e\\udfc5\\u00df\"" |
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
282 | "}" |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
283 | ); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
284 | |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
285 | CxJson json; |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
286 | cxJsonInit(&json, NULL); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
287 | CX_TEST_DO { |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
288 | cxJsonFill(&json, text); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
289 | CxJsonValue *obj; |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
290 | CxJsonStatus result = cxJsonNext(&json, &obj); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
291 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
292 | CX_TEST_ASSERT(cxJsonIsObject(obj)); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
293 | |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
294 | CxJsonValue *ascii = cxJsonObjGet(obj, "ascii"); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
295 | CX_TEST_ASSERT(cxJsonIsString(ascii)); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
296 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
297 | cxJsonAsCxString(ascii), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
298 | "ASCII") |
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
299 | ); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
300 | |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
301 | CxJsonValue *unicode = cxJsonObjGet(obj, "unicode"); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
302 | CX_TEST_ASSERT(cxJsonIsString(unicode)); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
303 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
304 | cxJsonAsCxString(unicode), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
305 | "ßß") |
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
306 | ); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
307 | |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
308 | CxJsonValue *mixed = cxJsonObjGet(obj, "mixed"); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
309 | CX_TEST_ASSERT(cxJsonIsString(mixed)); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
310 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
311 | cxJsonAsCxString(mixed), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
312 | "mixed ä ö ä ö") |
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
313 | ); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
314 | |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
315 | CxJsonValue *wide = cxJsonObjGet(obj, "wide"); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
316 | CX_TEST_ASSERT(cxJsonIsString(wide)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
317 | CX_TEST_ASSERT(0 == cx_strcmp(cxJsonAsCxString(wide), "Σ⦰")); |
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
318 | |
|
1152
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
319 | CxJsonValue *surrogatepair1 = cxJsonObjGet(obj, "surrogatepair1"); |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
320 | CX_TEST_ASSERT(cxJsonIsString(surrogatepair1)); |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
321 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
322 | cxJsonAsCxString(surrogatepair1), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
323 | "\xf0\x9f\xaf\xb5") |
|
1152
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
324 | ); |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
325 | |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
326 | CxJsonValue *surrogatepair2 = cxJsonObjGet(obj, "surrogatepair2"); |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
327 | CX_TEST_ASSERT(cxJsonIsString(surrogatepair2)); |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
328 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
329 | cxJsonAsCxString(surrogatepair2), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
330 | "test\xf0\x9f\xaf\xb1" "AA") |
|
1152
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
331 | ); |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
332 | |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
333 | CxJsonValue *mixed2 = cxJsonObjGet(obj, "mixed2"); |
|
1177
04ede4de9cec
fix unicode tests not working on all platforms
Mike Becker <universe@uap-core.de>
parents:
1157
diff
changeset
|
334 | char test[16]; |
|
1543
7b66371d6da3
use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents:
1513
diff
changeset
|
335 | strncpy(test, mixed2->string.ptr, 15); |
|
7b66371d6da3
use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents:
1513
diff
changeset
|
336 | CX_TEST_ASSERT(cxJsonIsString(mixed2)); |
|
1152
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
337 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
338 | cxJsonAsCxString(mixed2), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
339 | "123\xce\xa3\xf0\x9f\xaf\x85ß") |
|
1152
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
340 | ); |
|
e4af44b488bc
implement decoder for utf16 surrogate pairs in unescape_string
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1149
diff
changeset
|
341 | |
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
342 | cxJsonValueFree(obj); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
343 | } |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
344 | cxJsonDestroy(&json); |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
345 | } |
|
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
346 | |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
347 | CX_TEST(test_json_escaped_unicode_malformed) { |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
348 | CxJson json; |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
349 | cxJsonInit(&json, NULL); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
350 | CxJsonValue *obj; |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
351 | CxJsonStatus result; |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
352 | CX_TEST_DO { |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
353 | cxJsonFill(&json, "\"too few digits \\u123\""); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
354 | result = cxJsonNext(&json, &obj); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
355 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
356 | CX_TEST_ASSERT(cxJsonIsString(obj)); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
357 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
358 | cxJsonAsCxString(obj), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
359 | "too few digits \\u123" |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
360 | )); |
| 1157 | 361 | cxJsonValueFree(obj); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
362 | cxJsonFill(&json, "\"too many digits \\u00E456\""); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
363 | result = cxJsonNext(&json, &obj); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
364 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
365 | CX_TEST_ASSERT(cxJsonIsString(obj)); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
366 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
367 | cxJsonAsCxString(obj), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
368 | "too many digits ä56" |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
369 | )); |
| 1157 | 370 | cxJsonValueFree(obj); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
371 | cxJsonFill(&json, "\"only high \\uD800 surrogate\""); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
372 | result = cxJsonNext(&json, &obj); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
373 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
374 | CX_TEST_ASSERT(cxJsonIsString(obj)); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
375 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
376 | cxJsonAsCxString(obj), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
377 | "only high \\uD800 surrogate" |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
378 | )); |
| 1157 | 379 | cxJsonValueFree(obj); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
380 | cxJsonFill(&json, "\"only low \\uDC00 surrogate\""); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
381 | result = cxJsonNext(&json, &obj); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
382 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
383 | CX_TEST_ASSERT(cxJsonIsString(obj)); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
384 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
385 | cxJsonAsCxString(obj), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
386 | "only low \\uDC00 surrogate" |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
387 | )); |
| 1157 | 388 | cxJsonValueFree(obj); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
389 | cxJsonFill(&json, "\"two high \\uD800\\uD800 surrogates\""); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
390 | result = cxJsonNext(&json, &obj); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
391 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
392 | CX_TEST_ASSERT(cxJsonIsString(obj)); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
393 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
394 | cxJsonAsCxString(obj), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
395 | "two high \\uD800\\uD800 surrogates" |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
396 | )); |
| 1157 | 397 | cxJsonValueFree(obj); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
398 | cxJsonFill(&json, "\"high plus bullshit \\uD800\\u567 foo\""); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
399 | result = cxJsonNext(&json, &obj); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
400 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
401 | CX_TEST_ASSERT(cxJsonIsString(obj)); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
402 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
403 | cxJsonAsCxString(obj), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
404 | "high plus bullshit \\uD800\\u567 foo" |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
405 | )); |
| 1157 | 406 | cxJsonValueFree(obj); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
407 | } |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
408 | cxJsonDestroy(&json); |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
409 | } |
|
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
410 | |
|
1139
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
411 | 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
|
412 | CxJson json; |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
413 | cxJsonInit(&json, NULL); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
414 | CX_TEST_DO { |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
415 | // first test, normal scenario |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
416 | cxJsonFill(&json, "\"a \\\"test\\\" string\""); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
417 | CxJsonValue *val; |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
418 | CxJsonStatus result = cxJsonNext(&json, &val); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
419 | 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
|
420 | CX_TEST_ASSERT(cxJsonIsString(val)); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
421 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
422 | cxJsonAsCxString(val), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
423 | "a \"test\" string") |
|
1139
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
424 | ); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
425 | cxJsonValueFree(val); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
426 | |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
427 | // 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
|
428 | cxJsonFill(&json, "\"a \\\"test\\"); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
429 | result = cxJsonNext(&json, &val); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
430 | 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
|
431 | cxJsonFill(&json, "\" string\""); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
432 | result = cxJsonNext(&json, &val); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
433 | 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
|
434 | CX_TEST_ASSERT(cxJsonIsString(val)); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
435 | CX_TEST_ASSERT(0 == cx_strcmp( |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
436 | cxJsonAsCxString(val), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
437 | "a \"test\" string") |
|
1139
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
438 | ); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
439 | cxJsonValueFree(val); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
440 | } |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
441 | cxJsonDestroy(&json); |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
442 | } |
|
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
443 | |
|
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
444 | 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
|
445 | cxstring text = cx_str( |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
446 | "{\"message\":\"success\" , \"__timestamp\":1729348561}"); |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
447 | cxstring parts[16]; |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
448 | 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
|
449 | 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
|
450 | 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
|
451 | } |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
452 | |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
453 | CX_TEST_DO { |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
454 | CxJsonStatus result; |
|
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
455 | |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
456 | CxJson json; |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
457 | cxJsonInit(&json, NULL); |
|
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
458 | CxJsonValue *obj; |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
459 | |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
460 | 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
|
461 | while(part < nparts - 1) { |
|
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
462 | 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
|
463 | part++; |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
464 | 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
|
465 | 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
|
466 | } |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
467 | 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
|
468 | result = cxJsonNext(&json, &obj); |
|
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
469 | 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
|
470 | 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
|
471 | |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
472 | 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
|
473 | 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
|
474 | 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
|
475 | cxJsonAsCxString(message), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
476 | "success") |
|
939
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
477 | ); |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
478 | 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
|
479 | 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
|
480 | 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
|
481 | 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
|
482 | |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
483 | // 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
|
484 | cxJsonValueFree(obj); |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
485 | |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
486 | // 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
|
487 | 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
|
488 | CX_TEST_ASSERT(result == CX_JSON_NO_DATA); |
|
1563
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
489 | |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
490 | // Test 2: abort after incomplete token |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
491 | cxJsonReset(&json); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
492 | |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
493 | cxJsonFill(&json, "\"incomplete token"); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
494 | result = cxJsonNext(&json, &obj); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
495 | 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
|
496 | |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
497 | cxJsonDestroy(&json); |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
498 | } |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
499 | } |
|
0bb7258366a0
add test for parsing json with multiple incomplete tokens
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
937
diff
changeset
|
500 | |
| 1015 | 501 | 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
|
502 | CxTestingAllocator talloc; |
|
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
503 | cx_testing_allocator_init(&talloc); |
|
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
504 | const CxAllocator *alloc = &talloc.base; |
|
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
505 | |
| 1015 | 506 | cxstring text = cx_str("{\"number\": 47110815!}"); |
| 507 | cxstring part1 = cx_strsubsl(text, 0, 16); | |
| 508 | cxstring part2 = cx_strsubs(text, 16); | |
| 509 | ||
| 510 | CX_TEST_DO { | |
|
1075
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
511 | CxJson json; |
|
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
512 | cxJsonInit(&json, alloc); |
|
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
513 | |
| 1015 | 514 | CxJsonStatus result; |
| 515 | CxJsonValue *obj; | |
| 516 | ||
| 517 | cxJsonFill(&json, part1); | |
| 518 | result = cxJsonNext(&json, &obj); | |
| 519 | CX_TEST_ASSERT(result == CX_JSON_INCOMPLETE_DATA); | |
| 520 | cxJsonFill(&json, part2); | |
| 521 | result = cxJsonNext(&json, &obj); | |
| 522 | CX_TEST_ASSERT(result == CX_JSON_FORMAT_ERROR_NUMBER); | |
| 523 | 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
|
524 | |
|
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
525 | cxJsonDestroy(&json); |
|
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
526 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
| 1015 | 527 | } |
|
1075
0cc4b63a0ae0
fix cxJsonDestroy() not freeing uncompleted object member names
Mike Becker <universe@uap-core.de>
parents:
1072
diff
changeset
|
528 | cx_testing_allocator_destroy(&talloc); |
| 1015 | 529 | } |
| 530 | ||
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
531 | CX_TEST(test_json_parenthesis_mismatch) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
532 | CxTestingAllocator talloc; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
533 | cx_testing_allocator_init(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
534 | const CxAllocator *alloc = &talloc.base; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
535 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
536 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
537 | CxJson json; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
538 | cxJsonInit(&json, alloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
539 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
540 | CxJsonStatus result; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
541 | CxJsonValue *obj; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
542 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
543 | cxJsonFill(&json, "[0, 1, 2, 3}"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
544 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
545 | CX_TEST_ASSERT(result == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
546 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
547 | cxJsonReset(&json); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
548 | cxJsonFill(&json, "{\"test\": 42]"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
549 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
550 | CX_TEST_ASSERT(result == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
551 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
552 | cxJsonDestroy(&json); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
553 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
554 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
555 | cx_testing_allocator_destroy(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
556 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
557 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
558 | CX_TEST(test_json_object_name_is_no_string) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
559 | CxTestingAllocator talloc; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
560 | cx_testing_allocator_init(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
561 | const CxAllocator *alloc = &talloc.base; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
562 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
563 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
564 | CxJson json; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
565 | cxJsonInit(&json, alloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
566 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
567 | CxJsonStatus result; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
568 | CxJsonValue *obj; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
569 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
570 | cxJsonFill(&json, "{42: \"test\"}"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
571 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
572 | CX_TEST_ASSERT(result == CX_JSON_FORMAT_ERROR_UNEXPECTED_TOKEN); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
573 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
574 | cxJsonDestroy(&json); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
575 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
576 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
577 | cx_testing_allocator_destroy(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
578 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
579 | |
|
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
580 | 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
|
581 | 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
|
582 | "{\"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
|
583 | |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
584 | 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
|
585 | 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
|
586 | |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
587 | 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
|
588 | CxJson json; |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
589 | 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
|
590 | CxJsonValue *obj; |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
591 | |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
592 | 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
|
593 | 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
|
594 | 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
|
595 | 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
|
596 | 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
|
597 | |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
598 | 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
|
599 | 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
|
600 | 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
|
601 | cxJsonAsCxString(message), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
602 | "success") |
|
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
603 | ); |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
604 | 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
|
605 | 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
|
606 | 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
|
607 | 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
|
608 | |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
609 | cxJsonValueFree(obj); |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
610 | 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
|
611 | 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
|
612 | |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
613 | cxJsonDestroy(&json); |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
614 | } |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
615 | } |
|
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
616 | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
617 | CX_TEST(test_json_no_fill) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
618 | CxJson json; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
619 | cxJsonInit(&json, NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
620 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
621 | CxJsonValue *obj = NULL; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
622 | CxJsonStatus result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
623 | CX_TEST_ASSERT(result == CX_JSON_NULL_DATA); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
624 | CX_TEST_ASSERT(obj != NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
625 | CX_TEST_ASSERT(obj->type == CX_JSON_NOTHING); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
626 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
627 | cxJsonDestroy(&json); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
628 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
629 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
630 | CX_TEST(test_json_null_fill) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
631 | CxJson json; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
632 | cxJsonInit(&json, NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
633 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
634 | CxJsonStatus result; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
635 | CxJsonValue *obj = NULL; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
636 | cxstring nullstr = cx_strn(NULL, 0); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
637 | cxJsonFill(&json, nullstr); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
638 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
639 | CX_TEST_ASSERT(result == CX_JSON_NO_DATA); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
640 | CX_TEST_ASSERT(obj != NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
641 | CX_TEST_ASSERT(obj->type == CX_JSON_NOTHING); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
642 | obj = NULL; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
643 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
644 | cxJsonFill(&json, "[0, 1"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
645 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
646 | CX_TEST_ASSERT(result == CX_JSON_INCOMPLETE_DATA); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
647 | CX_TEST_ASSERT(obj != NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
648 | CX_TEST_ASSERT(obj->type == CX_JSON_NOTHING); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
649 | obj = NULL; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
650 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
651 | cxJsonFill(&json, nullstr); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
652 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
653 | CX_TEST_ASSERT(result == CX_JSON_INCOMPLETE_DATA); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
654 | CX_TEST_ASSERT(obj != NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
655 | CX_TEST_ASSERT(obj->type == CX_JSON_NOTHING); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
656 | obj = NULL; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
657 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
658 | cxJsonFill(&json, ", 2]"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
659 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
660 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
661 | CX_TEST_ASSERT(obj != NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
662 | CX_TEST_ASSERT(cxJsonIsArray(obj)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
663 | cxJsonValueFree(obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
664 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
665 | cxJsonFill(&json, nullstr); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
666 | result = cxJsonNext(&json, &obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
667 | CX_TEST_ASSERT(result == CX_JSON_NO_DATA); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
668 | CX_TEST_ASSERT(obj != NULL); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
669 | CX_TEST_ASSERT(obj->type == CX_JSON_NOTHING); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
670 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
671 | cxJsonDestroy(&json); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
672 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
673 | |
|
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
674 | 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
|
675 | cxstring text0 = cx_str( |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
676 | "{\n" |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
677 | "\t\"message\":\"success\",\n" |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
678 | "\t\"data\":{\n" |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
679 | "\t\t\"obj\":{\n" |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
680 | "\t\t\t\"array\": [1, 2, 3, ?syntaxerror? ]\n" |
|
1338
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
681 | "\t\t}\n" |
|
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
682 | "\t},\n" |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
683 | "\t\"timestamp\":1729348561,\n" |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
684 | "}" |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
685 | ); |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
686 | 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
|
687 | 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
|
688 | 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
|
689 | 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
|
690 | |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
691 | 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
|
692 | CxJsonStatus errors[] = { |
|
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
693 | 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
|
694 | 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
|
695 | 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
|
696 | 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
|
697 | 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
|
698 | }; |
|
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
699 | |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
700 | CX_TEST_DO { |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
701 | CxJsonStatus result; |
|
941
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
702 | CxJson json; |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
703 | CxJsonValue *obj = NULL; |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
704 | |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
705 | 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
|
706 | cxJsonInit(&json, NULL); |
|
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
707 | 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
|
708 | result = cxJsonNext(&json, &obj); |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
709 | |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
710 | CX_TEST_ASSERT(result == errors[i]); |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
711 | 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
|
712 | cxJsonDestroy(&json); |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
713 | } |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
714 | } |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
715 | } |
|
9077724b75a0
fix incomplete json object not resulting in syntax error
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
939
diff
changeset
|
716 | |
|
1338
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
717 | CX_TEST(test_json_object_remove_member) { |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
718 | CxTestingAllocator talloc; |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
719 | cx_testing_allocator_init(&talloc); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
720 | const CxAllocator *alloc = &talloc.base; |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
721 | CX_TEST_DO { |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
722 | CxJson json; |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
723 | cxJsonInit(&json, alloc); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
724 | cxJsonFill(&json, |
|
1338
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
725 | "{\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
726 | "\t\"message\":\"success\",\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
727 | "\t\"data\":{\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
728 | "\t\t\"obj\":{\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
729 | "\t\t\t\"array\": [1, 2, 3]\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
730 | "\t\t}\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
731 | "\t},\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
732 | "\t\"timestamp\":1729348561\n" |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
733 | "}" |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
734 | ); |
|
1338
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
735 | CxJsonValue *obj; |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
736 | CX_TEST_ASSERT(CX_JSON_NO_ERROR == cxJsonNext(&json, &obj)); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
737 | cxJsonDestroy(&json); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
738 | |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
739 | CX_TEST_ASSERT(cxJsonIsObject(cxJsonObjGet(obj, "data"))); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
740 | CxJsonValue *data = cxJsonObjRemove(obj, "data"); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
741 | CX_TEST_ASSERT(cxJsonIsObject(data)); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
742 | CX_TEST_ASSERT(!cxJsonIsObject(cxJsonObjGet(obj, "data"))); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
743 | CX_TEST_ASSERT(cxJsonIsObject(cxJsonObjGet(data, "obj"))); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
744 | |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
745 | CX_TEST_ASSERT(NULL == cxJsonObjRemove(obj, "data")); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
746 | |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
747 | // does not verify, yet, because we extracted an object |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
748 | cxJsonValueFree(obj); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
749 | CX_TEST_ASSERT(!cx_testing_allocator_verify(&talloc)); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
750 | |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
751 | cxJsonValueFree(data); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
752 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
753 | } |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
754 | cx_testing_allocator_destroy(&talloc); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
755 | } |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
756 | |
|
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
757 | 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
|
758 | CxJson json; |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
759 | CxJsonValue *d1; |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
760 | 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
|
761 | CX_TEST_DO { |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
762 | cxJsonInit(&json, NULL); |
|
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
763 | 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
|
764 | cxJsonNext(&json, &d1); |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
765 | |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
766 | 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
|
767 | 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
|
768 | 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
|
769 | 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
|
770 | 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
|
771 | 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
|
772 | 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
|
773 | 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
|
774 | 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
|
775 | 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
|
776 | 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
|
777 | 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
|
778 | 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
|
779 | 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
|
780 | 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
|
781 | 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
|
782 | 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
|
783 | 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
|
784 | 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
|
785 | 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
|
786 | 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
|
787 | 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
|
788 | 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
|
789 | 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
|
790 | 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
|
791 | 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
|
792 | 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
|
793 | 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
|
794 | |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
795 | 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
|
796 | 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
|
797 | |
|
978
1da52af18ac3
fix memory leaks in json tests
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
977
diff
changeset
|
798 | cxJsonValueFree(d1); |
|
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
799 | cxJsonDestroy(&json); |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
800 | } |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
801 | } |
|
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
802 | |
|
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
803 | CX_TEST(test_json_number) { |
|
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
804 | CxJson json; |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
805 | cxJsonInit(&json, NULL); |
|
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
806 | CX_TEST_DO { |
|
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
807 | CxJsonValue *v; |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
808 | CxJsonStatus result; |
| 1015 | 809 | |
|
975
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
810 | 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
|
811 | 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
|
812 | 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
|
813 | CX_TEST_ASSERT(cxJsonIsNumber(v)); |
|
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
814 | 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
|
815 | cxJsonValueFree(v); |
| 1015 | 816 | |
|
975
96bf02371aef
adds test case for numbers - currently fails due to issue #482
Mike Becker <universe@uap-core.de>
parents:
973
diff
changeset
|
817 | 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
|
818 | 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
|
819 | 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
|
820 | CX_TEST_ASSERT(cxJsonIsNumber(v)); |
|
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
821 | 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
|
822 | cxJsonValueFree(v); |
| 1015 | 823 | |
| 824 | cxJsonFill(&json, "0.815e-3 "); | |
| 825 | result = cxJsonNext(&json, &v); | |
| 826 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
| 827 | CX_TEST_ASSERT(cxJsonIsNumber(v)); | |
|
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
828 | 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
|
829 | cxJsonValueFree(v); |
| 1015 | 830 | |
| 831 | cxJsonFill(&json, "1.23E4 "); | |
| 832 | result = cxJsonNext(&json, &v); | |
| 833 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
| 834 | CX_TEST_ASSERT(cxJsonIsNumber(v)); | |
| 835 | CX_TEST_ASSERT(cxJsonAsInteger(v) == 12300); | |
| 836 | CX_TEST_ASSERT(cxJsonAsDouble(v) == 12300.0); | |
| 837 | 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
|
838 | |
|
0a7c1bb2372d
avoid copying the filled data in the json parser when possible - fixes #530
Mike Becker <universe@uap-core.de>
parents:
1057
diff
changeset
|
839 | 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
|
840 | 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
|
841 | 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
|
842 | 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
|
843 | // be as precise as possible |
|
1063
e453e717876e
implement floating point string to number conversions
Mike Becker <universe@uap-core.de>
parents:
1060
diff
changeset
|
844 | // 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
|
845 | 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
|
846 | cxJsonValueFree(v); |
| 1015 | 847 | } |
| 848 | cxJsonDestroy(&json); | |
| 849 | } | |
| 850 | ||
| 851 | CX_TEST(test_json_number_format_errors) { | |
| 852 | CxJson json; | |
| 853 | cxJsonInit(&json, NULL); | |
| 854 | CX_TEST_DO { | |
| 855 | CxJsonValue *v; | |
| 856 | CxJsonStatus result; | |
| 857 | ||
| 858 | cxJsonFill(&json, "+3.1415 "); | |
| 859 | result = cxJsonNext(&json, &v); | |
| 860 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 861 | "leading plus is not RFC-8259 compliant"); | |
| 862 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 863 | cxJsonReset(&json); | |
| 864 | ||
| 865 | cxJsonFill(&json, "0.815e-3.0 "); | |
| 866 | result = cxJsonNext(&json, &v); | |
| 867 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 868 | "exponent must be an integer"); | |
| 869 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 870 | cxJsonReset(&json); | |
| 871 | ||
| 872 | cxJsonFill(&json, "3.14e "); | |
| 873 | result = cxJsonNext(&json, &v); | |
| 874 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 875 | "exponent cannot be empty"); | |
| 876 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 877 | cxJsonReset(&json); | |
| 878 | ||
| 879 | cxJsonFill(&json, "3.14e~7 "); | |
| 880 | result = cxJsonNext(&json, &v); | |
| 881 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 882 | "exponent cannot start with bullshit"); | |
| 883 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 884 | cxJsonReset(&json); | |
| 885 | ||
| 886 | cxJsonFill(&json, "1.23e4f "); | |
| 887 | result = cxJsonNext(&json, &v); | |
| 888 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 889 | "non-digits in exponent"); | |
| 890 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 891 | cxJsonReset(&json); | |
| 892 | ||
| 893 | cxJsonFill(&json, "1.23f "); | |
| 894 | result = cxJsonNext(&json, &v); | |
| 895 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 896 | "non-digits in value"); | |
| 897 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 898 | cxJsonReset(&json); | |
| 899 | ||
| 900 | cxJsonFill(&json, "1.23.45 "); | |
| 901 | result = cxJsonNext(&json, &v); | |
| 902 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 903 | "multiple decimal separators"); | |
| 904 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 905 | cxJsonReset(&json); | |
| 906 | ||
| 907 | cxJsonFill(&json, "184467440737095516150123456789 "); | |
| 908 | result = cxJsonNext(&json, &v); | |
| 909 | CX_TEST_ASSERTM(result == CX_JSON_FORMAT_ERROR_NUMBER, | |
| 910 | "30 digit int does not fit into 64-bit int"); | |
| 911 | CX_TEST_ASSERT(v->type == CX_JSON_NOTHING); | |
| 912 | cxJsonReset(&json); | |
|
973
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
913 | } |
|
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
914 | cxJsonDestroy(&json); |
|
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
915 | } |
|
05910a8994f7
add UCX string support to cxJsonFill()
Mike Becker <universe@uap-core.de>
parents:
966
diff
changeset
|
916 | |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
917 | CX_TEST(test_json_multiple_values) { |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
918 | CxJson json; |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
919 | cxJsonInit(&json, NULL); |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
920 | CX_TEST_DO { |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
921 | CxJsonValue *v; |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
922 | CxJsonStatus result; |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
923 | |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
924 | // read number |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
925 | cxJsonFill(&json, "10\n"); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
926 | 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
|
927 | 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
|
928 | CX_TEST_ASSERT(cxJsonIsNumber(v)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
929 | CX_TEST_ASSERT(cxJsonAsInteger(v) == 10); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
930 | cxJsonValueFree(v); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
931 | // read remaining '\n' |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
932 | 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
|
933 | 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
|
934 | // read string |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
935 | cxJsonFill(&json, "\"hello world\"\n"); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
936 | 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
|
937 | 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
|
938 | CX_TEST_ASSERT(cxJsonIsString(v)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
939 | CX_TEST_ASSERT(!cx_strcmp(cxJsonAsCxString(v), "hello world")); |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
940 | cxJsonValueFree(v); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
941 | // 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
|
942 | // read obj |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
943 | cxJsonFill(&json, "{ \"value\": \"test\" }\n"); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
944 | 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
|
945 | 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
|
946 | CX_TEST_ASSERT(cxJsonIsObject(v)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
947 | CxJsonValue *value = cxJsonObjGet(v, "value"); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
948 | CX_TEST_ASSERT(cxJsonAsString(value)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
949 | cxJsonValueFree(v); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
950 | // read array |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
951 | 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
|
952 | 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
|
953 | 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
|
954 | CX_TEST_ASSERT(cxJsonIsArray(v)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
955 | CxJsonValue *a0 = cxJsonArrGet(v, 0); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
956 | CxJsonValue *a3 = cxJsonArrGet(v, 3); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
957 | CX_TEST_ASSERT(cxJsonIsNumber(a0)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
958 | CX_TEST_ASSERT(cxJsonAsInteger(a0) == 0); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
959 | CX_TEST_ASSERT(cxJsonIsNumber(a3)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
960 | CX_TEST_ASSERT(cxJsonAsInteger(a3) == 3); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
961 | cxJsonValueFree(v); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
962 | // read literal |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
963 | cxJsonFill(&json, "true\n"); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
964 | 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
|
965 | 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
|
966 | CX_TEST_ASSERT(cxJsonIsLiteral(v)); |
| 1015 | 967 | CX_TEST_ASSERT(cxJsonIsBool(v)); |
| 968 | CX_TEST_ASSERT(cxJsonIsTrue(v)); | |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
969 | CX_TEST_ASSERT(cxJsonAsBool(v)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
970 | cxJsonValueFree(v); |
| 1015 | 971 | cxJsonFill(&json, "false\n"); |
| 972 | result = cxJsonNext(&json, &v); | |
| 973 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); | |
| 974 | CX_TEST_ASSERT(cxJsonIsLiteral(v)); | |
| 975 | CX_TEST_ASSERT(cxJsonIsBool(v)); | |
| 976 | CX_TEST_ASSERT(cxJsonIsFalse(v)); | |
| 977 | CX_TEST_ASSERT(!cxJsonAsBool(v)); | |
| 978 | cxJsonValueFree(v); | |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
979 | cxJsonFill(&json, "null\n"); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
980 | 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
|
981 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
| 1015 | 982 | CX_TEST_ASSERT(cxJsonIsLiteral(v)); |
| 983 | CX_TEST_ASSERT(!cxJsonIsBool(v)); | |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
984 | CX_TEST_ASSERT(cxJsonIsNull(v)); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
985 | cxJsonValueFree(v); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
986 | } |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
987 | cxJsonDestroy(&json); |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
988 | } |
|
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
989 | |
|
1337
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
990 | CX_TEST(test_json_array) { |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
991 | CxTestingAllocator talloc; |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
992 | cx_testing_allocator_init(&talloc); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
993 | const CxAllocator *allocator = &talloc.base; |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
994 | CX_TEST_DO { |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
995 | CxJsonValue *arr = cxJsonCreateArr(allocator); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
996 | cxJsonArrAddIntegers(arr, (int64_t[]){ 0, 3, 6, 9, 12, 15}, 6); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
997 | CX_TEST_ASSERT(cxJsonArrSize(arr) == 6); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
998 | CxJsonValue *e = cxJsonArrGet(arr, 3); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
999 | CX_TEST_ASSERT(cxJsonIsNumber(e)); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1000 | CX_TEST_ASSERT(cxJsonAsInteger(e) == 9); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1001 | CX_TEST_ASSERT(cxJsonAsDouble(e) == 9.0); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1002 | CX_TEST_ASSERT(cxJsonArrSize(arr) == 6); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1003 | e = cxJsonArrGet(arr, 6); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1004 | CX_TEST_ASSERT(!cxJsonIsNumber(e)); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1005 | // also not null, because "nothing" is not null |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1006 | CX_TEST_ASSERT(!cxJsonIsNull(e)); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1007 | CX_TEST_ASSERT(e->type == CX_JSON_NOTHING); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1008 | CxJsonValue *removed = cxJsonArrRemove(arr, 2); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1009 | CX_TEST_ASSERT(cxJsonIsNumber(removed)); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1010 | CX_TEST_ASSERT(cxJsonAsInteger(removed) == 6); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1011 | CX_TEST_ASSERT(cxJsonArrSize(arr) == 5); |
|
1338
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
1012 | e = cxJsonArrGet(arr, 3); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
1013 | CX_TEST_ASSERT(cxJsonIsNumber(e)); |
|
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
1014 | CX_TEST_ASSERT(cxJsonAsInteger(e) == 12); |
|
1337
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1015 | e = cxJsonArrRemove(arr, 5); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1016 | CX_TEST_ASSERT(e == NULL); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1017 | cxJsonValueFree(arr); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1018 | // the removed element still needs to be freed |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1019 | CX_TEST_ASSERT(!cx_testing_allocator_verify(&talloc)); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1020 | cxJsonValueFree(removed); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1021 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1022 | } |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1023 | cx_testing_allocator_destroy(&talloc); |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1024 | } |
|
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1025 | |
|
1033
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1026 | CX_TEST(test_json_array_iterator) { |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1027 | CxJson json; |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1028 | cxJsonInit(&json, NULL); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1029 | CX_TEST_DO { |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1030 | CxJsonValue *v; |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1031 | CxJsonStatus result; |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1032 | cxJsonFill(&json, "[ 0, 3, 6, 9, 12, 15 ]\n"); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1033 | result = cxJsonNext(&json, &v); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1034 | CX_TEST_ASSERT(result == CX_JSON_NO_ERROR); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1035 | CX_TEST_ASSERT(cxJsonIsArray(v)); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1036 | CxIterator iter = cxJsonArrIter(v); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1037 | unsigned i = 0; |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1038 | cx_foreach(CxJsonValue*, elem, iter) { |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1039 | CX_TEST_ASSERT(cxJsonIsNumber(elem)); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1040 | CX_TEST_ASSERT(i == cxJsonAsInteger(elem)); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1041 | i += 3; |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1042 | } |
|
1051
7d17bd1103d7
fix another missing free() in json tests
Mike Becker <universe@uap-core.de>
parents:
1033
diff
changeset
|
1043 | cxJsonValueFree(v); |
|
1033
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1044 | } |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1045 | cxJsonDestroy(&json); |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1046 | } |
|
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1047 | |
|
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1048 | CX_TEST(test_json_allocator) { |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1049 | CxTestingAllocator talloc; |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1050 | cx_testing_allocator_init(&talloc); |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1051 | CxAllocator *allocator = &talloc.base; |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1052 | |
|
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1053 | cxstring text = cx_str( |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1054 | "{\n" |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1055 | "\t\"message\":\"success\",\n" |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1056 | "\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
|
1057 | "}" |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1058 | ); |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1059 | |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1060 | CX_TEST_DO { |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1061 | CxJson json; |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1062 | cxJsonInit(&json, allocator); |
|
996
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1063 | cxJsonFill(&json, text); |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1064 | |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1065 | CxJsonValue *obj; |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
1066 | 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
|
1067 | 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
|
1068 | 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
|
1069 | |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1070 | // this recursively frees everything |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1071 | cxJsonValueFree(obj); |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1072 | cxJsonDestroy(&json); |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1073 | |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1074 | 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
|
1075 | } |
|
1000
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1076 | cx_testing_allocator_destroy(&talloc); |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1077 | } |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1078 | |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1079 | CX_TEST(test_json_allocator_parse_error) { |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1080 | CxTestingAllocator talloc; |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1081 | cx_testing_allocator_init(&talloc); |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1082 | CxAllocator *allocator = &talloc.base; |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1083 | |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1084 | cxstring text = cx_str( |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1085 | "{\n" |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1086 | "\t\"message\":\"success\"\n" // <-- missing comma |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1087 | "\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
|
1088 | "}" |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1089 | ); |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1090 | |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1091 | CX_TEST_DO { |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1092 | CxJson json; |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1093 | cxJsonInit(&json, allocator); |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1094 | cxJsonFill(&json, text); |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1095 | |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1096 | CxJsonValue *obj = NULL; |
|
1002
1483c47063a8
add status codes to json parser - relates to #431
Mike Becker <universe@uap-core.de>
parents:
1000
diff
changeset
|
1097 | 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
|
1098 | 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
|
1099 | 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
|
1100 | |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1101 | // clean-up any left-over memory |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1102 | cxJsonDestroy(&json); |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1103 | |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1104 | 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
|
1105 | } |
|
1aecddf7e209
simplify how the json parser works
Mike Becker <universe@uap-core.de>
parents:
997
diff
changeset
|
1106 | 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
|
1107 | } |
|
333155f234c4
add support for allocators to the json parser
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
978
diff
changeset
|
1108 | |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1109 | 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
|
1110 | 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
|
1111 | 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
|
1112 | 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
|
1113 | 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
|
1114 | /* |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1115 | * 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
|
1116 | * |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1117 | * { |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1118 | * "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
|
1119 | * "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
|
1120 | * "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
|
1121 | * "nested": { |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1122 | * "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
|
1123 | * "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
|
1124 | * "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
|
1125 | * "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
|
1126 | * } |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1127 | * } |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1128 | */ |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1129 | |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1130 | |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1131 | // 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
|
1132 | 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
|
1133 | 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
|
1134 | 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
|
1135 | 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
|
1136 | |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1137 | // 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
|
1138 | { |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1139 | cxJsonObjPutLiteral(obj, "bool", CX_JSON_FALSE); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1140 | cxJsonObjPutInteger(obj, "int", 47); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1141 | CxJsonValue *strings = cxJsonObjPutArr(obj, "strings"); |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1142 | 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
|
1143 | 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
|
1144 | 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
|
1145 | 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
|
1146 | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1147 | CxJsonValue *nested = cxJsonObjPutObj(obj, "nested"); |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1148 | 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
|
1149 | CX_TEST_ASSERT(cxJsonIsObject(nested)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1150 | cxJsonObjPutString(nested, "string", "test"); |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1151 | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1152 | cxJsonArrAddNumbers(cxJsonObjPutArr(nested, "floats"), |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1153 | (double[]){3.1415, 47.11, 8.15}, 3); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1154 | cxJsonArrAddIntegers(cxJsonObjPutArr(nested, "ints"), |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1155 | (int64_t[]){4, 8, 15, 16, 23, 42}, 6); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1156 | cxJsonArrAddLiterals(cxJsonObjPutArr(nested, "literals"), |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1157 | (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
|
1158 | } |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1159 | |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1160 | // 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
|
1161 | { |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1162 | 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
|
1163 | 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
|
1164 | 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
|
1165 | 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
|
1166 | CX_TEST_ASSERT(2 == cxJsonArrSize(strings)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1167 | CX_TEST_ASSERT(0 == cx_strcmp("hello", cxJsonAsString(cxJsonArrGet(strings, 0)))); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1168 | CX_TEST_ASSERT(0 == cx_strcmp("world", cxJsonAsString(cxJsonArrGet(strings, 1)))); |
|
1057
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1169 | |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1170 | 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
|
1171 | 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
|
1172 | 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
|
1173 | 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
|
1174 | 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
|
1175 | 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
|
1176 | 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
|
1177 | 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
|
1178 | 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
|
1179 | 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
|
1180 | 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
|
1181 | 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
|
1182 | 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
|
1183 | 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
|
1184 | 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
|
1185 | 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
|
1186 | 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
|
1187 | 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
|
1188 | 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
|
1189 | 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
|
1190 | 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
|
1191 | 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
|
1192 | 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
|
1193 | 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
|
1194 | } |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1195 | |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1196 | // 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
|
1197 | 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
|
1198 | 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
|
1199 | } |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1200 | 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
|
1201 | } |
|
4e8436c3e806
add tests for JSON create functions and fix a bug in cxJsonCreateCxString()
Mike Becker <universe@uap-core.de>
parents:
1051
diff
changeset
|
1202 | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1203 | CX_TEST(test_json_overwrite_value) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1204 | CxTestingAllocator talloc; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1205 | cx_testing_allocator_init(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1206 | CxAllocator *allocator = &talloc.base; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1207 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1208 | CxJsonValue *obj = cxJsonCreateObj(allocator); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1209 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1210 | // put some values |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1211 | cxJsonObjPutInteger(obj, "test1", 1); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1212 | cxJsonObjPutInteger(obj, "test2", 2); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1213 | cxJsonObjPutInteger(obj, "test3", 3); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1214 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1215 | // overwrite test2 |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1216 | cxJsonObjPutInteger(obj, "test2", 0); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1217 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1218 | // verify the values |
|
1547
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1219 | CxMapIterator iter = cxJsonObjIter(obj); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1220 | bool found[5] = {0}; |
|
1547
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1221 | cx_foreach(CxMapEntry *, ov, iter) { |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1222 | CxJsonValue *v = ov->value; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1223 | CX_TEST_ASSERT(cxJsonIsInteger(v)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1224 | int64_t i = cxJsonAsInteger(v); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1225 | CX_TEST_ASSERT(i >= 0 && i <= 4); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1226 | found[i] = true; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1227 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1228 | CX_TEST_ASSERT(found[0]); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1229 | CX_TEST_ASSERT(found[1]); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1230 | CX_TEST_ASSERT(!found[2]); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1231 | CX_TEST_ASSERT(found[3]); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1232 | CX_TEST_ASSERT(!found[4]); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1233 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1234 | // destroy the value and verify the allocations |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1235 | cxJsonValueFree(obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1236 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1237 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1238 | cx_testing_allocator_destroy(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1239 | } |
|
1072
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
1240 | |
|
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1241 | 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
|
1242 | 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
|
1243 | cxstring expected, |
|
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1244 | 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
|
1245 | ) { |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1246 | // 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
|
1247 | CxJsonValue *obj = cxJsonCreateObj(allocator); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1248 | cxJsonObjPutLiteral(obj, "bool", CX_JSON_FALSE); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1249 | cxJsonObjPutNumber(obj, "int", 47); // purposely use PutNumber to put an int |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1250 | CxJsonValue *strings = cxJsonObjPutArr(obj, "strings"); |
|
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1251 | cxJsonArrAddCxStrings(strings, (cxstring[]) {CX_STR("hello"), CX_STR("world")}, 2); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1252 | CxJsonValue *nested = cxJsonObjPutObj(obj, "nested"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1253 | CxJsonValue *objects = cxJsonObjPutArr(nested, "objects"); |
|
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1254 | CxJsonValue *obj_in_arr[2] = {cxJsonCreateObj(allocator), cxJsonCreateObj(allocator)}; |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1255 | cxJsonObjPutInteger(obj_in_arr[0], "name1", 1); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1256 | cxJsonObjPutInteger(obj_in_arr[0], "name2", 3); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1257 | cxJsonObjPutInteger(obj_in_arr[1], "name2", 7); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1258 | cxJsonObjPutInteger(obj_in_arr[1], "name1", 3); |
|
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1259 | cxJsonArrAddValues(objects, obj_in_arr, 2); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1260 | cxJsonArrAddNumbers(cxJsonObjPutArr(nested, "floats"), |
|
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1261 | (double[]){3.1415, 47.11, 8.15}, 3); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1262 | cxJsonArrAddLiterals(cxJsonObjPutArr(nested, "literals"), |
|
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1263 | (CxJsonLiteral[]){CX_JSON_TRUE, CX_JSON_NULL, CX_JSON_FALSE}, 3); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1264 | CxJsonValue *ints = cxJsonObjPutArr(nested, "ints"); |
|
1080
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1265 | 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
|
1266 | 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
|
1267 | 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
|
1268 | 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
|
1269 | 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
|
1270 | |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1271 | // 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
|
1272 | CxBuffer buf; |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1273 | 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
|
1274 | 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
|
1275 | 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
|
1276 | 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
|
1277 | |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1278 | // 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
|
1279 | 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
|
1280 | |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1281 | // destroy everything |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1282 | cxBufferDestroy(&buf); |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1283 | cxJsonValueFree(obj); |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1284 | } |
|
e16f4f336e3c
add test case for pretty printing with tabs - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1078
diff
changeset
|
1285 | |
|
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1286 | 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
|
1287 | CxTestingAllocator talloc; |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1288 | 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
|
1289 | CxAllocator *allocator = &talloc.base; |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1290 | CX_TEST_DO { |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1291 | // expected value |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1292 | cxstring expected = cx_str( |
|
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1293 | "{\"bool\":false," |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1294 | "\"int\":47," |
|
1547
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1295 | "\"strings\":[\"hello\",\"world\"]," |
|
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1296 | "\"nested\":{" |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1297 | "\"objects\":[{" |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1298 | "\"name1\":1," |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1299 | "\"name2\":3" |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1300 | "},{" |
|
1547
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1301 | "\"name2\":7," |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1302 | "\"name1\":3" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1303 | "}]," |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1304 | "\"floats\":[3.1415,47.11,8.15]," |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1305 | "\"literals\":[true,null,false]," |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1306 | "\"ints\":[4,8,15,[16,23],42]" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1307 | "}" |
|
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1308 | "}" |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1309 | ); |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1310 | |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1311 | CxJsonWriter writer = cxJsonWriterCompact(); |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1312 | CX_TEST_CALL_SUBROUTINE(test_json_write_sub, allocator, expected, &writer); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1313 | // try again, but this time with implicitly defaulted writer |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1314 | CX_TEST_CALL_SUBROUTINE(test_json_write_sub, allocator, expected, NULL); |
|
1081
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1315 | 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
|
1316 | } |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1317 | 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
|
1318 | } |
|
33c9d7e7d830
remove code duplication from writer tests - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1080
diff
changeset
|
1319 | |
|
1078
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1320 | 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
|
1321 | CxTestingAllocator talloc; |
|
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1322 | cx_testing_allocator_init(&talloc); |
|
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1323 | CxAllocator *allocator = &talloc.base; |
|
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1324 | CX_TEST_DO { |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1325 | cxstring expected = cx_str( |
|
1078
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1326 | "{\n" |
|
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1327 | " \"bool\": false,\n" |
|
ffa8bb4e9288
implement JSON pretty printing - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1075
diff
changeset
|
1328 | " \"int\": 47,\n" |
|
1082
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1329 | " \"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
|
1330 | " \"nested\": {\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1331 | " \"objects\": [{\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1332 | " \"name1\": 1,\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1333 | " \"name2\": 3\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1334 | " }, {\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1335 | " \"name2\": 7,\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1336 | " \"name1\": 3\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1337 | " }],\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1338 | " \"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
|
1339 | " \"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
|
1340 | " \"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
|
1341 | " }\n" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1342 | "}" |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1343 | ); |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1344 | |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1345 | CxJsonWriter writer = cxJsonWriterPretty(true); |
|
1547
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1346 | CX_TEST_CALL_SUBROUTINE(test_json_write_sub, allocator, expected, &writer); |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1347 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1348 | } |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1349 | cx_testing_allocator_destroy(&talloc); |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1350 | } |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1351 | |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1352 | CX_TEST(test_json_write_pretty_default_tabs) { |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1353 | CxTestingAllocator talloc; |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1354 | cx_testing_allocator_init(&talloc); |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1355 | CxAllocator *allocator = &talloc.base; |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1356 | CX_TEST_DO { |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1357 | cxstring expected = cx_str( |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1358 | "{\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1359 | "\t\"bool\": false,\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1360 | "\t\"int\": 47,\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1361 | "\t\"strings\": [\"hello\", \"world\"],\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1362 | "\t\"nested\": {\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1363 | "\t\t\"objects\": [{\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1364 | "\t\t\t\"name1\": 1,\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1365 | "\t\t\t\"name2\": 3\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1366 | "\t\t}, {\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1367 | "\t\t\t\"name2\": 7,\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1368 | "\t\t\t\"name1\": 3\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1369 | "\t\t}],\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1370 | "\t\t\"floats\": [3.1415, 47.11, 8.15],\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1371 | "\t\t\"literals\": [true, null, false],\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1372 | "\t\t\"ints\": [4, 8, 15, [16, 23], 42]\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1373 | "\t}\n" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1374 | "}" |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1375 | ); |
|
12da0654e4a9
replace JSON object member array with kv-list - resolves #762
Mike Becker <universe@uap-core.de>
parents:
1543
diff
changeset
|
1376 | CxJsonWriter writer = cxJsonWriterPretty(false); |
|
1082
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1377 | 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
|
1378 | 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
|
1379 | } |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1380 | 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
|
1381 | } |
|
46cdc8689fc4
implement index array to preserve order of json object members
Mike Becker <universe@uap-core.de>
parents:
1081
diff
changeset
|
1382 | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1383 | CX_TEST(test_json_write_pretty_deep_nesting) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1384 | CxTestingAllocator talloc; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1385 | cx_testing_allocator_init(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1386 | CxAllocator *allocator = &talloc.base; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1387 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1388 | cxstring expected = cx_str( |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1389 | "{\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1390 | " \"test\": {\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1391 | " \"test\": {\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1392 | " \"test\": {\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1393 | " \"test\": {\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1394 | " \"test\": {\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1395 | " \"test\": 47\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1396 | " }\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1397 | " }\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1398 | " }\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1399 | " }\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1400 | " }\n" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1401 | "}" |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1402 | ); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1403 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1404 | CxJsonValue *obj = cxJsonCreateObj(allocator); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1405 | CxJsonValue *test = obj; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1406 | for (unsigned i = 0 ; i < 5 ; i++) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1407 | test = cxJsonObjPutObj(test, "test"); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1408 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1409 | cxJsonObjPutInteger(test, "test", 47); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1410 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1411 | CxJsonWriter writer = cxJsonWriterPretty(true); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1412 | writer.indent = 8; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1413 | CxBuffer buf; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1414 | cxBufferInit(&buf, NULL, 512, NULL, CX_BUFFER_DEFAULT); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1415 | int result = cxJsonWrite(&buf, obj, cxBufferWriteFunc, &writer); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1416 | cxBufferTerminate(&buf); // makes debugging easier |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1417 | CX_TEST_ASSERT(result == 0); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1418 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1419 | // compare the string |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1420 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), expected)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1421 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1422 | // destroy everything |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1423 | cxBufferDestroy(&buf); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1424 | cxJsonValueFree(obj); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1425 | |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1426 | CX_TEST_ASSERT(cx_testing_allocator_verify(&talloc)); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1427 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1428 | cx_testing_allocator_destroy(&talloc); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1429 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1430 | |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1431 | 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
|
1432 | CxJsonValue* num = cxJsonCreateNumber(NULL, 3.141592653589793); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1433 | CxJsonWriter writer = cxJsonWriterCompact(); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1434 | CxBuffer buf; |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1435 | cxBufferInit(&buf, NULL, 32, NULL, 0); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1436 | CX_TEST_DO { |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1437 | // test default settings (6 digits) |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1438 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1439 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "3.141592")); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1440 | |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1441 | // test too many digits |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1442 | cxBufferReset(&buf); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1443 | writer.frac_max_digits = 200; |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1444 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1445 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "3.141592653589793")); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1446 | |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1447 | // test 0 digits |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1448 | cxBufferReset(&buf); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1449 | writer.frac_max_digits = 0; |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1450 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1451 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "3")); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1452 | |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1453 | // test 2 digits |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1454 | cxBufferReset(&buf); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1455 | writer.frac_max_digits = 2; |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1456 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1457 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "3.14")); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1458 | |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1459 | // test 3 digits |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1460 | cxBufferReset(&buf); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1461 | writer.frac_max_digits = 3; |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1462 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1463 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "3.141")); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1464 | |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1465 | // test 6 digits, but two are left of the decimal point |
|
1543
7b66371d6da3
use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents:
1513
diff
changeset
|
1466 | num->number = 47.110815; |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1467 | cxBufferReset(&buf); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1468 | writer.frac_max_digits = 6; |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1469 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1470 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "47.110815")); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1471 | |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1472 | // test 4 digits with exponent |
|
1543
7b66371d6da3
use an anonymous union for the CxJsonValue
Mike Becker <universe@uap-core.de>
parents:
1513
diff
changeset
|
1473 | num->number = 5.11223344e23; |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1474 | cxBufferReset(&buf); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1475 | writer.frac_max_digits = 4; |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1476 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, num, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1477 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "5.1122e+23")); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1478 | } |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1479 | cxBufferDestroy(&buf); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1480 | cxJsonValueFree(num); |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1481 | } |
|
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1482 | |
|
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1483 | CX_TEST(test_json_write_string_escape) { |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1484 | /** |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1485 | * 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
|
1486 | * " quotation mark |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1487 | * \ reverse solidus |
|
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1488 | * / 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
|
1489 | * b backspace |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1490 | * f form feed |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1491 | * n line feed |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1492 | * r carriage return |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1493 | * t tab |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1494 | * 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
|
1495 | * 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
|
1496 | */ |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1497 | CxJsonValue* str = cxJsonCreateString(NULL, |
|
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1498 | "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
|
1499 | CxJsonWriter writer = cxJsonWriterCompact(); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1500 | CxBuffer buf; |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1501 | cxBufferInit(&buf, NULL, 128, NULL, 0); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1502 | CX_TEST_DO { |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1503 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, str, cxBufferWriteFunc, &writer)); |
|
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1504 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1505 | "\"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
|
1506 | } |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1507 | cxBufferDestroy(&buf); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1508 | cxJsonValueFree(str); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1509 | } |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1510 | |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1511 | CX_TEST(test_json_write_name_escape) { |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1512 | CxJsonValue* obj = cxJsonCreateObj(NULL); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1513 | cxJsonObjPutLiteral(obj, |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1514 | "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
|
1515 | CxJsonWriter writer = cxJsonWriterCompact(); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1516 | CxBuffer buf; |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1517 | cxBufferInit(&buf, NULL, 128, NULL, 0); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1518 | CX_TEST_DO { |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1519 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, obj, cxBufferWriteFunc, &writer)); |
|
1119
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1520 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1521 | "{\"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
|
1522 | } |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1523 | cxBufferDestroy(&buf); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1524 | cxJsonValueFree(obj); |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1525 | } |
|
ff4d7e76f85a
implement string escape - resolves #526
Mike Becker <universe@uap-core.de>
parents:
1117
diff
changeset
|
1526 | |
|
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1527 | CX_TEST(test_json_write_solidus) { |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1528 | CxJsonValue* str = cxJsonCreateString(NULL,"test/solidus"); |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1529 | CxJsonWriter writer = cxJsonWriterCompact(); |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1530 | CxBuffer buf; |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1531 | cxBufferInit(&buf, NULL, 16, NULL, 0); |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1532 | CX_TEST_DO { |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1533 | // default: do not escape |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1534 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, str, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1535 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "\"test/solidus\"")); |
|
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1536 | |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1537 | // enable escaping |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1538 | writer.escape_slash = true; |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1539 | cxBufferReset(&buf); |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1540 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, str, cxBufferWriteFunc, &writer)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1541 | CX_TEST_ASSERT(0 == cx_strcmp(cx_strn(buf.space, buf.size), "\"test\\/solidus\"")); |
|
1123
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1542 | } |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1543 | cxBufferDestroy(&buf); |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1544 | cxJsonValueFree(str); |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1545 | } |
|
2b83302d595a
make escaping slashes optional - fixes #569
Mike Becker <universe@uap-core.de>
parents:
1119
diff
changeset
|
1546 | |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1547 | CX_TEST(test_json_write_nothing) { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1548 | CxBuffer buf; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1549 | cxBufferInit(&buf, NULL, 16, NULL, 0); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1550 | CX_TEST_DO { |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1551 | CxJsonValue nothing; |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1552 | nothing.type = CX_JSON_NOTHING; |
|
1548
12315ee158ad
fixes cxJsonWrite() incorrectly returning non-zero when strings needed to be escaped
Mike Becker <universe@uap-core.de>
parents:
1547
diff
changeset
|
1553 | CX_TEST_ASSERT(0 == cxJsonWrite(&buf, ¬hing, cxBufferWriteFunc, NULL)); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1554 | CX_TEST_ASSERT(buf.size == 0); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1555 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1556 | cxBufferDestroy(&buf); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1557 | } |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1558 | |
|
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1559 | 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
|
1560 | 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
|
1561 | |
|
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
1562 | 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
|
1563 | cx_test_register(suite, test_json_simple_object); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1564 | cx_test_register(suite, test_json_large_object); |
|
1556
afdaa70034f8
add cxJsonFromString() - resolves #771
Mike Becker <universe@uap-core.de>
parents:
1548
diff
changeset
|
1565 | cx_test_register(suite, test_json_from_string); |
|
1563
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
1566 | cx_test_register(suite, test_json_from_string_errors); |
|
6e2f83ef6f5a
fix memory leak in the json parser and add more tests for cxJsonFromString - relates to #777
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1556
diff
changeset
|
1567 | cx_test_register(suite, test_json_from_string_multiple_values); |
| 1015 | 1568 | cx_test_register(suite, test_json_escaped_strings); |
|
1149
df5665de7344
implement unicode escape sequences in json unescape_string function
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
1139
diff
changeset
|
1569 | cx_test_register(suite, test_json_escaped_unicode_strings); |
|
1156
96f16b5a0029
add test and implementation for malformed escape sequences
Mike Becker <universe@uap-core.de>
parents:
1154
diff
changeset
|
1570 | cx_test_register(suite, test_json_escaped_unicode_malformed); |
|
1139
7dfa5bcf39ee
remove token_escape bool from CxJson struct
Mike Becker <universe@uap-core.de>
parents:
1130
diff
changeset
|
1571 | 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
|
1572 | cx_test_register(suite, test_json_object_incomplete_token); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1573 | cx_test_register(suite, test_json_parenthesis_mismatch); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1574 | cx_test_register(suite, test_json_object_name_is_no_string); |
| 1015 | 1575 | 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
|
1576 | cx_test_register(suite, test_json_object_error); |
|
1338
cc153bffea28
add cxJsonObjRemove() #627
Mike Becker <universe@uap-core.de>
parents:
1337
diff
changeset
|
1577 | cx_test_register(suite, test_json_object_remove_member); |
|
1007
81b2986d2b04
fix that cxBufferSeek() cannot move pos past the end - fixes #523
Mike Becker <universe@uap-core.de>
parents:
1002
diff
changeset
|
1578 | cx_test_register(suite, test_json_subsequent_fill); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1579 | cx_test_register(suite, test_json_no_fill); |
|
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1580 | cx_test_register(suite, test_json_null_fill); |
|
946
b428424c0214
avoid state buffer allocation for JSON with reasonable nesting depth
Mike Becker <universe@uap-core.de>
parents:
941
diff
changeset
|
1581 | 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
|
1582 | cx_test_register(suite, test_json_number); |
| 1015 | 1583 | 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
|
1584 | cx_test_register(suite, test_json_multiple_values); |
|
1337
6dfa1eb58ce3
add cxJsonArrayRemove()
Mike Becker <universe@uap-core.de>
parents:
1247
diff
changeset
|
1585 | cx_test_register(suite, test_json_array); |
|
1033
e3009345984b
add cxJsonArrIter() - fixes #524
Mike Becker <universe@uap-core.de>
parents:
1032
diff
changeset
|
1586 | 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
|
1587 | 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
|
1588 | 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
|
1589 | cx_test_register(suite, test_json_create_value); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1590 | cx_test_register(suite, test_json_overwrite_value); |
|
1072
c89283cd559b
first mvp for the json writer - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1063
diff
changeset
|
1591 | 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
|
1592 | 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
|
1593 | cx_test_register(suite, test_json_write_pretty_default_tabs); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1594 | cx_test_register(suite, test_json_write_pretty_deep_nesting); |
|
1117
54df904472b0
add fractional number formatting - relates to #526
Mike Becker <universe@uap-core.de>
parents:
1112
diff
changeset
|
1595 | 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
|
1596 | 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
|
1597 | 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
|
1598 | cx_test_register(suite, test_json_write_solidus); |
|
1513
4d641c6a2f82
implement better strings for json.c + complete test coverage
Mike Becker <universe@uap-core.de>
parents:
1338
diff
changeset
|
1599 | cx_test_register(suite, test_json_write_nothing); |
|
977
a941b01b684f
add test for reading multiple json values
Olaf Wintermann <olaf.wintermann@gmail.com>
parents:
975
diff
changeset
|
1600 | |
|
937
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1601 | return suite; |
|
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1602 | } |
|
10123f4d5618
add first draft of json implementation - relates to #431
Mike Becker <universe@uap-core.de>
parents:
diff
changeset
|
1603 |