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

Constructor unittests now use the new Loader ctor.

Browse source
This commit is contained in:
Ferdinand Majerech 2014-07-31 02:55:38 +02:00
parent 68d9124b17
commit 276bed7fb6
1 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
source/dyaml/constructor.d
View file

@ -849,10 +849,9 @@ Node.Pair[] constructMap(ref Node node)
} }
//Unittests // Unittests
private: private:
import std.stream;
import dyaml.loader; import dyaml.loader;
struct MyStruct struct MyStruct
@ -870,28 +869,27 @@ struct MyStruct
MyStruct constructMyStructScalar(ref Node node) MyStruct constructMyStructScalar(ref Node node)
{ {
//Guaranteed to be string as we construct from scalar. // Guaranteed to be string as we construct from scalar.
auto parts = node.as!string().split(":"); auto parts = node.as!string().split(":");
return MyStruct(to!int(parts[0]), to!int(parts[1]), to!int(parts[2])); return MyStruct(to!int(parts[0]), to!int(parts[1]), to!int(parts[2]));
} }
MyStruct constructMyStructSequence(ref Node node) MyStruct constructMyStructSequence(ref Node node)
{ {
//node is guaranteed to be sequence. // node is guaranteed to be sequence.
return MyStruct(node[0].as!int, node[1].as!int, node[2].as!int); return MyStruct(node[0].as!int, node[1].as!int, node[2].as!int);
} }
MyStruct constructMyStructMapping(ref Node node) MyStruct constructMyStructMapping(ref Node node)
{ {
//node is guaranteed to be mapping. // node is guaranteed to be mapping.
return MyStruct(node["x"].as!int, node["y"].as!int, node["z"].as!int); return MyStruct(node["x"].as!int, node["y"].as!int, node["z"].as!int);
} }
unittest unittest
{ {
char[] data = cast(char[])"!mystruct 1:2:3"; char[] data = "!mystruct 1:2:3".dup;
auto loadStream = new MemoryStream(data); auto loader = Loader(data);
auto loader = Loader(loadStream);
auto constructor = new Constructor; auto constructor = new Constructor;
constructor.addConstructorScalar("!mystruct", &constructMyStructScalar); constructor.addConstructorScalar("!mystruct", &constructMyStructScalar);
loader.constructor = constructor; loader.constructor = constructor;
@ -902,9 +900,8 @@ unittest
unittest unittest
{ {
char[] data = cast(char[])"!mystruct [1, 2, 3]"; char[] data = "!mystruct [1, 2, 3]".dup;
auto loadStream = new MemoryStream(data); auto loader = Loader(data);
auto loader = Loader(loadStream);
auto constructor = new Constructor; auto constructor = new Constructor;
constructor.addConstructorSequence("!mystruct", &constructMyStructSequence); constructor.addConstructorSequence("!mystruct", &constructMyStructSequence);
loader.constructor = constructor; loader.constructor = constructor;
@ -915,9 +912,8 @@ unittest
unittest unittest
{ {
char[] data = cast(char[])"!mystruct {x: 1, y: 2, z: 3}"; char[] data = "!mystruct {x: 1, y: 2, z: 3}".dup;
auto loadStream = new MemoryStream(data); auto loader = Loader(data);
auto loader = Loader(loadStream);
auto constructor = new Constructor; auto constructor = new Constructor;
constructor.addConstructorMapping("!mystruct", &constructMyStructMapping); constructor.addConstructorMapping("!mystruct", &constructMyStructMapping);
loader.constructor = constructor; loader.constructor = constructor;