Fix QCOMPARE in the test

elpaso · elpaso · commit 103981deb5f4 · 2019-04-18T11:29:36.000+02:00
diff --git a/tests/src/core/testqgsjsonutils.cpp b/tests/src/core/testqgsjsonutils.cpp
@@ -96,7 +96,7 @@ class TestQgsJsonUtils : public QObject
         QBENCHMARK
         {
           const auto json { QgsJsonUtils::exportAttributesToJsonObject( feature, &vl ) };
-          QCOMPARE( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ), QStringLiteral( "{\"flddbl\":2,\"fldint\":1,\"fldtxt\":\"a value\"}" ) );
+          QCOMPARE( QString( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ) ), QStringLiteral( R"raw({"flddbl":2,"fldint":1,"fldtxt":"a value"})raw" ) );
         }
       }
       else // average: 0.0070 msecs per iteration
@@ -133,7 +133,7 @@ class TestQgsJsonUtils : public QObject
         QBENCHMARK
         {
           const auto json { exporter.exportFeatureToJsonObject( feature ) };
-          QCOMPARE( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ),
+          QCOMPARE( QString( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ) ),
                     QStringLiteral( "{\"bbox\":[1.12,1.12,5.45,5.33],\"geometry\":{\"coordinates\":[[[1.12,1.34]"
                                     ",[5.45,1.12],[5.34,5.33],[1.56,5.2],[1.12,1.34]],[[2,2],[3,2],[3,3],[2,3],[2,2]]],"
                                     "\"type\":\"Polygon\"},\"id\":0,\"properties\":{\"flddbl\":2,\"fldint\":1,\"fldtxt\":\"a value\"},\"type\":\"Feature\"}"

Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class TestQgsJsonUtils : public QObject`
`96`	`96`	`QBENCHMARK`
`97`	`97`	`{`
`98`	`98`	`const auto json { QgsJsonUtils::exportAttributesToJsonObject( feature, &vl ) };`
`99`		`- QCOMPARE( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ), QStringLiteral( "{\"flddbl\":2,\"fldint\":1,\"fldtxt\":\"a value\"}" ) );`
	`99`	`+ QCOMPARE( QString( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ) ), QStringLiteral( R"raw({"flddbl":2,"fldint":1,"fldtxt":"a value"})raw" ) );`
`100`	`100`	`}`
`101`	`101`	`}`
`102`	`102`	`else // average: 0.0070 msecs per iteration`
`@@ -133,7 +133,7 @@ class TestQgsJsonUtils : public QObject`
`133`	`133`	`QBENCHMARK`
`134`	`134`	`{`
`135`	`135`	`const auto json { exporter.exportFeatureToJsonObject( feature ) };`
`136`		`- QCOMPARE( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ),`
	`136`	`+ QCOMPARE( QString( QJsonDocument( json ).toJson( QJsonDocument::JsonFormat::Compact ) ),`
`137`	`137`	`QStringLiteral( "{\"bbox\":[1.12,1.12,5.45,5.33],\"geometry\":{\"coordinates\":[[[1.12,1.34]"`
`138`	`138`	`",[5.45,1.12],[5.34,5.33],[1.56,5.2],[1.12,1.34]],[[2,2],[3,2],[3,3],[2,3],[2,2]]],"`
`139`	`139`	`"\"type\":\"Polygon\"},\"id\":0,\"properties\":{\"flddbl\":2,\"fldint\":1,\"fldtxt\":\"a value\"},\"type\":\"Feature\"}"`