Skip to content

Commit 7681a8e

Browse files
Easton97-JensEaston97-Jens
committed
test error corrected
1 parent a30e0da commit 7681a8e

File tree

9 files changed

+32
-27
lines changed

9 files changed

+32
-27
lines changed

‎src/request_body_processor/json.cc‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ bool JSON::init() {
5151
}
5252

5353

54-
bool JSON::processChunk(const char *buf, unsigned int size, std::string *err) {
54+
bool JSON::processChunk(const char *buf, unsigned int size,
55+
const std::string *err) {
56+
(void) err;
5557
if (buf != nullptr && size > 0) {
5658
m_data.append(buf, size);
5759
}

‎src/request_body_processor/json.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,10 +53,11 @@ class JSONContainerMap : public JSONContainer {
5353
class JSON : public JsonEventSink {
5454
public:
5555
explicit JSON(Transaction *transaction);
56-
~JSON();
56+
~JSON() override;
5757

5858
bool init();
59-
bool processChunk(const char *buf, unsigned int size, std::string *err);
59+
bool processChunk(const char *buf, unsigned int size,
60+
const std::string *err);
6061
bool complete(std::string *err);
6162

6263
int addArgument(const std::string& value);

‎src/utils/json_writer.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ const std::string& JsonWriter::str() const {
8989
return m_output;
9090
}
9191

92-
std::string JsonWriter::to_string() const {
92+
const std::string& JsonWriter::to_string() const {
9393
return m_output;
9494
}
9595

‎src/utils/json_writer.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ class JsonWriter {
4141
void null();
4242

4343
const std::string& str() const;
44-
std::string to_string() const;
44+
const std::string& to_string() const;
4545

4646
private:
4747
enum class ContainerType {

‎test/common/json.h‎

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,14 @@ enum class JsonType {
3636
Unknown
3737
};
3838

39+
using JsonNode = jsoncons::ojson;
40+
3941
class JsonValue;
4042

4143
class JsonField {
4244
public:
4345
JsonField() = default;
44-
JsonField(std::string_view key, const jsoncons::json *value)
46+
JsonField(std::string_view key, const JsonNode *value)
4547
: m_key(key),
4648
m_value(value) { }
4749

@@ -57,14 +59,14 @@ class JsonField {
5759

5860
private:
5961
std::string_view m_key;
60-
const jsoncons::json *m_value{nullptr};
62+
const JsonNode *m_value{nullptr};
6163
};
6264

6365
class JsonArray {
6466
public:
6567
class iterator {
6668
public:
67-
explicit iterator(jsoncons::json::const_array_iterator iterator)
69+
explicit iterator(JsonNode::const_array_iterator iterator)
6870
: m_iterator(iterator) { }
6971

7072
JsonValue operator*() const;
@@ -79,11 +81,11 @@ class JsonArray {
7981
}
8082

8183
private:
82-
jsoncons::json::const_array_iterator m_iterator;
84+
JsonNode::const_array_iterator m_iterator;
8385
};
8486

8587
JsonArray() = default;
86-
explicit JsonArray(const jsoncons::json *value) : m_value(value) { }
88+
explicit JsonArray(const JsonNode *value) : m_value(value) { }
8789

8890
bool valid() const {
8991
return m_value != nullptr && m_value->is_array();
@@ -98,14 +100,14 @@ class JsonArray {
98100
}
99101

100102
private:
101-
const jsoncons::json *m_value{nullptr};
103+
const JsonNode *m_value{nullptr};
102104
};
103105

104106
class JsonObject {
105107
public:
106108
class iterator {
107109
public:
108-
explicit iterator(jsoncons::json::const_object_iterator iterator)
110+
explicit iterator(JsonNode::const_object_iterator iterator)
109111
: m_iterator(iterator) { }
110112

111113
JsonField operator*() const {
@@ -124,11 +126,11 @@ class JsonObject {
124126
}
125127

126128
private:
127-
jsoncons::json::const_object_iterator m_iterator;
129+
JsonNode::const_object_iterator m_iterator;
128130
};
129131

130132
JsonObject() = default;
131-
explicit JsonObject(const jsoncons::json *value) : m_value(value) { }
133+
explicit JsonObject(const JsonNode *value) : m_value(value) { }
132134

133135
bool valid() const {
134136
return m_value != nullptr && m_value->is_object();
@@ -143,13 +145,13 @@ class JsonObject {
143145
}
144146

145147
private:
146-
const jsoncons::json *m_value{nullptr};
148+
const JsonNode *m_value{nullptr};
147149
};
148150

149151
class JsonValue {
150152
public:
151153
JsonValue() = default;
152-
explicit JsonValue(const jsoncons::json *value) : m_value(value) { }
154+
explicit JsonValue(const JsonNode *value) : m_value(value) { }
153155

154156
bool valid() const {
155157
return m_value != nullptr;
@@ -185,12 +187,12 @@ class JsonValue {
185187
return JsonType::Number;
186188
}
187189

188-
const jsoncons::json *raw() const {
190+
const JsonNode *raw() const {
189191
return m_value;
190192
}
191193

192194
private:
193-
const jsoncons::json *m_value{nullptr};
195+
const JsonNode *m_value{nullptr};
194196
};
195197

196198
inline JsonValue JsonField::value() const {
@@ -213,7 +215,7 @@ class JsonDocument {
213215

214216
bool parse(const std::string &input, std::string *error = nullptr) {
215217
try {
216-
m_root = jsoncons::json::parse(input);
218+
m_root = JsonNode::parse(input);
217219
return true;
218220
} catch (const std::exception &exception) {
219221
if (error != nullptr) {
@@ -224,7 +226,7 @@ class JsonDocument {
224226
}
225227

226228
private:
227-
jsoncons::json m_root;
229+
JsonNode m_root;
228230
};
229231

230232
inline bool get(JsonArray value, JsonArray *target,
@@ -237,7 +239,7 @@ inline bool get(JsonArray value, JsonArray *target,
237239
return true;
238240
}
239241

240-
inline bool get(JsonField value, JsonField *target,
242+
inline bool get(const JsonField &value, JsonField *target,
241243
std::string *error = nullptr) {
242244
(void) error;
243245
if (!value.valid()) {

‎test/regression/regression_test.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ std::string RegressionTest::print() {
168168
}
169169

170170
std::unique_ptr<RegressionTest> RegressionTest::from_json_document(
171-
modsecurity_test::json::JsonDocument *document) {
171+
const modsecurity_test::json::JsonDocument *document) {
172172
modsecurity_test::json::JsonValue root;
173173

174174
if (modsecurity_test::json::get(document->get_value(), &root) == false) {
@@ -461,7 +461,7 @@ void RegressionTest::update_content_lengths() {
461461
}
462462

463463
std::unique_ptr<RegressionTests> RegressionTests::from_json_document(
464-
modsecurity_test::json::JsonDocument *document) {
464+
const modsecurity_test::json::JsonDocument *document) {
465465
modsecurity_test::json::JsonValue root;
466466

467467
if (modsecurity_test::json::get(document->get_value(), &root) == false) {

‎test/regression/regression_test.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ namespace modsecurity_test {
3333
class RegressionTest {
3434
public:
3535
static std::unique_ptr<RegressionTest> from_json_document(
36-
modsecurity_test::json::JsonDocument *document);
36+
const modsecurity_test::json::JsonDocument *document);
3737
static std::unique_ptr<RegressionTest> from_json_value(
3838
modsecurity_test::json::JsonValue value);
3939

@@ -94,7 +94,7 @@ class RegressionTest {
9494
class RegressionTests {
9595
public:
9696
static std::unique_ptr<RegressionTests> from_json_document(
97-
modsecurity_test::json::JsonDocument *document);
97+
const modsecurity_test::json::JsonDocument *document);
9898
static std::unique_ptr<RegressionTests> from_json_value(
9999
modsecurity_test::json::JsonValue value);
100100
void update_content_lengths();

‎test/unit/unit_test.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ std::string UnitTest::print() const {
117117

118118

119119
std::unique_ptr<UnitTest> UnitTest::from_json_document(
120-
modsecurity_test::json::JsonDocument *document) {
120+
const modsecurity_test::json::JsonDocument *document) {
121121
modsecurity_test::json::JsonValue root;
122122

123123
if (modsecurity_test::json::get(document->get_value(), &root) == false) {

‎test/unit/unit_test.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class UnitTestResult {
3434
class UnitTest {
3535
public:
3636
static std::unique_ptr<UnitTest> from_json_document(
37-
modsecurity_test::json::JsonDocument *document);
37+
const modsecurity_test::json::JsonDocument *document);
3838
static std::unique_ptr<UnitTest> from_json_value(
3939
modsecurity_test::json::JsonValue value);
4040

0 commit comments

Comments
 (0)