Skip to content

fix clang-format #1049

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 14, 2019
Merged

fix clang-format #1049

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
134 changes: 64 additions & 70 deletions src/test_lib_json/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2054,16 +2054,16 @@ JSONTEST_FIXTURE(StyledWriterTest, multiLineArray) {
{
// Array member has more than 20 print effect rendering lines
const Json::String expected("[\n "
"0,\n 1,\n 2,\n "
"3,\n 4,\n 5,\n "
"6,\n 7,\n 8,\n "
"9,\n 10,\n 11,\n "
"12,\n 13,\n 14,\n "
"15,\n 16,\n 17,\n "
"18,\n 19,\n 20\n]\n");
"0,\n 1,\n 2,\n "
"3,\n 4,\n 5,\n "
"6,\n 7,\n 8,\n "
"9,\n 10,\n 11,\n "
"12,\n 13,\n 14,\n "
"15,\n 16,\n 17,\n "
"18,\n 19,\n 20\n]\n");
Json::Value root;
for (int i = 0; i < 21; i++)
root[i] = i;
root[i] = i;
const Json::String result = writer.write(root);
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
}
Expand All @@ -2072,7 +2072,7 @@ JSONTEST_FIXTURE(StyledWriterTest, multiLineArray) {
const Json::String expected("[ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]\n");
Json::Value root;
for (int i = 0; i < 10; i++)
root[i] = i;
root[i] = i;
const Json::String result = writer.write(root);
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
}
Expand All @@ -2083,8 +2083,7 @@ JSONTEST_FIXTURE(StyledWriterTest, writeValueWithComment) {
{
const Json::String expected("\n//commentBeforeValue\n\"hello\"\n");
Json::Value root = "hello";
root.setComment(Json::String("//commentBeforeValue"),
Json::commentBefore);
root.setComment(Json::String("//commentBeforeValue"), Json::commentBefore);
const Json::String result = writer.write(root);
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
}
Expand All @@ -2099,8 +2098,7 @@ JSONTEST_FIXTURE(StyledWriterTest, writeValueWithComment) {
{
const Json::String expected("\"hello\"\n//commentAfter\n\n");
Json::Value root = "hello";
root.setComment(Json::String("//commentAfter"),
Json::commentAfter);
root.setComment(Json::String("//commentAfter"), Json::commentAfter);
const Json::String result = writer.write(root);
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
}
Expand Down Expand Up @@ -2177,44 +2175,42 @@ JSONTEST_FIXTURE(StyledStreamWriterTest, multiLineArray) {
Json::StyledStreamWriter writer;
{
// Array member has more than 20 print effect rendering lines
const Json::String expected(
"["
"\n\t0,"
"\n\t1,"
"\n\t2,"
"\n\t3,"
"\n\t4,"
"\n\t5,"
"\n\t6,"
"\n\t7,"
"\n\t8,"
"\n\t9,"
"\n\t10,"
"\n\t11,"
"\n\t12,"
"\n\t13,"
"\n\t14,"
"\n\t15,"
"\n\t16,"
"\n\t17,"
"\n\t18,"
"\n\t19,"
"\n\t20\n]\n");
const Json::String expected("[\n\t0,"
"\n\t1,"
"\n\t2,"
"\n\t3,"
"\n\t4,"
"\n\t5,"
"\n\t6,"
"\n\t7,"
"\n\t8,"
"\n\t9,"
"\n\t10,"
"\n\t11,"
"\n\t12,"
"\n\t13,"
"\n\t14,"
"\n\t15,"
"\n\t16,"
"\n\t17,"
"\n\t18,"
"\n\t19,"
"\n\t20\n]\n");
Json::StyledStreamWriter writer;
Json::Value root;
for (int i = 0; i < 21; i++)
root[i] = i;
root[i] = i;
Json::OStringStream sout;
writer.write(sout, root);
const Json::String result = sout.str();
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
}
{
{
// Array members do not exceed 21 print effects to render a single line
const Json::String expected("[ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]\n");
Json::Value root;
for (int i = 0; i < 10; i++)
root[i] = i;
root[i] = i;
Json::OStringStream sout;
writer.write(sout, root);
const Json::String result = sout.str();
Expand All @@ -2228,8 +2224,7 @@ JSONTEST_FIXTURE(StyledStreamWriterTest, writeValueWithComment) {
const Json::String expected("//commentBeforeValue\n\"hello\"\n");
Json::Value root = "hello";
Json::OStringStream sout;
root.setComment(Json::String("//commentBeforeValue"),
Json::commentBefore);
root.setComment(Json::String("//commentBeforeValue"), Json::commentBefore);
writer.write(sout, root);
const Json::String result = sout.str();
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
Expand All @@ -2248,8 +2243,7 @@ JSONTEST_FIXTURE(StyledStreamWriterTest, writeValueWithComment) {
const Json::String expected("\"hello\"\n//commentAfter\n");
Json::Value root = "hello";
Json::OStringStream sout;
root.setComment(Json::String("//commentAfter"),
Json::commentAfter);
root.setComment(Json::String("//commentAfter"), Json::commentAfter);
writer.write(sout, root);
const Json::String result = sout.str();
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
Expand Down Expand Up @@ -2326,42 +2320,41 @@ JSONTEST_FIXTURE(StreamWriterTest, multiLineArray) {
wb.settings_["commentStyle"] = "None";
{
// When wb.settings_["commentStyle"] = "None", the effect of
// printing multiple lines will be displayed when there are
// printing multiple lines will be displayed when there are
// more than 20 array members.
const Json::String expected(
"[\n\t0,"
"\n\t1,"
"\n\t2,"
"\n\t3,"
"\n\t4,"
"\n\t5,"
"\n\t6,"
"\n\t7,"
"\n\t8,"
"\n\t9,"
"\n\t10,"
"\n\t11,"
"\n\t12,"
"\n\t13,"
"\n\t14,"
"\n\t15,"
"\n\t16,"
"\n\t17,"
"\n\t18,"
"\n\t19,"
"\n\t20\n]");
const Json::String expected("[\n\t0,"
"\n\t1,"
"\n\t2,"
"\n\t3,"
"\n\t4,"
"\n\t5,"
"\n\t6,"
"\n\t7,"
"\n\t8,"
"\n\t9,"
"\n\t10,"
"\n\t11,"
"\n\t12,"
"\n\t13,"
"\n\t14,"
"\n\t15,"
"\n\t16,"
"\n\t17,"
"\n\t18,"
"\n\t19,"
"\n\t20\n]");
Json::Value root;
for (int i = 0; i < 21; i++)
root[i] = i;
root[i] = i;
const Json::String result = Json::writeString(wb, root);
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
}
{
//Array members do not exceed 21 print effects to render a single line
// Array members do not exceed 21 print effects to render a single line
const Json::String expected("[ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]");
Json::Value root;
for (int i = 0; i < 10; i++)
root[i] = i;
root[i] = i;
const Json::String result = Json::writeString(wb, root);
JSONTEST_ASSERT_STRING_EQUAL(expected, result);
}
Expand Down Expand Up @@ -3169,7 +3162,8 @@ int main(int argc, const char* argv[]) {
JSONTEST_REGISTER_FIXTURE(runner, StyledStreamWriterTest, writeArrays);
JSONTEST_REGISTER_FIXTURE(runner, StyledStreamWriterTest, writeNestedObjects);
JSONTEST_REGISTER_FIXTURE(runner, StyledStreamWriterTest, multiLineArray);
JSONTEST_REGISTER_FIXTURE(runner, StyledStreamWriterTest, writeValueWithComment);
JSONTEST_REGISTER_FIXTURE(runner, StyledStreamWriterTest,
writeValueWithComment);
JSONTEST_REGISTER_FIXTURE(runner, StreamWriterTest, writeNumericValue);
JSONTEST_REGISTER_FIXTURE(runner, StreamWriterTest, writeArrays);
JSONTEST_REGISTER_FIXTURE(runner, StreamWriterTest, writeNestedObjects);
Expand Down