make pretty

This commit is contained in:
Niels 2014-12-28 11:15:13 +01:00
parent 9f562caa2c
commit 822172c502
3 changed files with 21 additions and 8 deletions

21
.gitignore vendored
View file

@ -1,7 +1,20 @@
.DS_Store
src/.DS_Store src/.DS_Store
.DS_Store aclocal.m4
benchmark/auctions.json autom4te.cache/*
benchmark/citylots.json
config.log
config.status
configure
depcomp
html
*.o
*.Po

View file

@ -218,7 +218,7 @@ void test_array()
try try
{ {
a[5] = 1; a[5] = 1;
// assert(false); // assert(false);
} }
catch (const std::exception& ex) catch (const std::exception& ex)
{ {

View file

@ -389,14 +389,14 @@ TEST_CASE("object")
// add initializer list (of pairs) // add initializer list (of pairs)
{ {
JSON je; JSON je;
je.push_back({ {"one", 1}, {"two", false}, {"three", {1,2,3}} }); je.push_back({ {"one", 1}, {"two", false}, {"three", {1, 2, 3}} });
CHECK(je["one"].get<int>() == 1); CHECK(je["one"].get<int>() == 1);
CHECK(je["two"].get<bool>() == false); CHECK(je["two"].get<bool>() == false);
CHECK(je["three"].size() == 3); CHECK(je["three"].size() == 3);
} }
{ {
JSON je; JSON je;
je += { {"one", 1}, {"two", false}, {"three", {1,2,3}} }; je += { {"one", 1}, {"two", false}, {"three", {1, 2, 3}} };
CHECK(je["one"].get<int>() == 1); CHECK(je["one"].get<int>() == 1);
CHECK(je["two"].get<bool>() == false); CHECK(je["two"].get<bool>() == false);
CHECK(je["three"].size() == 3); CHECK(je["three"].size() == 3);