1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
|
diff --git a/README.md b/README.md
index a94e5c4..a442279 100644
--- a/README.md
+++ b/README.md
@@ -328,7 +328,6 @@ Valijson supports JSON documents loaded using various JSON parser libraries. It
- [boost::property\_tree 1.54](http://www.boost.org/doc/libs/1_54_0/doc/html/boost_propertytree/synopsis.html)
- [Boost.JSON 1.75](https://www.boost.org/doc/libs/1_75_0/libs/json/doc/html/index.html)
- - [json11 (commit afcc8d0)](https://github.com/dropbox/json11/tree/afcc8d0d82b1ce2df587a7a0637d05ba493bf5e6)
- [jsoncpp 1.9.4](https://github.com/open-source-parsers/jsoncpp/archive/1.9.4.tar.gz)
- [nlohmann/json 1.1.0](https://github.com/nlohmann/json/archive/v1.1.0.tar.gz)
- [rapidjson (commit 48fbd8c)](https://github.com/Tencent/rapidjson/tree/48fbd8cd202ca54031fe799db2ad44ffa8e77c13)
diff --git a/tests/test_adapter_comparison.cpp b/tests/test_adapter_comparison.cpp
index f559ef0..8041c9c 100644
--- a/tests/test_adapter_comparison.cpp
+++ b/tests/test_adapter_comparison.cpp
@@ -8,13 +8,11 @@
#include <gtest/gtest.h>
-#include <valijson/adapters/json11_adapter.hpp>
#include <valijson/adapters/jsoncpp_adapter.hpp>
#include <valijson/adapters/nlohmann_json_adapter.hpp>
#include <valijson/adapters/picojson_adapter.hpp>
#include <valijson/adapters/rapidjson_adapter.hpp>
-#include <valijson/utils/json11_utils.hpp>
#include <valijson/utils/jsoncpp_utils.hpp>
#include <valijson/utils/nlohmann_json_utils.hpp>
#include <valijson/utils/picojson_utils.hpp>
@@ -333,70 +331,6 @@ TEST_F(TestAdapterComparison, RapidJsonCrtAllocVsRapidJsonCrtAlloc)
rapidjson::CrtAllocator> > >();
}
-//
-// Json11Adapter vs X
-// ------------------------------------------------------------------------------------------------
-
-TEST_F(TestAdapterComparison, Json11VsJson11)
-{
- testComparison<
- valijson::adapters::Json11Adapter,
- valijson::adapters::Json11Adapter>();
-}
-
-TEST_F(TestAdapterComparison, Json11VsJsonCpp)
-{
- testComparison<
- valijson::adapters::Json11Adapter,
- valijson::adapters::JsonCppAdapter>();
-}
-
-
-TEST_F(TestAdapterComparison, Json11VsRapidJson)
-{
- testComparison<
- valijson::adapters::Json11Adapter,
- valijson::adapters::RapidJsonAdapter>();
-}
-
-TEST_F(TestAdapterComparison, Json11VsRapidJsonCrtAlloc)
-{
- testComparison<
- valijson::adapters::Json11Adapter,
- valijson::adapters::GenericRapidJsonAdapter<
- rapidjson::GenericValue<rapidjson::UTF8<>,
- rapidjson::CrtAllocator> > >();
-}
-
-TEST_F(TestAdapterComparison, Json11VsPicoJson)
-{
- testComparison<
- valijson::adapters::Json11Adapter,
- valijson::adapters::PicoJsonAdapter>();
-}
-
-#ifdef VALIJSON_BUILD_BOOST_JSON_ADAPTER
-
-TEST_F(TestAdapterComparison, Json11VsBoostJson)
-{
- testComparison<
- valijson::adapters::Json11Adapter,
- valijson::adapters::BoostJsonAdapter>();
-}
-
-#endif // VALIJSON_BUILD_BOOST_JSON_ADAPTER
-
-#ifdef VALIJSON_BUILD_BOOST_PROPERTY_TREE_ADAPTER
-
-TEST_F(TestAdapterComparison, Json11VsPropertyTree)
-{
- testComparison<
- valijson::adapters::Json11Adapter,
- valijson::adapters::PropertyTreeAdapter>();
-}
-
-#endif // VALIJSON_BUILD_BOOST_PROPERTY_TREE_ADAPTER
-
//
// NlohmannJsonAdapter vs X
// ------------------------------------------------------------------------------------------------
@@ -407,13 +341,6 @@ TEST_F(TestAdapterComparison, NlohmannJsonVsNlohmannJson) {
valijson::adapters::NlohmannJsonAdapter>();
}
-TEST_F(TestAdapterComparison, NlohmannJsonVsJson11)
-{
- testComparison<
- valijson::adapters::NlohmannJsonAdapter,
- valijson::adapters::Json11Adapter>();
-}
-
TEST_F(TestAdapterComparison, NlohmannJsonVsJsonCpp)
{
testComparison<
@@ -531,13 +458,6 @@ TEST_F(TestAdapterComparison, QtJsonVsPropertyTree)
#endif // VALIJSON_BUILD_BOOST_PROPERTY_TREE_ADAPTER
-TEST_F(TestAdapterComparison, QtJsonVsJson11)
-{
- testComparison<
- valijson::adapters::QtJsonAdapter,
- valijson::adapters::Json11Adapter>();
-}
-
TEST_F(TestAdapterComparison, QtJsonVsNlohmannJson)
{
testComparison<
@@ -612,13 +532,6 @@ TEST_F(TestAdapterComparison, PocoJsonVsPropertyTree)
#endif // VALIJSON_BUILD_BOOST_PROPERTY_TREE_ADAPTER
-TEST_F(TestAdapterComparison, PocoJsonVsJson11)
-{
- testComparison<
- valijson::adapters::PocoJsonAdapter,
- valijson::adapters::Json11Adapter>();
-}
-
TEST_F(TestAdapterComparison, PocoJsonVsNlohmannJsonAdapter)
{
testComparison<
diff --git a/tests/test_validator.cpp b/tests/test_validator.cpp
index e2bf78e..34b1ecf 100644
--- a/tests/test_validator.cpp
+++ b/tests/test_validator.cpp
@@ -11,12 +11,10 @@
#include <gtest/gtest.h>
-#include <valijson/adapters/json11_adapter.hpp>
#include <valijson/adapters/jsoncpp_adapter.hpp>
#include <valijson/adapters/rapidjson_adapter.hpp>
#include <valijson/adapters/picojson_adapter.hpp>
#include <valijson/adapters/nlohmann_json_adapter.hpp>
-#include <valijson/utils/json11_utils.hpp>
#include <valijson/utils/jsoncpp_utils.hpp>
#include <valijson/utils/picojson_utils.hpp>
#include <valijson/utils/rapidjson_utils.hpp>
@@ -174,7 +172,6 @@ protected:
void processTestFile(const std::string &testFile,
const SchemaParser::Version version)
{
- processTestFile<valijson::adapters::Json11Adapter>(testFile, version);
processTestFile<valijson::adapters::JsonCppAdapter>(testFile, version);
processTestFile<valijson::adapters::RapidJsonAdapter>(testFile, version);
processTestFile<valijson::adapters::PicoJsonAdapter>(testFile, version);
diff --git a/tests/test_validator_with_custom_regular_expression_engine.cpp b/tests/test_validator_with_custom_regular_expression_engine.cpp
index 57f09d1..5629f0f 100644
--- a/tests/test_validator_with_custom_regular_expression_engine.cpp
+++ b/tests/test_validator_with_custom_regular_expression_engine.cpp
@@ -7,18 +7,16 @@
#endif
#include <iostream>
#include <gtest/gtest.h>
-#include <valijson/adapters/json11_adapter.hpp>
#include <valijson/adapters/jsoncpp_adapter.hpp>
#include <valijson/adapters/rapidjson_adapter.hpp>
#include <valijson/adapters/picojson_adapter.hpp>
#include <valijson/adapters/nlohmann_json_adapter.hpp>
-#include <valijson/utils/json11_utils.hpp>
#include <valijson/utils/jsoncpp_utils.hpp>
#include <valijson/utils/picojson_utils.hpp>
#include <valijson/utils/rapidjson_utils.hpp>
#include <valijson/utils/nlohmann_json_utils.hpp>
#include <valijson/schema.hpp>
#include <valijson/schema_parser.hpp>
|
