Read-only mirrors. Development, issues and pull requests are on GitHub.

summaryrefslogtreecommitdiffhomepage
path: root/projects/SelfTest
diff options
context:
space:
mode:
authorMartin Hořeňovský2019-11-04 10:42:34 +0100
committerMartin Hořeňovský2019-11-04 13:08:10 +0100
commiteabb8a6af71e549928b598cdedfa323c35c3c527 (patch)
tree2788f997b28a73fd223336505d3efbfd17cf3ae2 /projects/SelfTest
parentae10e4ef728b144e296841377b8b37191520bb53 (diff)
downloadcatch3-eabb8a6af71e549928b598cdedfa323c35c3c527.tar.gz
Cleanup tests for C++20
Diffstat (limited to 'projects/SelfTest')
-rw-r--r--projects/SelfTest/Baselines/compact.sw.approved.txt44
-rw-r--r--projects/SelfTest/Baselines/console.std.approved.txt4
-rw-r--r--projects/SelfTest/Baselines/console.sw.approved.txt263
-rw-r--r--projects/SelfTest/Baselines/junit.sw.approved.txt8
-rw-r--r--projects/SelfTest/Baselines/sonarqube.sw.approved.txt6
-rw-r--r--projects/SelfTest/Baselines/xml.sw.approved.txt378
-rw-r--r--projects/SelfTest/IntrospectiveTests/String.tests.cpp2
-rw-r--r--projects/SelfTest/IntrospectiveTests/Xml.tests.cpp64
8 files changed, 44 insertions, 725 deletions
diff --git a/projects/SelfTest/Baselines/compact.sw.approved.txt b/projects/SelfTest/Baselines/compact.sw.approved.txt
index bf3d16c6..06e17964 100644
--- a/projects/SelfTest/Baselines/compact.sw.approved.txt
+++ b/projects/SelfTest/Baselines/compact.sw.approved.txt
@@ -1186,7 +1186,7 @@ String.tests.cpp:<line number>: passed: s.data() == s2.data() for: "hello world!
String.tests.cpp:<line number>: passed: s.data() == ss.data() for: "hello world!" == "hello world!"
String.tests.cpp:<line number>: passed: s.substr(s.size() + 1, 123).empty() for: true
String.tests.cpp:<line number>: passed: std::strcmp(ss.c_str(), "world!") == 0 for: 0 == 0
-String.tests.cpp:<line number>: passed: buffer1 != buffer2 for: "Hello" != "Hello"
+String.tests.cpp:<line number>: passed: (char*)buffer1 != (char*)buffer2 for: "Hello" != "Hello"
String.tests.cpp:<line number>: passed: left == right for: Hello == Hello
String.tests.cpp:<line number>: passed: left != left.substr(0, 3) for: Hello != Hel
String.tests.cpp:<line number>: passed: sr == "a standard string" for: a standard string == "a standard string"
@@ -1561,48 +1561,6 @@ Xml.tests.cpp:<line number>: passed: encode( stringWithQuotes, Catch::XmlEncode:
"don't &quot;quote&quot; me on that"
Xml.tests.cpp:<line number>: passed: encode( "[\x01]" ) == "[\\x01]" for: "[\x01]" == "[\x01]"
Xml.tests.cpp:<line number>: passed: encode( "[\x7F]" ) == "[\\x7F]" for: "[\x7F]" == "[\x7F]"
-Xml.tests.cpp:<line number>: passed: encode(u8"Here be 👾") == u8"Here be 👾" for: "Here be 👾" == "Here be 👾"
-Xml.tests.cpp:<line number>: passed: encode(u8"šš") == u8"šš" for: "šš" == "šš"
-Xml.tests.cpp:<line number>: passed: encode("\xDF\xBF") == "\xDF\xBF" for: "ß¿" == "ß¿"
-Xml.tests.cpp:<line number>: passed: encode("\xE0\xA0\x80") == "\xE0\xA0\x80" for: "à €" == "à €"
-Xml.tests.cpp:<line number>: passed: encode("\xED\x9F\xBF") == "\xED\x9F\xBF" for: "퟿" == "퟿"
-Xml.tests.cpp:<line number>: passed: encode("\xEE\x80\x80") == "\xEE\x80\x80" for: "" == ""
-Xml.tests.cpp:<line number>: passed: encode("\xEF\xBF\xBF") == "\xEF\xBF\xBF" for: "ï¿¿" == "ï¿¿"
-Xml.tests.cpp:<line number>: passed: encode("\xF0\x90\x80\x80") == "\xF0\x90\x80\x80" for: "�" == "�"
-Xml.tests.cpp:<line number>: passed: encode("\xF4\x8F\xBF\xBF") == "\xF4\x8F\xBF\xBF" for: "�" == "�"
-Xml.tests.cpp:<line number>: passed: encode("Here \xFF be 👾") == u8"Here \\xFF be 👾" for: "Here \xFF be 👾" == "Here \xFF be 👾"
-Xml.tests.cpp:<line number>: passed: encode("\xFF") == "\\xFF" for: "\xFF" == "\xFF"
-Xml.tests.cpp:<line number>: passed: encode("\xC5\xC5\xA0") == u8"\\xC5Å " for: "\xC5Å " == "\xC5Å "
-Xml.tests.cpp:<line number>: passed: encode("\xF4\x90\x80\x80") == u8"\\xF4\\x90\\x80\\x80" for: "\xF4\x90\x80\x80" == "\xF4\x90\x80\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xC0\x80") == u8"\\xC0\\x80" for: "\xC0\x80" == "\xC0\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xF0\x80\x80\x80") == u8"\\xF0\\x80\\x80\\x80" for: "\xF0\x80\x80\x80" == "\xF0\x80\x80\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xC1\xBF") == u8"\\xC1\\xBF" for: "\xC1\xBF" == "\xC1\xBF"
-Xml.tests.cpp:<line number>: passed: encode("\xE0\x9F\xBF") == u8"\\xE0\\x9F\\xBF" for: "\xE0\x9F\xBF" == "\xE0\x9F\xBF"
-Xml.tests.cpp:<line number>: passed: encode("\xF0\x8F\xBF\xBF") == u8"\\xF0\\x8F\\xBF\\xBF" for: "\xF0\x8F\xBF\xBF" == "\xF0\x8F\xBF\xBF"
-Xml.tests.cpp:<line number>: passed: encode("\xED\xA0\x80") == "\xED\xA0\x80" for: "í €" == "í €"
-Xml.tests.cpp:<line number>: passed: encode("\xED\xAF\xBF") == "\xED\xAF\xBF" for: "í¯¿" == "í¯¿"
-Xml.tests.cpp:<line number>: passed: encode("\xED\xB0\x80") == "\xED\xB0\x80" for: "í°€" == "í°€"
-Xml.tests.cpp:<line number>: passed: encode("\xED\xBF\xBF") == "\xED\xBF\xBF" for: "í¿¿" == "í¿¿"
-Xml.tests.cpp:<line number>: passed: encode("\x80") == u8"\\x80" for: "\x80" == "\x80"
-Xml.tests.cpp:<line number>: passed: encode("\x81") == u8"\\x81" for: "\x81" == "\x81"
-Xml.tests.cpp:<line number>: passed: encode("\xBC") == u8"\\xBC" for: "\xBC" == "\xBC"
-Xml.tests.cpp:<line number>: passed: encode("\xBF") == u8"\\xBF" for: "\xBF" == "\xBF"
-Xml.tests.cpp:<line number>: passed: encode("\xF5\x80\x80\x80") == u8"\\xF5\\x80\\x80\\x80" for: "\xF5\x80\x80\x80" == "\xF5\x80\x80\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xF6\x80\x80\x80") == u8"\\xF6\\x80\\x80\\x80" for: "\xF6\x80\x80\x80" == "\xF6\x80\x80\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xF7\x80\x80\x80") == u8"\\xF7\\x80\\x80\\x80" for: "\xF7\x80\x80\x80" == "\xF7\x80\x80\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xDE") == u8"\\xDE" for: "\xDE" == "\xDE"
-Xml.tests.cpp:<line number>: passed: encode("\xDF") == u8"\\xDF" for: "\xDF" == "\xDF"
-Xml.tests.cpp:<line number>: passed: encode("\xE0") == u8"\\xE0" for: "\xE0" == "\xE0"
-Xml.tests.cpp:<line number>: passed: encode("\xEF") == u8"\\xEF" for: "\xEF" == "\xEF"
-Xml.tests.cpp:<line number>: passed: encode("\xF0") == u8"\\xF0" for: "\xF0" == "\xF0"
-Xml.tests.cpp:<line number>: passed: encode("\xF4") == u8"\\xF4" for: "\xF4" == "\xF4"
-Xml.tests.cpp:<line number>: passed: encode("\xE0\x80") == u8"\\xE0\\x80" for: "\xE0\x80" == "\xE0\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xE0\xBF") == u8"\\xE0\\xBF" for: "\xE0\xBF" == "\xE0\xBF"
-Xml.tests.cpp:<line number>: passed: encode("\xE1\x80") == u8"\\xE1\\x80" for: "\xE1\x80" == "\xE1\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xF0\x80") == u8"\\xF0\\x80" for: "\xF0\x80" == "\xF0\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xF4\x80") == u8"\\xF4\\x80" for: "\xF4\x80" == "\xF4\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xF0\x80\x80") == u8"\\xF0\\x80\\x80" for: "\xF0\x80\x80" == "\xF0\x80\x80"
-Xml.tests.cpp:<line number>: passed: encode("\xF4\x80\x80") == u8"\\xF4\\x80\\x80" for: "\xF4\x80\x80" == "\xF4\x80\x80"
ToStringVector.tests.cpp:<line number>: passed: Catch::Detail::stringify( empty ) == "{ }" for: "{ }" == "{ }"
ToStringVector.tests.cpp:<line number>: passed: Catch::Detail::stringify( oneValue ) == "{ 42 }" for: "{ 42 }" == "{ 42 }"
ToStringVector.tests.cpp:<line number>: passed: Catch::Detail::stringify( twoValues ) == "{ 42, 250 }" for: "{ 42, 250 }" == "{ 42, 250 }"
diff --git a/projects/SelfTest/Baselines/console.std.approved.txt b/projects/SelfTest/Baselines/console.std.approved.txt
index 2fb24b6f..a6338bde 100644
--- a/projects/SelfTest/Baselines/console.std.approved.txt
+++ b/projects/SelfTest/Baselines/console.std.approved.txt
@@ -1380,6 +1380,6 @@ due to unexpected exception with message:
Why would you throw a std::string?
===============================================================================
-test cases: 305 | 231 passed | 70 failed | 4 failed as expected
-assertions: 1695 | 1543 passed | 131 failed | 21 failed as expected
+test cases: 304 | 230 passed | 70 failed | 4 failed as expected
+assertions: 1653 | 1501 passed | 131 failed | 21 failed as expected
diff --git a/projects/SelfTest/Baselines/console.sw.approved.txt b/projects/SelfTest/Baselines/console.sw.approved.txt
index b7167e98..42d7bcf5 100644
--- a/projects/SelfTest/Baselines/console.sw.approved.txt
+++ b/projects/SelfTest/Baselines/console.sw.approved.txt
@@ -8670,7 +8670,7 @@ String.tests.cpp:<line number>
...............................................................................
String.tests.cpp:<line number>: PASSED:
- CHECK( buffer1 != buffer2 )
+ CHECK( (char*)buffer1 != (char*)buffer2 )
with expansion:
"Hello" != "Hello"
@@ -11422,263 +11422,6 @@ with expansion:
"[\x7F]" == "[\x7F]"
-------------------------------------------------------------------------------
-XmlEncode: UTF-8
- Valid utf-8 strings
--------------------------------------------------------------------------------
-Xml.tests.cpp:<line number>
-...............................................................................
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode(u8"Here be 👾") == u8"Here be 👾" )
-with expansion:
- "Here be 👾" == "Here be 👾"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode(u8"šš") == u8"šš" )
-with expansion:
- "šš" == "šš"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xDF\xBF") == "\xDF\xBF" )
-with expansion:
- "ß¿" == "ß¿"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xE0\xA0\x80") == "\xE0\xA0\x80" )
-with expansion:
- "à €" == "à €"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xED\x9F\xBF") == "\xED\x9F\xBF" )
-with expansion:
- "퟿" == "퟿"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xEE\x80\x80") == "\xEE\x80\x80" )
-with expansion:
- "" == ""
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xEF\xBF\xBF") == "\xEF\xBF\xBF" )
-with expansion:
- "ï¿¿" == "ï¿¿"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF0\x90\x80\x80") == "\xF0\x90\x80\x80" )
-with expansion:
- "�" == "�"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF4\x8F\xBF\xBF") == "\xF4\x8F\xBF\xBF" )
-with expansion:
- "�" == "�"
-
--------------------------------------------------------------------------------
-XmlEncode: UTF-8
- Invalid utf-8 strings
- Various broken strings
--------------------------------------------------------------------------------
-Xml.tests.cpp:<line number>
-...............................................................................
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("Here \xFF be 👾") == u8"Here \\xFF be 👾" )
-with expansion:
- "Here \xFF be 👾" == "Here \xFF be 👾"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xFF") == "\\xFF" )
-with expansion:
- "\xFF" == "\xFF"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xC5\xC5\xA0") == u8"\\xC5Å " )
-with expansion:
- "\xC5Å " == "\xC5Å "
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF4\x90\x80\x80") == u8"\\xF4\\x90\\x80\\x80" )
-with expansion:
- "\xF4\x90\x80\x80" == "\xF4\x90\x80\x80"
-
--------------------------------------------------------------------------------
-XmlEncode: UTF-8
- Invalid utf-8 strings
- Overlong encodings
--------------------------------------------------------------------------------
-Xml.tests.cpp:<line number>
-...............................................................................
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xC0\x80") == u8"\\xC0\\x80" )
-with expansion:
- "\xC0\x80" == "\xC0\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF0\x80\x80\x80") == u8"\\xF0\\x80\\x80\\x80" )
-with expansion:
- "\xF0\x80\x80\x80" == "\xF0\x80\x80\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xC1\xBF") == u8"\\xC1\\xBF" )
-with expansion:
- "\xC1\xBF" == "\xC1\xBF"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xE0\x9F\xBF") == u8"\\xE0\\x9F\\xBF" )
-with expansion:
- "\xE0\x9F\xBF" == "\xE0\x9F\xBF"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF0\x8F\xBF\xBF") == u8"\\xF0\\x8F\\xBF\\xBF" )
-with expansion:
- "\xF0\x8F\xBF\xBF" == "\xF0\x8F\xBF\xBF"
-
--------------------------------------------------------------------------------
-XmlEncode: UTF-8
- Invalid utf-8 strings
- Surrogate pairs
--------------------------------------------------------------------------------
-Xml.tests.cpp:<line number>
-...............................................................................
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xED\xA0\x80") == "\xED\xA0\x80" )
-with expansion:
- "í €" == "í €"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xED\xAF\xBF") == "\xED\xAF\xBF" )
-with expansion:
- "í¯¿" == "í¯¿"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xED\xB0\x80") == "\xED\xB0\x80" )
-with expansion:
- "í°€" == "í°€"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xED\xBF\xBF") == "\xED\xBF\xBF" )
-with expansion:
- "í¿¿" == "í¿¿"
-
--------------------------------------------------------------------------------
-XmlEncode: UTF-8
- Invalid utf-8 strings
- Invalid start byte
--------------------------------------------------------------------------------
-Xml.tests.cpp:<line number>
-...............................................................................
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\x80") == u8"\\x80" )
-with expansion:
- "\x80" == "\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\x81") == u8"\\x81" )
-with expansion:
- "\x81" == "\x81"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xBC") == u8"\\xBC" )
-with expansion:
- "\xBC" == "\xBC"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xBF") == u8"\\xBF" )
-with expansion:
- "\xBF" == "\xBF"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF5\x80\x80\x80") == u8"\\xF5\\x80\\x80\\x80" )
-with expansion:
- "\xF5\x80\x80\x80" == "\xF5\x80\x80\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF6\x80\x80\x80") == u8"\\xF6\\x80\\x80\\x80" )
-with expansion:
- "\xF6\x80\x80\x80" == "\xF6\x80\x80\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF7\x80\x80\x80") == u8"\\xF7\\x80\\x80\\x80" )
-with expansion:
- "\xF7\x80\x80\x80" == "\xF7\x80\x80\x80"
-
--------------------------------------------------------------------------------
-XmlEncode: UTF-8
- Invalid utf-8 strings
- Missing continuation byte(s)
--------------------------------------------------------------------------------
-Xml.tests.cpp:<line number>
-...............................................................................
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xDE") == u8"\\xDE" )
-with expansion:
- "\xDE" == "\xDE"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xDF") == u8"\\xDF" )
-with expansion:
- "\xDF" == "\xDF"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xE0") == u8"\\xE0" )
-with expansion:
- "\xE0" == "\xE0"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xEF") == u8"\\xEF" )
-with expansion:
- "\xEF" == "\xEF"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF0") == u8"\\xF0" )
-with expansion:
- "\xF0" == "\xF0"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF4") == u8"\\xF4" )
-with expansion:
- "\xF4" == "\xF4"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xE0\x80") == u8"\\xE0\\x80" )
-with expansion:
- "\xE0\x80" == "\xE0\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xE0\xBF") == u8"\\xE0\\xBF" )
-with expansion:
- "\xE0\xBF" == "\xE0\xBF"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xE1\x80") == u8"\\xE1\\x80" )
-with expansion:
- "\xE1\x80" == "\xE1\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF0\x80") == u8"\\xF0\\x80" )
-with expansion:
- "\xF0\x80" == "\xF0\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF4\x80") == u8"\\xF4\\x80" )
-with expansion:
- "\xF4\x80" == "\xF4\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF0\x80\x80") == u8"\\xF0\\x80\\x80" )
-with expansion:
- "\xF0\x80\x80" == "\xF0\x80\x80"
-
-Xml.tests.cpp:<line number>: PASSED:
- CHECK( encode("\xF4\x80\x80") == u8"\\xF4\\x80\\x80" )
-with expansion:
- "\xF4\x80\x80" == "\xF4\x80\x80"
-
--------------------------------------------------------------------------------
array<int, N> -> toString
-------------------------------------------------------------------------------
ToStringVector.tests.cpp:<line number>
@@ -13464,6 +13207,6 @@ Misc.tests.cpp:<line number>
Misc.tests.cpp:<line number>: PASSED:
===============================================================================
-test cases: 305 | 215 passed | 86 failed | 4 failed as expected
-assertions: 1712 | 1543 passed | 148 failed | 21 failed as expected
+test cases: 304 | 214 passed | 86 failed | 4 failed as expected
+assertions: 1670 | 1501 passed | 148 failed | 21 failed as expected
diff --git a/projects/SelfTest/Baselines/junit.sw.approved.txt b/projects/SelfTest/Baselines/junit.sw.approved.txt
index 814d05ee..424e073c 100644
--- a/projects/SelfTest/Baselines/junit.sw.approved.txt
+++ b/projects/SelfTest/Baselines/junit.sw.approved.txt
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<testsuitesloose text artifact
>
- <testsuite name="<exe-name>" errors="17" failures="132" tests="1713" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
+ <testsuite name="<exe-name>" errors="17" failures="132" tests="1671" hostname="tbd" time="{duration}" timestamp="{iso8601-timestamp}">
<properties>
<property name="filters" value="~[!nonportable]~[!benchmark]~[approvals] *"/>
<property name="random-seed" value="1"/>
@@ -1402,12 +1402,6 @@ Exception.tests.cpp:<line number>
<testcase classname="<exe-name>.global" name="XmlEncode/string with quotes" time="{duration}"/>
<testcase classname="<exe-name>.global" name="XmlEncode/string with control char (1)" time="{duration}"/>
<testcase classname="<exe-name>.global" name="XmlEncode/string with control char (x7F)" time="{duration}"/>
- <testcase classname="<exe-name>.global" name="XmlEncode: UTF-8/Valid utf-8 strings" time="{duration}"/>
- <testcase classname="<exe-name>.global" name="XmlEncode: UTF-8/Invalid utf-8 strings/Various broken strings" time="{duration}"/>
- <testcase classname="<exe-name>.global" name="XmlEncode: UTF-8/Invalid utf-8 strings/Overlong encodings" time="{duration}"/>
- <testcase classname="<exe-name>.global" name="XmlEncode: UTF-8/Invalid utf-8 strings/Surrogate pairs" time="{duration}"/>
- <testcase classname="<exe-name>.global" name="XmlEncode: UTF-8/Invalid utf-8 strings/Invalid start byte" time="{duration}"/>
- <testcase classname="<exe-name>.global" name="XmlEncode: UTF-8/Invalid utf-8 strings/Missing continuation byte(s)" time="{duration}"/>
<testcase classname="<exe-name>.global" name="array&lt;int, N> -> toString" time="{duration}"/>
<testcase classname="<exe-name>.global" name="atomic if" time="{duration}"/>
<testcase classname="<exe-name>.global" name="boolean member" time="{duration}"/>
diff --git a/projects/SelfTest/Baselines/sonarqube.sw.approved.txt b/projects/SelfTest/Baselines/sonarqube.sw.approved.txt
index 65f4655a..0bd44a18 100644
--- a/projects/SelfTest/Baselines/sonarqube.sw.approved.txt
+++ b/projects/SelfTest/Baselines/sonarqube.sw.approved.txt
@@ -157,12 +157,6 @@
<testCase name="XmlEncode/string with quotes" duration="{duration}"/>
<testCase name="XmlEncode/string with control char (1)" duration="{duration}"/>
<testCase name="XmlEncode/string with control char (x7F)" duration="{duration}"/>
- <testCase name="XmlEncode: UTF-8/Valid utf-8 strings" duration="{duration}"/>
- <testCase name="XmlEncode: UTF-8/Invalid utf-8 strings/Various broken strings" duration="{duration}"/>
- <testCase name="XmlEncode: UTF-8/Invalid utf-8 strings/Overlong encodings" duration="{duration}"/>
- <testCase name="XmlEncode: UTF-8/Invalid utf-8 strings/Surrogate pairs" duration="{duration}"/>
- <testCase name="XmlEncode: UTF-8/Invalid utf-8 strings/Invalid start byte" duration="{duration}"/>
- <testCase name="XmlEncode: UTF-8/Invalid utf-8 strings/Missing continuation byte(s)" duration="{duration}"/>
</file>
<file path="projects/<exe-name>/UsageTests/Approx.tests.cpp">
<testCase name="A comparison that uses literals instead of the normal constructor" duration="{duration}"/>
diff --git a/projects/SelfTest/Baselines/xml.sw.approved.txt b/projects/SelfTest/Baselines/xml.sw.approved.txt
index 8c95f95b..f7f5c80e 100644
--- a/projects/SelfTest/Baselines/xml.sw.approved.txt
+++ b/projects/SelfTest/Baselines/xml.sw.approved.txt
@@ -10849,7 +10849,7 @@ Message from section two
<Section name="Comparisons are deep" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
<Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/String.tests.cpp" >
<Original>
- buffer1 != buffer2
+ (char*)buffer1 != (char*)buffer2
</Original>
<Expanded>
"Hello" != "Hello"
@@ -13846,378 +13846,6 @@ There is no extra whitespace here
</Section>
<OverallResult success="true"/>
</TestCase>
- <TestCase name="XmlEncode: UTF-8" tags="[UTF-8][XML]" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Section name="Valid utf-8 strings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode(u8"Here be 👾") == u8"Here be 👾"
- </Original>
- <Expanded>
- "Here be 👾" == "Here be 👾"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode(u8"šš") == u8"šš"
- </Original>
- <Expanded>
- "šš" == "šš"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xDF\xBF") == "\xDF\xBF"
- </Original>
- <Expanded>
- "ß¿" == "ß¿"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xE0\xA0\x80") == "\xE0\xA0\x80"
- </Original>
- <Expanded>
- "à €" == "à €"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xED\x9F\xBF") == "\xED\x9F\xBF"
- </Original>
- <Expanded>
- "퟿" == "퟿"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xEE\x80\x80") == "\xEE\x80\x80"
- </Original>
- <Expanded>
- "" == ""
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xEF\xBF\xBF") == "\xEF\xBF\xBF"
- </Original>
- <Expanded>
- "ï¿¿" == "ï¿¿"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF0\x90\x80\x80") == "\xF0\x90\x80\x80"
- </Original>
- <Expanded>
- "�" == "�"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF4\x8F\xBF\xBF") == "\xF4\x8F\xBF\xBF"
- </Original>
- <Expanded>
- "�" == "�"
- </Expanded>
- </Expression>
- <OverallResults successes="9" failures="0" expectedFailures="0"/>
- </Section>
- <Section name="Invalid utf-8 strings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Section name="Various broken strings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("Here \xFF be 👾") == u8"Here \\xFF be 👾"
- </Original>
- <Expanded>
- "Here \xFF be 👾" == "Here \xFF be 👾"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xFF") == "\\xFF"
- </Original>
- <Expanded>
- "\xFF" == "\xFF"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xC5\xC5\xA0") == u8"\\xC5Å "
- </Original>
- <Expanded>
- "\xC5Å " == "\xC5Å "
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF4\x90\x80\x80") == u8"\\xF4\\x90\\x80\\x80"
- </Original>
- <Expanded>
- "\xF4\x90\x80\x80" == "\xF4\x90\x80\x80"
- </Expanded>
- </Expression>
- <OverallResults successes="4" failures="0" expectedFailures="0"/>
- </Section>
- <OverallResults successes="4" failures="0" expectedFailures="0"/>
- </Section>
- <Section name="Invalid utf-8 strings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Section name="Overlong encodings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xC0\x80") == u8"\\xC0\\x80"
- </Original>
- <Expanded>
- "\xC0\x80" == "\xC0\x80"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF0\x80\x80\x80") == u8"\\xF0\\x80\\x80\\x80"
- </Original>
- <Expanded>
- "\xF0\x80\x80\x80" == "\xF0\x80\x80\x80"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xC1\xBF") == u8"\\xC1\\xBF"
- </Original>
- <Expanded>
- "\xC1\xBF" == "\xC1\xBF"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xE0\x9F\xBF") == u8"\\xE0\\x9F\\xBF"
- </Original>
- <Expanded>
- "\xE0\x9F\xBF" == "\xE0\x9F\xBF"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF0\x8F\xBF\xBF") == u8"\\xF0\\x8F\\xBF\\xBF"
- </Original>
- <Expanded>
- "\xF0\x8F\xBF\xBF" == "\xF0\x8F\xBF\xBF"
- </Expanded>
- </Expression>
- <OverallResults successes="5" failures="0" expectedFailures="0"/>
- </Section>
- <OverallResults successes="5" failures="0" expectedFailures="0"/>
- </Section>
- <Section name="Invalid utf-8 strings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Section name="Surrogate pairs" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xED\xA0\x80") == "\xED\xA0\x80"
- </Original>
- <Expanded>
- "í €" == "í €"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xED\xAF\xBF") == "\xED\xAF\xBF"
- </Original>
- <Expanded>
- "í¯¿" == "í¯¿"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xED\xB0\x80") == "\xED\xB0\x80"
- </Original>
- <Expanded>
- "í°€" == "í°€"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xED\xBF\xBF") == "\xED\xBF\xBF"
- </Original>
- <Expanded>
- "í¿¿" == "í¿¿"
- </Expanded>
- </Expression>
- <OverallResults successes="4" failures="0" expectedFailures="0"/>
- </Section>
- <OverallResults successes="4" failures="0" expectedFailures="0"/>
- </Section>
- <Section name="Invalid utf-8 strings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Section name="Invalid start byte" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\x80") == u8"\\x80"
- </Original>
- <Expanded>
- "\x80" == "\x80"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\x81") == u8"\\x81"
- </Original>
- <Expanded>
- "\x81" == "\x81"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xBC") == u8"\\xBC"
- </Original>
- <Expanded>
- "\xBC" == "\xBC"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xBF") == u8"\\xBF"
- </Original>
- <Expanded>
- "\xBF" == "\xBF"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF5\x80\x80\x80") == u8"\\xF5\\x80\\x80\\x80"
- </Original>
- <Expanded>
- "\xF5\x80\x80\x80" == "\xF5\x80\x80\x80"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF6\x80\x80\x80") == u8"\\xF6\\x80\\x80\\x80"
- </Original>
- <Expanded>
- "\xF6\x80\x80\x80" == "\xF6\x80\x80\x80"
- </Expanded>
- </Expression>
- <Expression success="true" type="CHECK" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Original>
- encode("\xF7\x80\x80\x80") == u8"\\xF7\\x80\\x80\\x80"
- </Original>
- <Expanded>
- "\xF7\x80\x80\x80" == "\xF7\x80\x80\x80"
- </Expanded>
- </Expression>
- <OverallResults successes="7" failures="0" expectedFailures="0"/>
- </Section>
- <OverallResults successes="7" failures="0" expectedFailures="0"/>
- </Section>
- <Section name="Invalid utf-8 strings" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >
- <Section name="Missing continuation byte(s)" filename="projects/<exe-name>/IntrospectiveTests/Xml.tests.cpp" >