Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
asapo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Joao Alvim Oliveira Dias De Almeida
asapo
Commits
ed76a7d5
Commit
ed76a7d5
authored
3 years ago
by
George Sedov
Browse files
Options
Downloads
Patches
Plain Diff
Fix unit tests
parent
84c3ce5b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
common/cpp/unittests/json_parser/test_json_parser.cpp
+49
-0
49 additions, 0 deletions
common/cpp/unittests/json_parser/test_json_parser.cpp
receiver/src/receiver_config.cpp
+3
-1
3 additions, 1 deletion
receiver/src/receiver_config.cpp
with
52 additions
and
1 deletion
common/cpp/unittests/json_parser/test_json_parser.cpp
+
49
−
0
View file @
ed76a7d5
...
...
@@ -19,6 +19,7 @@ using ::testing::Return;
using
::
testing
::
SetArgPointee
;
using
::
testing
::
HasSubstr
;
using
::
testing
::
ElementsAre
;
using
::
testing
::
Pair
;
using
::
testing
::
DoAll
;
using
asapo
::
JsonFileParser
;
...
...
@@ -209,6 +210,54 @@ TEST(ParseString, StringArrayConvertToJson) {
ASSERT_THAT
(
vec
,
ElementsAre
(
"s1"
,
"s2"
,
"s3"
));
}
TEST
(
ParseString
,
ObjectMemberArrayConvertToJson
)
{
std
::
string
json
=
R"({"object":{"k1":"v1","k2":"v2","k3":"v3"}})"
;
JsonStringParser
parser
{
json
};
std
::
vector
<
std
::
string
>
vec
;
auto
err
=
parser
.
GetArrayObjectMembers
(
"object"
,
&
vec
);
ASSERT_THAT
(
err
,
Eq
(
nullptr
));
ASSERT_THAT
(
vec
,
ElementsAre
(
"k1"
,
"k2"
,
"k3"
));
}
TEST
(
ParseString
,
DictionaryStringConvertToJson
)
{
std
::
string
json
=
R"({"object":{"k1":"v1","k2":"v2","k3":"v3"}})"
;
JsonStringParser
parser
{
json
};
std
::
map
<
std
::
string
,
std
::
string
>
map
;
auto
err
=
parser
.
GetDictionaryString
(
"object"
,
&
map
);
ASSERT_THAT
(
err
,
Eq
(
nullptr
));
ASSERT_THAT
(
map
,
ElementsAre
(
Pair
(
"k1"
,
"v1"
),
Pair
(
"k2"
,
"v2"
),
Pair
(
"k3"
,
"v3"
)));
}
TEST
(
ParseString
,
RawStringConvertToJson
)
{
std
::
string
json
=
R"({"object":{"k1":"v1","k2":"v2","k3":"v3"}})"
;
JsonStringParser
parser
{
json
};
std
::
string
value
;
auto
err
=
parser
.
GetRawString
(
&
value
);
ASSERT_THAT
(
err
,
Eq
(
nullptr
));
ASSERT_THAT
(
json
,
Eq
(
value
));
}
TEST
(
ParseString
,
ArrayRawStringConvertToJson
)
{
std
::
string
json
=
R"({"array":[{"k1":"v1"},{"k2":"v2"},{"k3":"v3"}]})"
;
JsonStringParser
parser
{
json
};
std
::
vector
<
std
::
string
>
vec
;
auto
err
=
parser
.
GetArrayRawStrings
(
"array"
,
&
vec
);
ASSERT_THAT
(
err
,
Eq
(
nullptr
));
ASSERT_THAT
(
vec
,
ElementsAre
(
R"({"k1":"v1"})"
,
R"({"k2":"v2"})"
,
R"({"k3":"v3"})"
));
}
class
ParseFileTests
:
public
Test
{
public:
NiceMock
<
MockIO
>
mock_io
;
...
...
This diff is collapsed.
Click to expand it.
receiver/src/receiver_config.cpp
+
3
−
1
View file @
ed76a7d5
...
...
@@ -42,7 +42,9 @@ Error ReceiverConfigManager::ReadConfigFromFile(std::string file_name) {
(
err
=
parser
.
GetString
(
"LogLevel"
,
&
log_level
))
||
(
err
=
parser
.
Embedded
(
"Kafka"
).
GetBool
(
"Enabled"
,
&
kafkaEnabled
));
if
(
err
)
{
return
err
;
}
if
(
kafkaEnabled
)
{
// read the configuration only if kafka is enabled. empty configuration means "disabled"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment