mirror of
https://github.com/catchorg/Catch2.git
synced 2024-11-22 21:36:11 +01:00
e1e6872c4c
This is both a really big and a really small commit. It is small in that it only contains renaming, moving and modification of include directives caused by this. It is really big in the obvious way of touching something like 200 files. The new rules for naming files is simple: headers use the `.hpp` extension. The rules for physical file layout is still kinda in progress, but the basics are also simple: * Significant parts of functionality get their own subfolder * Benchmarking is in `catch2/benchmark` * Matchers are in `catch2/matchers` * Generators are in `catch2/generators` * Reporters are in `catch2/reporters` * Baseline testing facilities are in `catch2/` * Various top level folders also contain `internal` subfolder, with files that users probably do not want to include directly, at least not until they have to write something like their own reporter. * The exact files in these subfolders is likely to change later on Note that while some includes were cleaned up in this commit, it is only the low hanging fruit and further cleanup using automatic tooling will happen later. Also note that various include guards, copyright notices and file headers will also be standardized later, rather than in this commit.
115 lines
4.9 KiB
C++
115 lines
4.9 KiB
C++
#include <catch2/catch_test_macros.hpp>
|
|
#include <catch2/internal/catch_xmlwriter.hpp>
|
|
|
|
#include <sstream>
|
|
|
|
inline std::string encode( std::string const& str, Catch::XmlEncode::ForWhat forWhat = Catch::XmlEncode::ForTextNodes ) {
|
|
std::ostringstream oss;
|
|
oss << Catch::XmlEncode( str, forWhat );
|
|
return oss.str();
|
|
}
|
|
|
|
TEST_CASE( "XmlEncode", "[XML]" ) {
|
|
SECTION( "normal string" ) {
|
|
REQUIRE( encode( "normal string" ) == "normal string" );
|
|
}
|
|
SECTION( "empty string" ) {
|
|
REQUIRE( encode( "" ) == "" );
|
|
}
|
|
SECTION( "string with ampersand" ) {
|
|
REQUIRE( encode( "smith & jones" ) == "smith & jones" );
|
|
}
|
|
SECTION( "string with less-than" ) {
|
|
REQUIRE( encode( "smith < jones" ) == "smith < jones" );
|
|
}
|
|
SECTION( "string with greater-than" ) {
|
|
REQUIRE( encode( "smith > jones" ) == "smith > jones" );
|
|
REQUIRE( encode( "smith ]]> jones" ) == "smith ]]> jones" );
|
|
}
|
|
SECTION( "string with quotes" ) {
|
|
std::string stringWithQuotes = "don't \"quote\" me on that";
|
|
REQUIRE( encode( stringWithQuotes ) == stringWithQuotes );
|
|
REQUIRE( encode( stringWithQuotes, Catch::XmlEncode::ForAttributes ) == "don't "quote" me on that" );
|
|
}
|
|
SECTION( "string with control char (1)" ) {
|
|
REQUIRE( encode( "[\x01]" ) == "[\\x01]" );
|
|
}
|
|
SECTION( "string with control char (x7F)" ) {
|
|
REQUIRE( encode( "[\x7F]" ) == "[\\x7F]" );
|
|
}
|
|
}
|
|
|
|
// Thanks to Peter Bindels (dascandy) for some of the tests
|
|
TEST_CASE("XmlEncode: UTF-8", "[XML][UTF-8][approvals]") {
|
|
#define ESC(lit) (char*)(lit)
|
|
SECTION("Valid utf-8 strings") {
|
|
CHECK(encode(ESC(u8"Here be 👾")) == ESC(u8"Here be 👾"));
|
|
CHECK(encode(ESC(u8"šš")) == ESC(u8"šš"));
|
|
|
|
CHECK(encode("\xDF\xBF") == "\xDF\xBF"); // 0x7FF
|
|
CHECK(encode("\xE0\xA0\x80") == "\xE0\xA0\x80"); // 0x800
|
|
CHECK(encode("\xED\x9F\xBF") == "\xED\x9F\xBF"); // 0xD7FF
|
|
CHECK(encode("\xEE\x80\x80") == "\xEE\x80\x80"); // 0xE000
|
|
CHECK(encode("\xEF\xBF\xBF") == "\xEF\xBF\xBF"); // 0xFFFF
|
|
CHECK(encode("\xF0\x90\x80\x80") == "\xF0\x90\x80\x80"); // 0x10000
|
|
CHECK(encode("\xF4\x8F\xBF\xBF") == "\xF4\x8F\xBF\xBF"); // 0x10FFFF
|
|
}
|
|
SECTION("Invalid utf-8 strings") {
|
|
SECTION("Various broken strings") {
|
|
CHECK(encode(ESC("Here \xFF be \xF0\x9F\x91\xBE")) == ESC(u8"Here \\xFF be 👾"));
|
|
CHECK(encode("\xFF") == "\\xFF");
|
|
CHECK(encode("\xC5\xC5\xA0") == ESC(u8"\\xC5Š"));
|
|
CHECK(encode("\xF4\x90\x80\x80") == ESC(u8"\\xF4\\x90\\x80\\x80")); // 0x110000 -- out of unicode range
|
|
}
|
|
|
|
SECTION("Overlong encodings") {
|
|
CHECK(encode("\xC0\x80") == "\\xC0\\x80"); // \0
|
|
CHECK(encode("\xF0\x80\x80\x80") == "\\xF0\\x80\\x80\\x80"); // Super-over-long \0
|
|
CHECK(encode("\xC1\xBF") == "\\xC1\\xBF"); // ASCII char as UTF-8 (0x7F)
|
|
CHECK(encode("\xE0\x9F\xBF") == "\\xE0\\x9F\\xBF"); // 0x7FF
|
|
CHECK(encode("\xF0\x8F\xBF\xBF") == "\\xF0\\x8F\\xBF\\xBF"); // 0xFFFF
|
|
}
|
|
|
|
// Note that we actually don't modify surrogate pairs, as we do not do strict checking
|
|
SECTION("Surrogate pairs") {
|
|
CHECK(encode("\xED\xA0\x80") == "\xED\xA0\x80"); // Invalid surrogate half 0xD800
|
|
CHECK(encode("\xED\xAF\xBF") == "\xED\xAF\xBF"); // Invalid surrogate half 0xDBFF
|
|
CHECK(encode("\xED\xB0\x80") == "\xED\xB0\x80"); // Invalid surrogate half 0xDC00
|
|
CHECK(encode("\xED\xBF\xBF") == "\xED\xBF\xBF"); // Invalid surrogate half 0xDFFF
|
|
}
|
|
|
|
SECTION("Invalid start byte") {
|
|
CHECK(encode("\x80") == "\\x80");
|
|
CHECK(encode("\x81") == "\\x81");
|
|
CHECK(encode("\xBC") == "\\xBC");
|
|
CHECK(encode("\xBF") == "\\xBF");
|
|
// Out of range
|
|
CHECK(encode("\xF5\x80\x80\x80") == "\\xF5\\x80\\x80\\x80");
|
|
CHECK(encode("\xF6\x80\x80\x80") == "\\xF6\\x80\\x80\\x80");
|
|
CHECK(encode("\xF7\x80\x80\x80") == "\\xF7\\x80\\x80\\x80");
|
|
}
|
|
|
|
SECTION("Missing continuation byte(s)") {
|
|
// Missing first continuation byte
|
|
CHECK(encode("\xDE") == "\\xDE");
|
|
CHECK(encode("\xDF") == "\\xDF");
|
|
CHECK(encode("\xE0") == "\\xE0");
|
|
CHECK(encode("\xEF") == "\\xEF");
|
|
CHECK(encode("\xF0") == "\\xF0");
|
|
CHECK(encode("\xF4") == "\\xF4");
|
|
|
|
// Missing second continuation byte
|
|
CHECK(encode("\xE0\x80") == "\\xE0\\x80");
|
|
CHECK(encode("\xE0\xBF") == "\\xE0\\xBF");
|
|
CHECK(encode("\xE1\x80") == "\\xE1\\x80");
|
|
CHECK(encode("\xF0\x80") == "\\xF0\\x80");
|
|
CHECK(encode("\xF4\x80") == "\\xF4\\x80");
|
|
|
|
// Missing third continuation byte
|
|
CHECK(encode("\xF0\x80\x80") == "\\xF0\\x80\\x80");
|
|
CHECK(encode("\xF4\x80\x80") == "\\xF4\\x80\\x80");
|
|
}
|
|
}
|
|
#undef ESC
|
|
}
|