Skip to content

Commit 8870c4c

Browse files
Fixed missing quote in json generator
1 parent dc31c9e commit 8870c4c

File tree

3 files changed

+36
-5
lines changed

3 files changed

+36
-5
lines changed

Diff for: src/Mqtt/MqttMessagingProtocolJSON.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ namespace sua {
226226
"softwareNodes": [
227227
{
228228
"id": "self-update-agent",
229-
"version": "build-{},
229+
"version": "build-{}",
230230
"name": "OTA NG Self Update Agent",
231231
"type": "APPLICATION"
232232
},
@@ -263,7 +263,7 @@ namespace sua {
263263
"softwareNodes": [
264264
{
265265
"id": "self-update-agent",
266-
"version": "build-{},
266+
"version": "build-{}",
267267
"name": "OTA NG Self Update Agent",
268268
"type": "APPLICATION"
269269
},

Diff for: utest/CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ add_executable(TestSelfUpdateAgent
1010
include_directories(
1111
../src
1212
${CMAKE_SOURCE_DIR}/3rdparty/spdlog/include
13+
${CMAKE_SOURCE_DIR}/3rdparty/nlohmann-json/include
1314
)
1415

1516
target_link_libraries(

Diff for: utest/TestMqttMessagingProtocolJSON.cpp

+33-3
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "Mqtt/MqttMessagingProtocolJSON.h"
44
#include "Context.h"
55
#include "Utils.h"
6+
#include "nlohmann/json.hpp"
67

78
#include "version.h"
89

@@ -29,6 +30,11 @@ namespace {
2930
d.bundleVersion = "1.0";
3031
d.bundleDownloadUrl = "url";
3132
}
33+
34+
void validateJsonSyntax(const std::string & input) {
35+
std::stringstream ss(input);
36+
nlohmann::json json = nlohmann::json::parse(ss);
37+
}
3238
};
3339

3440
TEST_F(TestMessagingProtocolJSON, readDesiredState)
@@ -99,7 +105,7 @@ namespace {
99105
"softwareNodes": [
100106
{
101107
"id": "self-update-agent",
102-
"version": "build-42,
108+
"version": "build-42",
103109
"name": "OTA NG Self Update Agent",
104110
"type": "APPLICATION"
105111
},
@@ -122,6 +128,8 @@ namespace {
122128
)";
123129
// clang-format on
124130

131+
EXPECT_NO_THROW(validateJsonSyntax(expected));
132+
EXPECT_NO_THROW(validateJsonSyntax(result));
125133
EXPECT_EQ_MULTILINE(result, expected);
126134
}
127135

@@ -140,7 +148,7 @@ namespace {
140148
"softwareNodes": [
141149
{
142150
"id": "self-update-agent",
143-
"version": "build-42,
151+
"version": "build-42",
144152
"name": "OTA NG Self Update Agent",
145153
"type": "APPLICATION"
146154
},
@@ -162,7 +170,9 @@ namespace {
162170
}
163171
)";
164172
// clang-format on
165-
173+
174+
EXPECT_NO_THROW(validateJsonSyntax(expected));
175+
EXPECT_NO_THROW(validateJsonSyntax(result));
166176
EXPECT_EQ_MULTILINE(result, expected);
167177
}
168178

@@ -184,6 +194,8 @@ namespace {
184194
)";
185195
// clang-format on
186196

197+
EXPECT_NO_THROW(validateJsonSyntax(expected));
198+
EXPECT_NO_THROW(validateJsonSyntax(result));
187199
EXPECT_EQ_MULTILINE(result, expected);
188200
}
189201

@@ -205,6 +217,8 @@ namespace {
205217
)";
206218
// clang-format on
207219

220+
EXPECT_NO_THROW(validateJsonSyntax(expected));
221+
EXPECT_NO_THROW(validateJsonSyntax(result));
208222
EXPECT_EQ_MULTILINE(result, expected);
209223
}
210224

@@ -226,6 +240,8 @@ namespace {
226240
)";
227241
// clang-format on
228242

243+
EXPECT_NO_THROW(validateJsonSyntax(expected));
244+
EXPECT_NO_THROW(validateJsonSyntax(result));
229245
EXPECT_EQ_MULTILINE(result, expected);
230246
}
231247

@@ -257,6 +273,8 @@ namespace {
257273
)";
258274
// clang-format on
259275

276+
EXPECT_NO_THROW(validateJsonSyntax(expected));
277+
EXPECT_NO_THROW(validateJsonSyntax(result));
260278
EXPECT_EQ_MULTILINE(result, expected);
261279
}
262280

@@ -292,6 +310,8 @@ namespace {
292310
)";
293311
// clang-format on
294312

313+
EXPECT_NO_THROW(validateJsonSyntax(expected));
314+
EXPECT_NO_THROW(validateJsonSyntax(result));
295315
EXPECT_EQ_MULTILINE(result, expected);
296316
}
297317

@@ -327,6 +347,8 @@ namespace {
327347
)";
328348
// clang-format on
329349

350+
EXPECT_NO_THROW(validateJsonSyntax(expected));
351+
EXPECT_NO_THROW(validateJsonSyntax(result));
330352
EXPECT_EQ_MULTILINE(result, expected);
331353
}
332354

@@ -360,6 +382,8 @@ namespace {
360382
)";
361383
// clang-format on
362384

385+
EXPECT_NO_THROW(validateJsonSyntax(expected));
386+
EXPECT_NO_THROW(validateJsonSyntax(result));
363387
EXPECT_EQ_MULTILINE(result, expected);
364388
}
365389

@@ -393,6 +417,8 @@ namespace {
393417
)";
394418
// clang-format on
395419

420+
EXPECT_NO_THROW(validateJsonSyntax(expected));
421+
EXPECT_NO_THROW(validateJsonSyntax(result));
396422
EXPECT_EQ_MULTILINE(result, expected);
397423
}
398424

@@ -426,6 +452,8 @@ namespace {
426452
)";
427453
// clang-format on
428454

455+
EXPECT_NO_THROW(validateJsonSyntax(expected));
456+
EXPECT_NO_THROW(validateJsonSyntax(result));
429457
EXPECT_EQ_MULTILINE(result, expected);
430458
}
431459

@@ -459,6 +487,8 @@ namespace {
459487
)";
460488
// clang-format on
461489

490+
EXPECT_NO_THROW(validateJsonSyntax(expected));
491+
EXPECT_NO_THROW(validateJsonSyntax(result));
462492
EXPECT_EQ_MULTILINE(result, expected);
463493
}
464494

0 commit comments

Comments
 (0)