diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-02-27 08:25:12 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-27 08:25:12 +0100 |
commit | ad2b853487fc561fc7c72f495447464df7aaab2b (patch) | |
tree | 8e47d47b4b457d26ddc6d2b67e1f693c98644f7a | |
parent | 5f8b5d94701604b9353b0788f0ab588a1657527e (diff) | |
parent | c140c3d74e9bab2ca5f25a9ff046c1243630a460 (diff) |
Merge pull request #21434 from vespa-engine/toregge/remove-restrict-warning-in-staging-vespalib
Remove restrict warning (staging_vespalib).
-rw-r--r-- | staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp index 4ea3eb2fff2..cc8d61cb7c2 100644 --- a/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp +++ b/staging_vespalib/src/tests/xmlserializable/xmlserializabletest.cpp @@ -43,11 +43,11 @@ Test::testNormalUsage() << XmlEndTag() << XmlEndTag(); std::string expected = - "\n<car>\n" + "<car>\n" "<door windowstate=\"up\"/>\n" "<description>This is a car description used to test</description>\n" "</car>"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } void @@ -76,14 +76,14 @@ Test::testEscaping() << XmlEndTag() << XmlEndTag(); std::string expected = - "\n<__trash_->\n" + "<__trash_->\n" "<foo bar=\"<100%" & >\"/>\n" "<escaped><>&\"'% \n	�</escaped>\n" "<encoded binaryencoding=\"base64\">PD4mIiclIAkMAA==</encoded>\n" "<auto1><>&	 \nfoo</auto1>\n" "<auto2 binaryencoding=\"base64\">PD4mCQANCmZvbw==</auto2>\n" "</__trash_->"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } namespace { @@ -118,7 +118,7 @@ Test::testNesting() << XmlEndTag() << XmlEndTag(); std::string expected = - "\n<car>\n" + "<car>\n" "<door color=\"blue\">\n" "<other count=\"5\">\n" "<something>foo</something>\n" @@ -127,7 +127,7 @@ Test::testNesting() "</door>\n" "<description>This is a car description used to test</description>\n" "</car>"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } void @@ -146,7 +146,7 @@ Test::testIndent() << XmlEndTag() << XmlEndTag() << XmlEndTag(); - std::string expected = "\n" + std::string expected = "<foo>\n" " <bar>2.14</bar>\n" " Litt innhold\n" @@ -155,7 +155,7 @@ Test::testIndent() " <base binaryencoding=\"base64\">Zm9vYmFy</base>\n" " </nytag>\n" "</foo>"; - EXPECT_EQUAL(expected, "\n" + ost.str()); + EXPECT_EQUAL(expected, ost.str()); } } // vespalib |