From 822172c502e83e8a7b809a5f56d0080d0676af63 Mon Sep 17 00:00:00 2001 From: Niels Date: Sun, 28 Dec 2014 11:15:13 +0100 Subject: [PATCH] make pretty --- .gitignore | 21 +++++++++++++++++---- test/JSON_test.cc | 2 +- test/JSON_unit.cc | 6 +++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index edcbe7a1..1c7828c2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,7 +1,20 @@ - +.DS_Store src/.DS_Store -.DS_Store +aclocal.m4 -benchmark/auctions.json -benchmark/citylots.json +autom4te.cache/* + +config.log + +config.status + +configure + +depcomp + +html + +*.o + +*.Po diff --git a/test/JSON_test.cc b/test/JSON_test.cc index c36557c7..2f4ccf8b 100644 --- a/test/JSON_test.cc +++ b/test/JSON_test.cc @@ -218,7 +218,7 @@ void test_array() try { a[5] = 1; -// assert(false); + // assert(false); } catch (const std::exception& ex) { diff --git a/test/JSON_unit.cc b/test/JSON_unit.cc index 4c950950..870eee7d 100644 --- a/test/JSON_unit.cc +++ b/test/JSON_unit.cc @@ -131,7 +131,7 @@ TEST_CASE("array") j += j; CHECK (j.size() == 21); - + // implicit transformation into an array JSON empty1, empty2; empty1 += "foo"; @@ -389,14 +389,14 @@ TEST_CASE("object") // add initializer list (of pairs) { 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() == 1); CHECK(je["two"].get() == false); CHECK(je["three"].size() == 3); } { JSON je; - je += { {"one", 1}, {"two", false}, {"three", {1,2,3}} }; + je += { {"one", 1}, {"two", false}, {"three", {1, 2, 3}} }; CHECK(je["one"].get() == 1); CHECK(je["two"].get() == false); CHECK(je["three"].size() == 3);