Tidy lots of test fixtures literals

2 files changed, 22 insertions, 22 deletions

diff --git a/libjsonpp/testParse.cpp b/libjsonpp/testParse.cpp
index b288167..5190599 100644
--- a/libjsonpp/testParse.cpp
+++ b/libjsonpp/testParse.cpp
@@ -49,12 +49,12 @@ BOOST_AUTO_TEST_CASE(parse_int_48)
 BOOST_AUTO_TEST_CASE(parse_float_pi)
 {
 	const Glib::ustring val(" 3.14159265359 ");
-	BOOST_REQUIRE_CLOSE(3.14159, std::get<json::Number>(json::parseValue(val)), 0.001);
+	BOOST_REQUIRE_CLOSE(std::numbers::pi, std::get<json::Number>(json::parseValue(val)), 0.001);
 }
 
 BOOST_AUTO_TEST_CASE(parse_array)
 {
-	const Glib::ustring val(" [ 1, 2, 3, [ 4, 5 ], {\"val1\": 6, \"val2\": [7, 8]}, 9, 10 ] ");
+	const Glib::ustring val(R"( [ 1, 2, 3, [ 4, 5 ], {"val1": 6, "val2": [7, 8]}, 9, 10 ] )");
 	auto arr = std::get<json::Array>(json::parseValue(val));
 	BOOST_REQUIRE_EQUAL(7, arr.size());
 	auto itr = arr.begin();
@@ -69,7 +69,7 @@ BOOST_AUTO_TEST_CASE(parse_array)
 
 BOOST_AUTO_TEST_CASE(parse_array_of_strings)
 {
-	const Glib::ustring val(" [ \"en\", \"de\", \"ro\", \"es\", \"fa\" ] ");
+	const Glib::ustring val(R"( [ "en", "de", "ro", "es", "fa" ] )");
 	const auto arr = std::get<json::Array>(json::parseValue(val));
 	BOOST_REQUIRE_EQUAL(arr.size(), 5);
 	BOOST_CHECK_EQUAL(std::get<json::String>(arr.front()), "en");
@@ -96,31 +96,31 @@ BOOST_AUTO_TEST_CASE(parse_broken_object_lone_number)
 
 BOOST_AUTO_TEST_CASE(parse_broken_object_lone_string)
 {
-	const Glib::ustring val(" { \"string\" } ");
+	const Glib::ustring val(R"( { "string" } )");
 	BOOST_REQUIRE_THROW(json::parseValue(val), json::ParseError);
 }
 
 BOOST_AUTO_TEST_CASE(parse_broken_object_missing_value)
 {
-	const Glib::ustring val(" { \"string\": } ");
+	const Glib::ustring val(R"( { "string": } )");
 	BOOST_REQUIRE_THROW(json::parseValue(val), json::ParseError);
 }
 
 BOOST_AUTO_TEST_CASE(parse_broken_object_missing_second_name)
 {
-	const Glib::ustring val(" { \"string\": 1, } ");
+	const Glib::ustring val(R"( { "string": 1, } )");
 	BOOST_REQUIRE_THROW(json::parseValue(val), json::ParseError);
 }
 
 BOOST_AUTO_TEST_CASE(parse_broken_object_missing_second_colon)
 {
-	const Glib::ustring val(" { \"string\": 1, \"string2\" } ");
+	const Glib::ustring val(R"( { "string": 1, "string2" } )");
 	BOOST_REQUIRE_THROW(json::parseValue(val), json::ParseError);
 }
 
 BOOST_AUTO_TEST_CASE(parse_broken_object_missing_second_value)
 {
-	const Glib::ustring val(" { \"string\": 1, \"string2\": } ");
+	const Glib::ustring val(R"( { "string": 1, "string2": } )");
 	BOOST_REQUIRE_THROW(json::parseValue(val), json::ParseError);
 }
 
@@ -138,7 +138,7 @@ BOOST_AUTO_TEST_CASE(parse_empty_array)
 
 BOOST_AUTO_TEST_CASE(parse_empty_arrary_in_object)
 {
-	const Glib::ustring val(" { \"v1\": [ ], \"v2\": 100 } ");
+	const Glib::ustring val(R"( { "v1": [ ], "v2": 100 } )");
 	auto value = json::parseValue(val);
 	BOOST_REQUIRE_EQUAL(3, value.index());
 	auto obj = std::get<json::Object>(value);
@@ -161,7 +161,7 @@ BOOST_AUTO_TEST_CASE(parse_nonsense_in_array)
 
 BOOST_AUTO_TEST_CASE(parse_object)
 {
-	const Glib::ustring val(" { \"a\": 1, \"b\": 2 } ");
+	const Glib::ustring val(R"( { "a": 1, "b": 2 } )");
 	auto value = json::parseValue(val);
 	BOOST_REQUIRE_EQUAL(3, value.index());
 	auto obj = std::get<json::Object>(value);
@@ -172,13 +172,13 @@ BOOST_AUTO_TEST_CASE(parse_object)
 
 BOOST_AUTO_TEST_CASE(parse_string_simple)
 {
-	const Glib::ustring val(" \"simple string\" ");
+	const Glib::ustring val(R"( "simple string" )");
 	BOOST_REQUIRE_EQUAL("simple string", std::get<json::String>(json::parseValue(val)));
 }
 
 BOOST_AUTO_TEST_CASE(parse_object_withStringContainingQuote)
 {
-	const Glib::ustring val(" { \"key1\": \"value1\", \"key2\": \"value\\\"2\\\"\", \"key3\": 3 } ");
+	const Glib::ustring val(R"( { "key1": "value1", "key2": "value\"2\"", "key3": 3 } )");
 	auto obj = std::get<json::Object>(json::parseValue(val));
 	BOOST_REQUIRE_EQUAL(3, obj.size());
 	BOOST_REQUIRE_EQUAL("value1", std::get<json::String>(obj["key1"]));
@@ -194,43 +194,43 @@ BOOST_AUTO_TEST_CASE(parse_string_invalid_missingOpeningQuote)
 
 BOOST_AUTO_TEST_CASE(parse_string_escapedQuote)
 {
-	const Glib::ustring val(" \"A \\\"quoted\\\" string.\" ");
+	const Glib::ustring val(R"( "A \"quoted\" string." )");
 	BOOST_REQUIRE_EQUAL("A \"quoted\" string.", std::get<json::String>(json::parseValue(val)));
 }
 
 BOOST_AUTO_TEST_CASE(parse_string_escapedWhitespace)
 {
-	const Glib::ustring val(" \"A whitespace\\t\\r\\n\\b\\f string.\" ");
+	const Glib::ustring val(R"( "A whitespace\t\r\n\b\f string." )");
 	BOOST_REQUIRE_EQUAL("A whitespace\t\r\n\b\f string.", std::get<json::String>(json::parseValue(val)));
 }
 
 BOOST_AUTO_TEST_CASE(parse_string_escapedSlashes)
 {
-	const Glib::ustring val(" \"A whitespace\\\\ \\/ string.\" ");
+	const Glib::ustring val(R"( "A whitespace\\ \/ string." )");
 	BOOST_REQUIRE_EQUAL("A whitespace\\ / string.", std::get<json::String>(json::parseValue(val)));
 }
 
 BOOST_AUTO_TEST_CASE(parse_string_literalUnicode)
 {
-	const Glib::ustring val(" \"A Űņĩćőđē string.\" ");
+	const Glib::ustring val(R"( "A Űņĩćőđē string." )");
 	BOOST_REQUIRE_EQUAL("A Űņĩćőđē string.", std::get<json::String>(json::parseValue(val)));
 }
 
 BOOST_AUTO_TEST_CASE(parse_string_unknownEscape)
 {
-	const Glib::ustring val(" \"A \\z string.\" ");
+	const Glib::ustring val(R"( "A \z string." )");
 	BOOST_CHECK_THROW(json::parseValue(val), json::ParseError);
 }
 
 BOOST_AUTO_TEST_CASE(parse_string_shortUnicodeEscape)
 {
-	const Glib::ustring val(" \"A \\u017 string.\" ");
+	const Glib::ustring val(R"( "A \u017 string." )");
 	BOOST_CHECK_THROW(json::parseValue(val), json::ParseError);
 }
 
 BOOST_AUTO_TEST_CASE(parse_string_escapedUnicode)
 {
-	const Glib::ustring val(" \"A \\u0170\\u0146\\u0129\\u0107\\u0151\\u0111\\u0113 string.\" ");
+	const Glib::ustring val(R"( "A \u0170\u0146\u0129\u0107\u0151\u0111\u0113 string." )");
 	BOOST_REQUIRE_EQUAL("A Űņĩćőđē string.", std::get<json::String>(json::parseValue(val)));
 }
 
@@ -258,7 +258,7 @@ BOOST_AUTO_TEST_CASE(parse_sample_complexFile2_bulk, *boost::unit_test::disabled
 
 BOOST_AUTO_TEST_CASE(parse_from_itr)
 {
-	const Glib::ustring val(" \"A \\u0170\\u0146\\u0129\\u0107\\u0151\\u0111\\u0113 string.\" ");
+	const Glib::ustring val(R"( "A \u0170\u0146\u0129\u0107\u0151\u0111\u0113 string." )");
 	auto itr = val.begin();
 	BOOST_REQUIRE_EQUAL("A Űņĩćőđē string.", std::get<json::String>(json::parseValue(itr)));
 }
diff --git a/libjsonpp/testSerialise.cpp b/libjsonpp/testSerialise.cpp
index 1fb0381..15a579a 100644
--- a/libjsonpp/testSerialise.cpp
+++ b/libjsonpp/testSerialise.cpp
@@ -96,8 +96,8 @@ BOOST_AUTO_TEST_CASE(serialise_quotes)
 
 BOOST_AUTO_TEST_CASE(serialise_complexObject)
 {
-	BOOST_REQUIRE_EQUAL("{\"a\":\"string\",\"b\":null,\"c\":64,\"d\":true,\"e\":{\"suba\":\"suba-val\",\"subb\":\"subb-"
-						"val\"},\"f\":[true,false,-4.9,\"item\"]}",
+	BOOST_REQUIRE_EQUAL(
+			R"({"a":"string","b":null,"c":64,"d":true,"e":{"suba":"suba-val","subb":"subb-val"},"f":[true,false,-4.9,"item"]})",
 			writeString(json::Object {{"a", "string"s}, {"b", json::Null()}, {"c", 64.0}, {"d", true},
 					{"e", json::Object {{"suba", "suba-val"s}, {"subb", "subb-val"s}}},
 					{