debian-packages/dyaml
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Using new Loader ctor in unicode input tests.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-31 03:12:57 +02:00
parent ee0a449977
commit 337938f090
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
test/src/inputoutput.d
View file

@ -51,13 +51,13 @@ void testUnicodeInput(bool verbose, string unicodeFilename)
string data = readText(unicodeFilename); string data = readText(unicodeFilename);
string expected = data.split().join(" "); string expected = data.split().join(" ");
Node output = Loader(new MemoryStream(to!(char[])(data))).load(); Node output = Loader(cast(void[])data.to!(char[])).load();
assert(output.as!string == expected); assert(output.as!string == expected);
foreach(stream; [new MemoryStream(cast(byte[])(bom16() ~ to!(wchar[])(data))), foreach(buffer; [cast(void[])(bom16() ~ data.to!(wchar[])),
new MemoryStream(cast(byte[])(bom32() ~ to!(dchar[])(data)))]) cast(void[])(bom32() ~ data.to!(dchar[]))])
{ {
output = Loader(stream).load(); output = Loader(buffer).load();
assert(output.as!string == expected); assert(output.as!string == expected);
} }
} }
@ -69,15 +69,15 @@ void testUnicodeInput(bool verbose, string unicodeFilename)
void testUnicodeInputErrors(bool verbose, string unicodeFilename) void testUnicodeInputErrors(bool verbose, string unicodeFilename)
{ {
string data = readText(unicodeFilename); string data = readText(unicodeFilename);
foreach(stream; [new MemoryStream(cast(byte[])(to!(wchar[])(data))), foreach(buffer; [cast(void[])(data.to!(wchar[])),
new MemoryStream(cast(byte[])(to!(wchar[])(data))), cast(void[])(data.to!(dchar[])),
new MemoryStream(cast(byte[])(bom16(true) ~ to!(wchar[])(data))), cast(void[])(bom16(true) ~ data.to!(wchar[])),
new MemoryStream(cast(byte[])(bom32(true) ~ to!(dchar[])(data)))]) cast(void[])(bom32(true) ~ data.to!(dchar[]))])
{ {
try{Loader(stream).load();} try { Loader(buffer).load(); }
catch(YAMLException e) catch(YAMLException e)
{ {
if(verbose){writeln(typeid(e).toString(), "\n", e);} if(verbose) { writeln(typeid(e).toString(), "\n", e); }
continue; continue;
} }
assert(false, "Expected an exception"); assert(false, "Expected an exception");