diff --git a/yaml-reader.vcproj b/yaml-reader.vcproj
index 57d70b9..84ad1d3 100644
--- a/yaml-reader.vcproj
+++ b/yaml-reader.vcproj
@@ -167,10 +167,18 @@
Filter="cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx"
UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
>
+
+
+
+
@@ -186,32 +194,6 @@
>
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/yaml-reader/emittertests.cpp b/yaml-reader/emittertests.cpp
new file mode 100644
index 0000000..8836c58
--- /dev/null
+++ b/yaml-reader/emittertests.cpp
@@ -0,0 +1,514 @@
+#include "tests.h"
+#include "yaml.h"
+
+namespace Test
+{
+ namespace Emitter {
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // correct emitting
+
+ void SimpleScalar(YAML::Emitter& out, std::string& desiredOutput) {
+ out << "Hello, World!";
+ desiredOutput = "Hello, World!";
+ }
+
+ void SimpleSeq(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginSeq;
+ out << "eggs";
+ out << "bread";
+ out << "milk";
+ out << YAML::EndSeq;
+
+ desiredOutput = "- eggs\n- bread\n- milk";
+ }
+
+ void SimpleFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::Flow;
+ out << YAML::BeginSeq;
+ out << "Larry";
+ out << "Curly";
+ out << "Moe";
+ out << YAML::EndSeq;
+
+ desiredOutput = "[Larry, Curly, Moe]";
+ }
+
+ void EmptyFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::Flow;
+ out << YAML::BeginSeq;
+ out << YAML::EndSeq;
+
+ desiredOutput = "[]";
+ }
+
+ void NestedBlockSeq(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginSeq;
+ out << "item 1";
+ out << YAML::BeginSeq << "subitem 1" << "subitem 2" << YAML::EndSeq;
+ out << YAML::EndSeq;
+
+ desiredOutput = "- item 1\n-\n - subitem 1\n - subitem 2";
+ }
+
+ void NestedFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginSeq;
+ out << "one";
+ out << YAML::Flow << YAML::BeginSeq << "two" << "three" << YAML::EndSeq;
+ out << YAML::EndSeq;
+
+ desiredOutput = "- one\n- [two, three]";
+ }
+
+ void SimpleMap(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginMap;
+ out << YAML::Key << "name";
+ out << YAML::Value << "Ryan Braun";
+ out << YAML::Key << "position";
+ out << YAML::Value << "3B";
+ out << YAML::EndMap;
+
+ desiredOutput = "name: Ryan Braun\nposition: 3B";
+ }
+
+ void SimpleFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::Flow;
+ out << YAML::BeginMap;
+ out << YAML::Key << "shape";
+ out << YAML::Value << "square";
+ out << YAML::Key << "color";
+ out << YAML::Value << "blue";
+ out << YAML::EndMap;
+
+ desiredOutput = "{shape: square, color: blue}";
+ }
+
+ void MapAndList(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginMap;
+ out << YAML::Key << "name";
+ out << YAML::Value << "Barack Obama";
+ out << YAML::Key << "children";
+ out << YAML::Value << YAML::BeginSeq << "Sasha" << "Malia" << YAML::EndSeq;
+ out << YAML::EndMap;
+
+ desiredOutput = "name: Barack Obama\nchildren:\n - Sasha\n - Malia";
+ }
+
+ void ListAndMap(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginSeq;
+ out << "item 1";
+ out << YAML::BeginMap;
+ out << YAML::Key << "pens" << YAML::Value << 8;
+ out << YAML::Key << "pencils" << YAML::Value << 14;
+ out << YAML::EndMap;
+ out << "item 2";
+ out << YAML::EndSeq;
+
+ desiredOutput = "- item 1\n-\n pens: 8\n pencils: 14\n- item 2";
+ }
+
+ void NestedBlockMap(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginMap;
+ out << YAML::Key << "name";
+ out << YAML::Value << "Fred";
+ out << YAML::Key << "grades";
+ out << YAML::Value;
+ out << YAML::BeginMap;
+ out << YAML::Key << "algebra" << YAML::Value << "A";
+ out << YAML::Key << "physics" << YAML::Value << "C+";
+ out << YAML::Key << "literature" << YAML::Value << "B";
+ out << YAML::EndMap;
+ out << YAML::EndMap;
+
+ desiredOutput = "name: Fred\ngrades:\n algebra: A\n physics: C+\n literature: B";
+ }
+
+ void NestedFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::Flow;
+ out << YAML::BeginMap;
+ out << YAML::Key << "name";
+ out << YAML::Value << "Fred";
+ out << YAML::Key << "grades";
+ out << YAML::Value;
+ out << YAML::BeginMap;
+ out << YAML::Key << "algebra" << YAML::Value << "A";
+ out << YAML::Key << "physics" << YAML::Value << "C+";
+ out << YAML::Key << "literature" << YAML::Value << "B";
+ out << YAML::EndMap;
+ out << YAML::EndMap;
+
+ desiredOutput = "{name: Fred, grades: {algebra: A, physics: C+, literature: B}}";
+ }
+
+ void MapListMix(YAML::Emitter& out, std::string& desiredOutput) {
+ out << YAML::BeginMap;
+ out << YAML::Key << "name";
+ out << YAML::Value << "Bob";
+ out << YAML::Key << "position";
+ out << YAML::Value;
+ out << YAML::Flow << YAML::BeginSeq << 2 << 4 << YAML::EndSeq;
+ out << YAML::Key << "invincible" << YAML::Value << YAML::OnOffBool << false;
+ out << YAML::EndMap;
+
+ desiredOutput = "name: Bob\nposition: [2, 4]\ninvincible: off";
+ }
+
+ void SimpleLongKey(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::LongKey;
+ out << YAML::BeginMap;
+ out << YAML::Key << "height";
+ out << YAML::Value << "5'9\"";
+ out << YAML::Key << "weight";
+ out << YAML::Value << 145;
+ out << YAML::EndMap;
+
+ desiredOutput = "? height\n: 5'9\"\n? weight\n: 145";
+ }
+
+ void SingleLongKey(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginMap;
+ out << YAML::Key << "age";
+ out << YAML::Value << "24";
+ out << YAML::LongKey << YAML::Key << "height";
+ out << YAML::Value << "5'9\"";
+ out << YAML::Key << "weight";
+ out << YAML::Value << 145;
+ out << YAML::EndMap;
+
+ desiredOutput = "age: 24\n? height\n: 5'9\"\nweight: 145";
+ }
+
+ void ComplexLongKey(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::LongKey;
+ out << YAML::BeginMap;
+ out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
+ out << YAML::Value << "monster";
+ out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
+ out << YAML::Value << "demon";
+ out << YAML::EndMap;
+
+ desiredOutput = "?\n - 1\n - 3\n: monster\n? [2, 0]\n: demon";
+ }
+
+ void AutoLongKey(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginMap;
+ out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
+ out << YAML::Value << "monster";
+ out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
+ out << YAML::Value << "demon";
+ out << YAML::Key << "the origin";
+ out << YAML::Value << "angel";
+ out << YAML::EndMap;
+
+ desiredOutput = "?\n - 1\n - 3\n: monster\n? [2, 0]\n: demon\nthe origin: angel";
+ }
+
+ void ScalarFormat(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginSeq;
+ out << "simple scalar";
+ out << YAML::SingleQuoted << "explicit single-quoted scalar";
+ out << YAML::DoubleQuoted << "explicit double-quoted scalar";
+ out << "auto-detected\ndouble-quoted scalar";
+ out << "a non-\"auto-detected\" double-quoted scalar";
+ out << YAML::Literal << "literal scalar\nthat may span\nmany, many\nlines and have \"whatever\" crazy\tsymbols that we like";
+ out << YAML::EndSeq;
+
+ desiredOutput = "- simple scalar\n- 'explicit single-quoted scalar'\n- \"explicit double-quoted scalar\"\n- \"auto-detected\\xadouble-quoted scalar\"\n- a non-\"auto-detected\" double-quoted scalar\n- |\n literal scalar\n that may span\n many, many\n lines and have \"whatever\" crazy\tsymbols that we like";
+ }
+
+ void AutoLongKeyScalar(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginMap;
+ out << YAML::Key << YAML::Literal << "multi-line\nscalar";
+ out << YAML::Value << "and its value";
+ out << YAML::EndMap;
+
+ desiredOutput = "? |\n multi-line\n scalar\n: and its value";
+ }
+
+ void LongKeyFlowMap(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::Flow;
+ out << YAML::BeginMap;
+ out << YAML::Key << "simple key";
+ out << YAML::Value << "and value";
+ out << YAML::LongKey << YAML::Key << "long key";
+ out << YAML::Value << "and its value";
+ out << YAML::EndMap;
+
+ desiredOutput = "{simple key: and value, ? long key: and its value}";
+ }
+
+ void BlockMapAsKey(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginMap;
+ out << YAML::Key;
+ out << YAML::BeginMap;
+ out << YAML::Key << "key" << YAML::Value << "value";
+ out << YAML::Key << "next key" << YAML::Value << "next value";
+ out << YAML::EndMap;
+ out << YAML::Value;
+ out << "total value";
+ out << YAML::EndMap;
+
+ desiredOutput = "?\n key: value\n next key: next value\n: total value";
+ }
+
+ void AliasAndAnchor(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginSeq;
+ out << YAML::Anchor("fred");
+ out << YAML::BeginMap;
+ out << YAML::Key << "name" << YAML::Value << "Fred";
+ out << YAML::Key << "age" << YAML::Value << 42;
+ out << YAML::EndMap;
+ out << YAML::Alias("fred");
+ out << YAML::EndSeq;
+
+ desiredOutput = "- &fred\n name: Fred\n age: 42\n- *fred";
+ }
+
+ void ComplexDoc(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginMap;
+ out << YAML::Key << "receipt";
+ out << YAML::Value << "Oz-Ware Purchase Invoice";
+ out << YAML::Key << "date";
+ out << YAML::Value << "2007-08-06";
+ out << YAML::Key << "customer";
+ out << YAML::Value;
+ out << YAML::BeginMap;
+ out << YAML::Key << "given";
+ out << YAML::Value << "Dorothy";
+ out << YAML::Key << "family";
+ out << YAML::Value << "Gale";
+ out << YAML::EndMap;
+ out << YAML::Key << "items";
+ out << YAML::Value;
+ out << YAML::BeginSeq;
+ out << YAML::BeginMap;
+ out << YAML::Key << "part_no";
+ out << YAML::Value << "A4786";
+ out << YAML::Key << "descrip";
+ out << YAML::Value << "Water Bucket (Filled)";
+ out << YAML::Key << "price";
+ out << YAML::Value << 1.47;
+ out << YAML::Key << "quantity";
+ out << YAML::Value << 4;
+ out << YAML::EndMap;
+ out << YAML::BeginMap;
+ out << YAML::Key << "part_no";
+ out << YAML::Value << "E1628";
+ out << YAML::Key << "descrip";
+ out << YAML::Value << "High Heeled \"Ruby\" Slippers";
+ out << YAML::Key << "price";
+ out << YAML::Value << 100.27;
+ out << YAML::Key << "quantity";
+ out << YAML::Value << 1;
+ out << YAML::EndMap;
+ out << YAML::EndSeq;
+ out << YAML::Key << "bill-to";
+ out << YAML::Value << YAML::Anchor("id001");
+ out << YAML::BeginMap;
+ out << YAML::Key << "street";
+ out << YAML::Value << YAML::Literal << "123 Tornado Alley\nSuite 16";
+ out << YAML::Key << "city";
+ out << YAML::Value << "East Westville";
+ out << YAML::Key << "state";
+ out << YAML::Value << "KS";
+ out << YAML::EndMap;
+ out << YAML::Key << "ship-to";
+ out << YAML::Value << YAML::Alias("id001");
+ out << YAML::EndMap;
+
+ desiredOutput = "receipt: Oz-Ware Purchase Invoice\ndate: 2007-08-06\ncustomer:\n given: Dorothy\n family: Gale\nitems:\n -\n part_no: A4786\n descrip: Water Bucket (Filled)\n price: 1.47\n quantity: 4\n -\n part_no: E1628\n descrip: High Heeled \"Ruby\" Slippers\n price: 100.27\n quantity: 1\nbill-to: &id001\n street: |\n 123 Tornado Alley\n Suite 16\n city: East Westville\n state: KS\nship-to: *id001";
+ }
+
+ void STLContainers(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginSeq;
+ std::vector primes;
+ primes.push_back(2);
+ primes.push_back(3);
+ primes.push_back(5);
+ primes.push_back(7);
+ primes.push_back(11);
+ primes.push_back(13);
+ out << YAML::Flow << primes;
+ std::map ages;
+ ages["Daniel"] = 26;
+ ages["Jesse"] = 24;
+ out << ages;
+ out << YAML::EndSeq;
+
+ desiredOutput = "- [2, 3, 5, 7, 11, 13]\n-\n Daniel: 26\n Jesse: 24";
+ }
+
+ void SimpleComment(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginMap;
+ out << YAML::Key << "method";
+ out << YAML::Value << "least squares" << YAML::Comment("should we change this method?");
+ out << YAML::EndMap;
+
+ desiredOutput = "method: least squares # should we change this method?";
+ }
+
+ void MultiLineComment(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginSeq;
+ out << "item 1" << YAML::Comment("really really long\ncomment that couldn't possibly\nfit on one line");
+ out << "item 2";
+ out << YAML::EndSeq;
+
+ desiredOutput = "- item 1 # really really long\n # comment that couldn't possibly\n # fit on one line\n- item 2";
+ }
+
+ void ComplexComments(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginMap;
+ out << YAML::LongKey << YAML::Key << "long key" << YAML::Comment("long key");
+ out << YAML::Value << "value";
+ out << YAML::EndMap;
+
+ desiredOutput = "? long key # long key\n: value";
+ }
+
+ void Indentation(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::Indent(4);
+ out << YAML::BeginSeq;
+ out << YAML::BeginMap;
+ out << YAML::Key << "key 1" << YAML::Value << "value 1";
+ out << YAML::Key << "key 2" << YAML::Value << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
+ out << YAML::EndMap;
+ out << YAML::EndSeq;
+
+ desiredOutput = "-\n key 1: value 1\n key 2:\n - a\n - b\n - c";
+ }
+
+ void SimpleGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out.SetIndent(4);
+ out.SetMapFormat(YAML::LongKey);
+
+ out << YAML::BeginSeq;
+ out << YAML::BeginMap;
+ out << YAML::Key << "key 1" << YAML::Value << "value 1";
+ out << YAML::Key << "key 2" << YAML::Value << YAML::Flow << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
+ out << YAML::EndMap;
+ out << YAML::EndSeq;
+
+ desiredOutput = "-\n ? key 1\n : value 1\n ? key 2\n : [a, b, c]";
+ }
+
+ void ComplexGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
+ {
+ out << YAML::BeginSeq;
+ out << YAML::Block;
+ out << YAML::BeginMap;
+ out << YAML::Key << "key 1" << YAML::Value << "value 1";
+ out << YAML::Key << "key 2" << YAML::Value;
+ out.SetSeqFormat(YAML::Flow);
+ out << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
+ out << YAML::EndMap;
+ out << YAML::BeginMap;
+ out << YAML::Key << YAML::BeginSeq << 1 << 2 << YAML::EndSeq;
+ out << YAML::Value << YAML::BeginMap << YAML::Key << "a" << YAML::Value << "b" << YAML::EndMap;
+ out << YAML::EndMap;
+ out << YAML::EndSeq;
+
+ desiredOutput = "-\n key 1: value 1\n key 2: [a, b, c]\n-\n ? [1, 2]\n :\n a: b";
+ }
+
+ ////////////////////////////////////////////////////////////////////////////////////////////////////////
+ // incorrect emitting
+
+ void ExtraEndSeq(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::UNEXPECTED_END_SEQ;
+
+ out << YAML::BeginSeq;
+ out << "Hello";
+ out << "World";
+ out << YAML::EndSeq;
+ out << YAML::EndSeq;
+ }
+
+ void ExtraEndMap(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::UNEXPECTED_END_MAP;
+
+ out << YAML::BeginMap;
+ out << YAML::Key << "Hello" << YAML::Value << "World";
+ out << YAML::EndMap;
+ out << YAML::EndMap;
+ }
+
+ void BadSingleQuoted(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::SINGLE_QUOTED_CHAR;
+
+ out << YAML::SingleQuoted << "Hello\nWorld";
+ }
+
+ void InvalidAnchor(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::INVALID_ANCHOR;
+
+ out << YAML::BeginSeq;
+ out << YAML::Anchor("new\nline") << "Test";
+ out << YAML::EndSeq;
+ }
+
+ void InvalidAlias(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::INVALID_ALIAS;
+
+ out << YAML::BeginSeq;
+ out << YAML::Alias("new\nline");
+ out << YAML::EndSeq;
+ }
+
+ void MissingKey(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::EXPECTED_KEY_TOKEN;
+
+ out << YAML::BeginMap;
+ out << YAML::Key << "key" << YAML::Value << "value";
+ out << "missing key" << YAML::Value << "value";
+ out << YAML::EndMap;
+ }
+
+ void MissingValue(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::EXPECTED_VALUE_TOKEN;
+
+ out << YAML::BeginMap;
+ out << YAML::Key << "key" << "value";
+ out << YAML::EndMap;
+ }
+
+ void UnexpectedKey(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::UNEXPECTED_KEY_TOKEN;
+
+ out << YAML::BeginSeq;
+ out << YAML::Key << "hi";
+ out << YAML::EndSeq;
+ }
+
+ void UnexpectedValue(YAML::Emitter& out, std::string& desiredError)
+ {
+ desiredError = YAML::ErrorMsg::UNEXPECTED_VALUE_TOKEN;
+
+ out << YAML::BeginSeq;
+ out << YAML::Value << "hi";
+ out << YAML::EndSeq;
+ }
+ }
+}
diff --git a/yaml-reader/main.cpp b/yaml-reader/main.cpp
index 7cf8a26..d047b3f 100644
--- a/yaml-reader/main.cpp
+++ b/yaml-reader/main.cpp
@@ -1,38 +1,11 @@
-#include "yaml.h"
#include "tests.h"
-#include
-#include
-#include
-
-void run()
-{
- std::ifstream fin("tests/test.yaml");
- YAML::Parser parser(fin);
-
- while(parser)
- {
- YAML::Node doc;
- parser.GetNextDocument(doc);
- std::cout << doc;
- }
-
- // try some output
- YAML::Emitter out;
-}
int main(int argc, char **argv)
{
- bool verbose = false;
- for(int i=1;i
+
+namespace Test
+{
+ namespace Parser {
+ void SimpleScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar = "Hello, World!";
+ desiredOutput = "Hello, World!";
+ }
+
+ void MultiLineScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar =
+ "normal scalar, but\n"
+ "over several lines";
+ desiredOutput = "normal scalar, but over several lines";
+ }
+
+ void LiteralScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar =
+ "|\n"
+ " literal scalar - so we can draw ASCII:\n"
+ " \n"
+ " - -\n"
+ " | - |\n"
+ " -----\n";
+ desiredOutput =
+ "literal scalar - so we can draw ASCII:\n"
+ "\n"
+ " - -\n"
+ " | - |\n"
+ " -----\n";
+ }
+
+ void FoldedScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar =
+ ">\n"
+ " and a folded scalar... so we\n"
+ " can just keep writing various\n"
+ " things. And if we want to keep indentation:\n"
+ " \n"
+ " we just indent a little\n"
+ " see, this stays indented";
+ desiredOutput =
+ "and a folded scalar... so we"
+ " can just keep writing various"
+ " things. And if we want to keep indentation:\n"
+ "\n"
+ " we just indent a little\n"
+ " see, this stays indented";
+ }
+
+ void ChompedFoldedScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar =
+ ">-\n"
+ " Here's a folded scalar\n"
+ " that gets chomped.";
+ desiredOutput =
+ "Here's a folded scalar"
+ " that gets chomped.";
+ }
+
+ void ChompedLiteralScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar =
+ "|-\n"
+ " Here's a literal scalar\n"
+ " that gets chomped.";
+ desiredOutput =
+ "Here's a literal scalar\n"
+ "that gets chomped.";
+ }
+
+ void FoldedScalarWithIndent(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar =
+ ">2\n"
+ " Here's a folded scalar\n"
+ " that starts with some indentation.";
+ desiredOutput =
+ " Here's a folded scalar\n"
+ "that starts with some indentation.";
+ }
+
+ void ColonScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar = "::vector";
+ desiredOutput = "::vector";
+ }
+
+ void QuotedScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar = "\": - ()\"";
+ desiredOutput = ": - ()";
+ }
+
+ void CommaScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar = "Up, up, and away!";
+ desiredOutput = "Up, up, and away!";
+ }
+
+ void DashScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar = "-123";
+ desiredOutput = "-123";
+ }
+
+ void URLScalar(std::string& inputScalar, std::string& desiredOutput)
+ {
+ inputScalar = "http://example.com/foo#bar";
+ desiredOutput = "http://example.com/foo#bar";
+ }
+
+ bool SimpleSeq()
+ {
+ std::string input =
+ "- eggs\n"
+ "- bread\n"
+ "- milk";
+
+ std::stringstream stream(input);
+ YAML::Parser parser(stream);
+ YAML::Node doc;
+ parser.GetNextDocument(doc);
+
+ std::string output;
+ doc[0] >> output;
+ if(output != "eggs")
+ return false;
+ doc[1] >> output;
+ if(output != "bread")
+ return false;
+ doc[2] >> output;
+ if(output != "milk")
+ return false;
+
+ return true;
+ }
+
+ bool SimpleMap()
+ {
+ std::string input =
+ "name: Prince Fielder\n"
+ "position: 1B\n"
+ "bats: L";
+
+ std::stringstream stream(input);
+ YAML::Parser parser(stream);
+ YAML::Node doc;
+ parser.GetNextDocument(doc);
+
+ std::string output;
+ doc["name"] >> output;
+ if(output != "Prince Fielder")
+ return false;
+ doc["position"] >> output;
+ if(output != "1B")
+ return false;
+ doc["bats"] >> output;
+ if(output != "L")
+ return false;
+
+ return true;
+ }
+
+ bool FlowSeq()
+ {
+ std::string input = "[ 2 , 3, 5 , 7, 11]";
+
+ std::stringstream stream(input);
+ YAML::Parser parser(stream);
+ YAML::Node doc;
+ parser.GetNextDocument(doc);
+
+ int output;
+ doc[0] >> output;
+ if(output != 2)
+ return false;
+ doc[1] >> output;
+ if(output != 3)
+ return false;
+ doc[2] >> output;
+ if(output != 5)
+ return false;
+ doc[3] >> output;
+ if(output != 7)
+ return false;
+ doc[4] >> output;
+ if(output != 11)
+ return false;
+
+ return true;
+ }
+
+ bool FlowMap()
+ {
+ std::string input = "{hr: 65, avg: 0.278}";
+
+ std::stringstream stream(input);
+ YAML::Parser parser(stream);
+ YAML::Node doc;
+ parser.GetNextDocument(doc);
+
+ std::string output;
+ doc["hr"] >> output;
+ if(output != "65")
+ return false;
+ doc["avg"] >> output;
+ if(output != "0.278")
+ return false;
+
+ return true;
+ }
+ }
+}
diff --git a/yaml-reader/tests.cpp b/yaml-reader/tests.cpp
index 3bcb6b9..74a2dd2 100644
--- a/yaml-reader/tests.cpp
+++ b/yaml-reader/tests.cpp
@@ -7,24 +7,11 @@
namespace Test
{
- // runs all the tests on all data we have
- void RunAll(bool verbose)
+ void RunAll()
{
- std::vector files;
- files.push_back("tests/simple.yaml");
- files.push_back("tests/mixed.yaml");
- files.push_back("tests/scalars.yaml");
- files.push_back("tests/directives.yaml");
- files.push_back("tests/aliased.yaml");
-
bool passed = true;
- for(unsigned i=0;i> output;
+ } catch(const YAML::Exception& e) {
+ ok = false;
+ error = e.msg;
+ }
+ if(ok && output == desiredOutput) {
+ std::cout << "Parser test passed: " << name << "\n";
+ } else {
+ passed = false;
+ std::cout << "Parser test failed: " << name << "\n";
+ if(error != "")
+ std::cout << "Caught exception: " << error << "\n";
+ else {
+ std::cout << "Output:\n" << output << "<<<\n";
+ std::cout << "Desired output:\n" << desiredOutput << "<<<\n";
+ }
}
-
- return false;
}
- return true;
+ void RunParserTest(bool (*test)(), const std::string& name, bool& passed) {
+ std::string error;
+ bool ok = true;
+ try {
+ ok = test();
+ } catch(const YAML::Exception& e) {
+ ok = false;
+ error = e.msg;
+ }
+ if(ok) {
+ std::cout << "Parser test passed: " << name << "\n";
+ } else {
+ passed = false;
+ std::cout << "Parser test failed: " << name << "\n";
+ if(error != "")
+ std::cout << "Caught exception: " << error << "\n";
+ }
+ }
}
-
+
+ bool RunParserTests()
+ {
+ bool passed = true;
+ RunScalarParserTest(&Parser::SimpleScalar, "simple scalar", passed);
+ RunScalarParserTest(&Parser::MultiLineScalar, "multi-line scalar", passed);
+ RunScalarParserTest(&Parser::LiteralScalar, "literal scalar", passed);
+ RunScalarParserTest(&Parser::FoldedScalar, "folded scalar", passed);
+ RunScalarParserTest(&Parser::ChompedFoldedScalar, "chomped folded scalar", passed);
+ RunScalarParserTest(&Parser::ChompedLiteralScalar, "chomped literal scalar", passed);
+ RunScalarParserTest(&Parser::FoldedScalarWithIndent, "folded scalar with indent", passed);
+ RunScalarParserTest(&Parser::ColonScalar, "colon scalar", passed);
+ RunScalarParserTest(&Parser::QuotedScalar, "quoted scalar", passed);
+ RunScalarParserTest(&Parser::CommaScalar, "comma scalar", passed);
+ RunScalarParserTest(&Parser::DashScalar, "dash scalar", passed);
+ RunScalarParserTest(&Parser::URLScalar, "url scalar", passed);
+
+ RunParserTest(&Parser::SimpleSeq, "simple seq", passed);
+ RunParserTest(&Parser::SimpleMap, "simple map", passed);
+ RunParserTest(&Parser::FlowSeq, "flow seq", passed);
+ RunParserTest(&Parser::FlowMap, "flow map", passed);
+ return passed;
+ }
+
////////////////////////////////////////////////////////////////////////////////////////
// Emitter tests
namespace {
- void RunTest(void (*test)(YAML::Emitter&, std::string&), const std::string& name, bool& passed) {
+ void RunEmitterTest(void (*test)(YAML::Emitter&, std::string&), const std::string& name, bool& passed) {
YAML::Emitter out;
std::string desiredOutput;
test(out, desiredOutput);
std::string output = out.c_str();
if(output == desiredOutput) {
- std::cout << "Test passed: " << name << "\n";
+ std::cout << "Emitter test passed: " << name << "\n";
} else {
passed = false;
- std::cout << "Test failed: " << name << "\n";
+ std::cout << "Emitter test failed: " << name << "\n";
std::cout << "Output:\n";
std::cout << output << "<<<\n";
std::cout << "Desired output:\n";
@@ -111,16 +119,16 @@ namespace Test
}
}
- void RunErrorTest(void (*test)(YAML::Emitter&, std::string&), const std::string& name, bool& passed) {
+ void RunEmitterErrorTest(void (*test)(YAML::Emitter&, std::string&), const std::string& name, bool& passed) {
YAML::Emitter out;
std::string desiredError;
test(out, desiredError);
std::string lastError = out.GetLastError();
if(!out.good() && lastError == desiredError) {
- std::cout << "Test passed: " << name << "\n";
+ std::cout << "Emitter test passed: " << name << "\n";
} else {
passed = false;
- std::cout << "Test failed: " << name << "\n";
+ std::cout << "Emitter test failed: " << name << "\n";
if(out.good())
std::cout << "No error detected\n";
else
@@ -133,555 +141,47 @@ namespace Test
bool RunEmitterTests()
{
bool passed = true;
- RunTest(&Emitter::SimpleScalar, "simple scalar", passed);
- RunTest(&Emitter::SimpleSeq, "simple seq", passed);
- RunTest(&Emitter::SimpleFlowSeq, "simple flow seq", passed);
- RunTest(&Emitter::EmptyFlowSeq, "empty flow seq", passed);
- RunTest(&Emitter::NestedBlockSeq, "nested block seq", passed);
- RunTest(&Emitter::NestedFlowSeq, "nested flow seq", passed);
- RunTest(&Emitter::SimpleMap, "simple map", passed);
- RunTest(&Emitter::SimpleFlowMap, "simple flow map", passed);
- RunTest(&Emitter::MapAndList, "map and list", passed);
- RunTest(&Emitter::ListAndMap, "list and map", passed);
- RunTest(&Emitter::NestedBlockMap, "nested block map", passed);
- RunTest(&Emitter::NestedFlowMap, "nested flow map", passed);
- RunTest(&Emitter::MapListMix, "map list mix", passed);
- RunTest(&Emitter::SimpleLongKey, "simple long key", passed);
- RunTest(&Emitter::SingleLongKey, "single long key", passed);
- RunTest(&Emitter::ComplexLongKey, "complex long key", passed);
- RunTest(&Emitter::AutoLongKey, "auto long key", passed);
- RunTest(&Emitter::ScalarFormat, "scalar format", passed);
- RunTest(&Emitter::AutoLongKeyScalar, "auto long key scalar", passed);
- RunTest(&Emitter::LongKeyFlowMap, "long key flow map", passed);
- RunTest(&Emitter::BlockMapAsKey, "block map as key", passed);
- RunTest(&Emitter::AliasAndAnchor, "alias and anchor", passed);
- RunTest(&Emitter::ComplexDoc, "complex doc", passed);
- RunTest(&Emitter::STLContainers, "STL containers", passed);
- RunTest(&Emitter::SimpleComment, "simple comment", passed);
- RunTest(&Emitter::MultiLineComment, "multi-line comment", passed);
- RunTest(&Emitter::ComplexComments, "complex comments", passed);
- RunTest(&Emitter::Indentation, "indentation", passed);
- RunTest(&Emitter::SimpleGlobalSettings, "simple global settings", passed);
- RunTest(&Emitter::ComplexGlobalSettings, "complex global settings", passed);
+ RunEmitterTest(&Emitter::SimpleScalar, "simple scalar", passed);
+ RunEmitterTest(&Emitter::SimpleSeq, "simple seq", passed);
+ RunEmitterTest(&Emitter::SimpleFlowSeq, "simple flow seq", passed);
+ RunEmitterTest(&Emitter::EmptyFlowSeq, "empty flow seq", passed);
+ RunEmitterTest(&Emitter::NestedBlockSeq, "nested block seq", passed);
+ RunEmitterTest(&Emitter::NestedFlowSeq, "nested flow seq", passed);
+ RunEmitterTest(&Emitter::SimpleMap, "simple map", passed);
+ RunEmitterTest(&Emitter::SimpleFlowMap, "simple flow map", passed);
+ RunEmitterTest(&Emitter::MapAndList, "map and list", passed);
+ RunEmitterTest(&Emitter::ListAndMap, "list and map", passed);
+ RunEmitterTest(&Emitter::NestedBlockMap, "nested block map", passed);
+ RunEmitterTest(&Emitter::NestedFlowMap, "nested flow map", passed);
+ RunEmitterTest(&Emitter::MapListMix, "map list mix", passed);
+ RunEmitterTest(&Emitter::SimpleLongKey, "simple long key", passed);
+ RunEmitterTest(&Emitter::SingleLongKey, "single long key", passed);
+ RunEmitterTest(&Emitter::ComplexLongKey, "complex long key", passed);
+ RunEmitterTest(&Emitter::AutoLongKey, "auto long key", passed);
+ RunEmitterTest(&Emitter::ScalarFormat, "scalar format", passed);
+ RunEmitterTest(&Emitter::AutoLongKeyScalar, "auto long key scalar", passed);
+ RunEmitterTest(&Emitter::LongKeyFlowMap, "long key flow map", passed);
+ RunEmitterTest(&Emitter::BlockMapAsKey, "block map as key", passed);
+ RunEmitterTest(&Emitter::AliasAndAnchor, "alias and anchor", passed);
+ RunEmitterTest(&Emitter::ComplexDoc, "complex doc", passed);
+ RunEmitterTest(&Emitter::STLContainers, "STL containers", passed);
+ RunEmitterTest(&Emitter::SimpleComment, "simple comment", passed);
+ RunEmitterTest(&Emitter::MultiLineComment, "multi-line comment", passed);
+ RunEmitterTest(&Emitter::ComplexComments, "complex comments", passed);
+ RunEmitterTest(&Emitter::Indentation, "indentation", passed);
+ RunEmitterTest(&Emitter::SimpleGlobalSettings, "simple global settings", passed);
+ RunEmitterTest(&Emitter::ComplexGlobalSettings, "complex global settings", passed);
- RunErrorTest(&Emitter::ExtraEndSeq, "extra EndSeq", passed);
- RunErrorTest(&Emitter::ExtraEndMap, "extra EndMap", passed);
- RunErrorTest(&Emitter::BadSingleQuoted, "bad single quoted string", passed);
- RunErrorTest(&Emitter::InvalidAnchor, "invalid anchor", passed);
- RunErrorTest(&Emitter::InvalidAlias, "invalid alias", passed);
- RunErrorTest(&Emitter::MissingKey, "missing key", passed);
- RunErrorTest(&Emitter::MissingValue, "missing value", passed);
- RunErrorTest(&Emitter::UnexpectedKey, "unexpected key", passed);
- RunErrorTest(&Emitter::UnexpectedValue, "unexpected value", passed);
+ RunEmitterErrorTest(&Emitter::ExtraEndSeq, "extra EndSeq", passed);
+ RunEmitterErrorTest(&Emitter::ExtraEndMap, "extra EndMap", passed);
+ RunEmitterErrorTest(&Emitter::BadSingleQuoted, "bad single quoted string", passed);
+ RunEmitterErrorTest(&Emitter::InvalidAnchor, "invalid anchor", passed);
+ RunEmitterErrorTest(&Emitter::InvalidAlias, "invalid alias", passed);
+ RunEmitterErrorTest(&Emitter::MissingKey, "missing key", passed);
+ RunEmitterErrorTest(&Emitter::MissingValue, "missing value", passed);
+ RunEmitterErrorTest(&Emitter::UnexpectedKey, "unexpected key", passed);
+ RunEmitterErrorTest(&Emitter::UnexpectedValue, "unexpected value", passed);
return passed;
}
- namespace Emitter {
- ////////////////////////////////////////////////////////////////////////////////////////////////////////
- // correct emitting
-
- void SimpleScalar(YAML::Emitter& out, std::string& desiredOutput) {
- out << "Hello, World!";
- desiredOutput = "Hello, World!";
- }
-
- void SimpleSeq(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginSeq;
- out << "eggs";
- out << "bread";
- out << "milk";
- out << YAML::EndSeq;
-
- desiredOutput = "- eggs\n- bread\n- milk";
- }
-
- void SimpleFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::Flow;
- out << YAML::BeginSeq;
- out << "Larry";
- out << "Curly";
- out << "Moe";
- out << YAML::EndSeq;
-
- desiredOutput = "[Larry, Curly, Moe]";
- }
-
- void EmptyFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::Flow;
- out << YAML::BeginSeq;
- out << YAML::EndSeq;
-
- desiredOutput = "[]";
- }
-
- void NestedBlockSeq(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginSeq;
- out << "item 1";
- out << YAML::BeginSeq << "subitem 1" << "subitem 2" << YAML::EndSeq;
- out << YAML::EndSeq;
-
- desiredOutput = "- item 1\n-\n - subitem 1\n - subitem 2";
- }
-
- void NestedFlowSeq(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginSeq;
- out << "one";
- out << YAML::Flow << YAML::BeginSeq << "two" << "three" << YAML::EndSeq;
- out << YAML::EndSeq;
-
- desiredOutput = "- one\n- [two, three]";
- }
-
- void SimpleMap(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginMap;
- out << YAML::Key << "name";
- out << YAML::Value << "Ryan Braun";
- out << YAML::Key << "position";
- out << YAML::Value << "3B";
- out << YAML::EndMap;
-
- desiredOutput = "name: Ryan Braun\nposition: 3B";
- }
-
- void SimpleFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::Flow;
- out << YAML::BeginMap;
- out << YAML::Key << "shape";
- out << YAML::Value << "square";
- out << YAML::Key << "color";
- out << YAML::Value << "blue";
- out << YAML::EndMap;
-
- desiredOutput = "{shape: square, color: blue}";
- }
-
- void MapAndList(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginMap;
- out << YAML::Key << "name";
- out << YAML::Value << "Barack Obama";
- out << YAML::Key << "children";
- out << YAML::Value << YAML::BeginSeq << "Sasha" << "Malia" << YAML::EndSeq;
- out << YAML::EndMap;
-
- desiredOutput = "name: Barack Obama\nchildren:\n - Sasha\n - Malia";
- }
-
- void ListAndMap(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginSeq;
- out << "item 1";
- out << YAML::BeginMap;
- out << YAML::Key << "pens" << YAML::Value << 8;
- out << YAML::Key << "pencils" << YAML::Value << 14;
- out << YAML::EndMap;
- out << "item 2";
- out << YAML::EndSeq;
-
- desiredOutput = "- item 1\n-\n pens: 8\n pencils: 14\n- item 2";
- }
-
- void NestedBlockMap(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginMap;
- out << YAML::Key << "name";
- out << YAML::Value << "Fred";
- out << YAML::Key << "grades";
- out << YAML::Value;
- out << YAML::BeginMap;
- out << YAML::Key << "algebra" << YAML::Value << "A";
- out << YAML::Key << "physics" << YAML::Value << "C+";
- out << YAML::Key << "literature" << YAML::Value << "B";
- out << YAML::EndMap;
- out << YAML::EndMap;
-
- desiredOutput = "name: Fred\ngrades:\n algebra: A\n physics: C+\n literature: B";
- }
-
- void NestedFlowMap(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::Flow;
- out << YAML::BeginMap;
- out << YAML::Key << "name";
- out << YAML::Value << "Fred";
- out << YAML::Key << "grades";
- out << YAML::Value;
- out << YAML::BeginMap;
- out << YAML::Key << "algebra" << YAML::Value << "A";
- out << YAML::Key << "physics" << YAML::Value << "C+";
- out << YAML::Key << "literature" << YAML::Value << "B";
- out << YAML::EndMap;
- out << YAML::EndMap;
-
- desiredOutput = "{name: Fred, grades: {algebra: A, physics: C+, literature: B}}";
- }
-
- void MapListMix(YAML::Emitter& out, std::string& desiredOutput) {
- out << YAML::BeginMap;
- out << YAML::Key << "name";
- out << YAML::Value << "Bob";
- out << YAML::Key << "position";
- out << YAML::Value;
- out << YAML::Flow << YAML::BeginSeq << 2 << 4 << YAML::EndSeq;
- out << YAML::Key << "invincible" << YAML::Value << YAML::OnOffBool << false;
- out << YAML::EndMap;
-
- desiredOutput = "name: Bob\nposition: [2, 4]\ninvincible: off";
- }
-
- void SimpleLongKey(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::LongKey;
- out << YAML::BeginMap;
- out << YAML::Key << "height";
- out << YAML::Value << "5'9\"";
- out << YAML::Key << "weight";
- out << YAML::Value << 145;
- out << YAML::EndMap;
-
- desiredOutput = "? height\n: 5'9\"\n? weight\n: 145";
- }
-
- void SingleLongKey(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginMap;
- out << YAML::Key << "age";
- out << YAML::Value << "24";
- out << YAML::LongKey << YAML::Key << "height";
- out << YAML::Value << "5'9\"";
- out << YAML::Key << "weight";
- out << YAML::Value << 145;
- out << YAML::EndMap;
-
- desiredOutput = "age: 24\n? height\n: 5'9\"\nweight: 145";
- }
-
- void ComplexLongKey(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::LongKey;
- out << YAML::BeginMap;
- out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
- out << YAML::Value << "monster";
- out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
- out << YAML::Value << "demon";
- out << YAML::EndMap;
-
- desiredOutput = "?\n - 1\n - 3\n: monster\n? [2, 0]\n: demon";
- }
-
- void AutoLongKey(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginMap;
- out << YAML::Key << YAML::BeginSeq << 1 << 3 << YAML::EndSeq;
- out << YAML::Value << "monster";
- out << YAML::Key << YAML::Flow << YAML::BeginSeq << 2 << 0 << YAML::EndSeq;
- out << YAML::Value << "demon";
- out << YAML::Key << "the origin";
- out << YAML::Value << "angel";
- out << YAML::EndMap;
-
- desiredOutput = "?\n - 1\n - 3\n: monster\n? [2, 0]\n: demon\nthe origin: angel";
- }
-
- void ScalarFormat(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginSeq;
- out << "simple scalar";
- out << YAML::SingleQuoted << "explicit single-quoted scalar";
- out << YAML::DoubleQuoted << "explicit double-quoted scalar";
- out << "auto-detected\ndouble-quoted scalar";
- out << "a non-\"auto-detected\" double-quoted scalar";
- out << YAML::Literal << "literal scalar\nthat may span\nmany, many\nlines and have \"whatever\" crazy\tsymbols that we like";
- out << YAML::EndSeq;
-
- desiredOutput = "- simple scalar\n- 'explicit single-quoted scalar'\n- \"explicit double-quoted scalar\"\n- \"auto-detected\\xadouble-quoted scalar\"\n- a non-\"auto-detected\" double-quoted scalar\n- |\n literal scalar\n that may span\n many, many\n lines and have \"whatever\" crazy\tsymbols that we like";
- }
-
- void AutoLongKeyScalar(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginMap;
- out << YAML::Key << YAML::Literal << "multi-line\nscalar";
- out << YAML::Value << "and its value";
- out << YAML::EndMap;
-
- desiredOutput = "? |\n multi-line\n scalar\n: and its value";
- }
-
- void LongKeyFlowMap(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::Flow;
- out << YAML::BeginMap;
- out << YAML::Key << "simple key";
- out << YAML::Value << "and value";
- out << YAML::LongKey << YAML::Key << "long key";
- out << YAML::Value << "and its value";
- out << YAML::EndMap;
-
- desiredOutput = "{simple key: and value, ? long key: and its value}";
- }
-
- void BlockMapAsKey(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginMap;
- out << YAML::Key;
- out << YAML::BeginMap;
- out << YAML::Key << "key" << YAML::Value << "value";
- out << YAML::Key << "next key" << YAML::Value << "next value";
- out << YAML::EndMap;
- out << YAML::Value;
- out << "total value";
- out << YAML::EndMap;
-
- desiredOutput = "?\n key: value\n next key: next value\n: total value";
- }
-
- void AliasAndAnchor(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginSeq;
- out << YAML::Anchor("fred");
- out << YAML::BeginMap;
- out << YAML::Key << "name" << YAML::Value << "Fred";
- out << YAML::Key << "age" << YAML::Value << 42;
- out << YAML::EndMap;
- out << YAML::Alias("fred");
- out << YAML::EndSeq;
-
- desiredOutput = "- &fred\n name: Fred\n age: 42\n- *fred";
- }
-
- void ComplexDoc(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginMap;
- out << YAML::Key << "receipt";
- out << YAML::Value << "Oz-Ware Purchase Invoice";
- out << YAML::Key << "date";
- out << YAML::Value << "2007-08-06";
- out << YAML::Key << "customer";
- out << YAML::Value;
- out << YAML::BeginMap;
- out << YAML::Key << "given";
- out << YAML::Value << "Dorothy";
- out << YAML::Key << "family";
- out << YAML::Value << "Gale";
- out << YAML::EndMap;
- out << YAML::Key << "items";
- out << YAML::Value;
- out << YAML::BeginSeq;
- out << YAML::BeginMap;
- out << YAML::Key << "part_no";
- out << YAML::Value << "A4786";
- out << YAML::Key << "descrip";
- out << YAML::Value << "Water Bucket (Filled)";
- out << YAML::Key << "price";
- out << YAML::Value << 1.47;
- out << YAML::Key << "quantity";
- out << YAML::Value << 4;
- out << YAML::EndMap;
- out << YAML::BeginMap;
- out << YAML::Key << "part_no";
- out << YAML::Value << "E1628";
- out << YAML::Key << "descrip";
- out << YAML::Value << "High Heeled \"Ruby\" Slippers";
- out << YAML::Key << "price";
- out << YAML::Value << 100.27;
- out << YAML::Key << "quantity";
- out << YAML::Value << 1;
- out << YAML::EndMap;
- out << YAML::EndSeq;
- out << YAML::Key << "bill-to";
- out << YAML::Value << YAML::Anchor("id001");
- out << YAML::BeginMap;
- out << YAML::Key << "street";
- out << YAML::Value << YAML::Literal << "123 Tornado Alley\nSuite 16";
- out << YAML::Key << "city";
- out << YAML::Value << "East Westville";
- out << YAML::Key << "state";
- out << YAML::Value << "KS";
- out << YAML::EndMap;
- out << YAML::Key << "ship-to";
- out << YAML::Value << YAML::Alias("id001");
- out << YAML::EndMap;
-
- desiredOutput = "receipt: Oz-Ware Purchase Invoice\ndate: 2007-08-06\ncustomer:\n given: Dorothy\n family: Gale\nitems:\n -\n part_no: A4786\n descrip: Water Bucket (Filled)\n price: 1.47\n quantity: 4\n -\n part_no: E1628\n descrip: High Heeled \"Ruby\" Slippers\n price: 100.27\n quantity: 1\nbill-to: &id001\n street: |\n 123 Tornado Alley\n Suite 16\n city: East Westville\n state: KS\nship-to: *id001";
- }
-
- void STLContainers(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginSeq;
- std::vector primes;
- primes.push_back(2);
- primes.push_back(3);
- primes.push_back(5);
- primes.push_back(7);
- primes.push_back(11);
- primes.push_back(13);
- out << YAML::Flow << primes;
- std::map ages;
- ages["Daniel"] = 26;
- ages["Jesse"] = 24;
- out << ages;
- out << YAML::EndSeq;
-
- desiredOutput = "- [2, 3, 5, 7, 11, 13]\n-\n Daniel: 26\n Jesse: 24";
- }
-
- void SimpleComment(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginMap;
- out << YAML::Key << "method";
- out << YAML::Value << "least squares" << YAML::Comment("should we change this method?");
- out << YAML::EndMap;
-
- desiredOutput = "method: least squares # should we change this method?";
- }
-
- void MultiLineComment(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginSeq;
- out << "item 1" << YAML::Comment("really really long\ncomment that couldn't possibly\nfit on one line");
- out << "item 2";
- out << YAML::EndSeq;
-
- desiredOutput = "- item 1 # really really long\n # comment that couldn't possibly\n # fit on one line\n- item 2";
- }
-
- void ComplexComments(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginMap;
- out << YAML::LongKey << YAML::Key << "long key" << YAML::Comment("long key");
- out << YAML::Value << "value";
- out << YAML::EndMap;
-
- desiredOutput = "? long key # long key\n: value";
- }
-
- void Indentation(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::Indent(4);
- out << YAML::BeginSeq;
- out << YAML::BeginMap;
- out << YAML::Key << "key 1" << YAML::Value << "value 1";
- out << YAML::Key << "key 2" << YAML::Value << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
- out << YAML::EndMap;
- out << YAML::EndSeq;
-
- desiredOutput = "-\n key 1: value 1\n key 2:\n - a\n - b\n - c";
- }
-
- void SimpleGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
- {
- out.SetIndent(4);
- out.SetMapFormat(YAML::LongKey);
-
- out << YAML::BeginSeq;
- out << YAML::BeginMap;
- out << YAML::Key << "key 1" << YAML::Value << "value 1";
- out << YAML::Key << "key 2" << YAML::Value << YAML::Flow << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
- out << YAML::EndMap;
- out << YAML::EndSeq;
-
- desiredOutput = "-\n ? key 1\n : value 1\n ? key 2\n : [a, b, c]";
- }
-
- void ComplexGlobalSettings(YAML::Emitter& out, std::string& desiredOutput)
- {
- out << YAML::BeginSeq;
- out << YAML::Block;
- out << YAML::BeginMap;
- out << YAML::Key << "key 1" << YAML::Value << "value 1";
- out << YAML::Key << "key 2" << YAML::Value;
- out.SetSeqFormat(YAML::Flow);
- out << YAML::BeginSeq << "a" << "b" << "c" << YAML::EndSeq;
- out << YAML::EndMap;
- out << YAML::BeginMap;
- out << YAML::Key << YAML::BeginSeq << 1 << 2 << YAML::EndSeq;
- out << YAML::Value << YAML::BeginMap << YAML::Key << "a" << YAML::Value << "b" << YAML::EndMap;
- out << YAML::EndMap;
- out << YAML::EndSeq;
-
- desiredOutput = "-\n key 1: value 1\n key 2: [a, b, c]\n-\n ? [1, 2]\n :\n a: b";
- }
-
- ////////////////////////////////////////////////////////////////////////////////////////////////////////
- // incorrect emitting
-
- void ExtraEndSeq(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::UNEXPECTED_END_SEQ;
-
- out << YAML::BeginSeq;
- out << "Hello";
- out << "World";
- out << YAML::EndSeq;
- out << YAML::EndSeq;
- }
-
- void ExtraEndMap(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::UNEXPECTED_END_MAP;
-
- out << YAML::BeginMap;
- out << YAML::Key << "Hello" << YAML::Value << "World";
- out << YAML::EndMap;
- out << YAML::EndMap;
- }
-
- void BadSingleQuoted(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::SINGLE_QUOTED_CHAR;
-
- out << YAML::SingleQuoted << "Hello\nWorld";
- }
-
- void InvalidAnchor(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::INVALID_ANCHOR;
-
- out << YAML::BeginSeq;
- out << YAML::Anchor("new\nline") << "Test";
- out << YAML::EndSeq;
- }
-
- void InvalidAlias(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::INVALID_ALIAS;
-
- out << YAML::BeginSeq;
- out << YAML::Alias("new\nline");
- out << YAML::EndSeq;
- }
-
- void MissingKey(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::EXPECTED_KEY_TOKEN;
-
- out << YAML::BeginMap;
- out << YAML::Key << "key" << YAML::Value << "value";
- out << "missing key" << YAML::Value << "value";
- out << YAML::EndMap;
- }
-
- void MissingValue(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::EXPECTED_VALUE_TOKEN;
-
- out << YAML::BeginMap;
- out << YAML::Key << "key" << "value";
- out << YAML::EndMap;
- }
-
- void UnexpectedKey(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::UNEXPECTED_KEY_TOKEN;
-
- out << YAML::BeginSeq;
- out << YAML::Key << "hi";
- out << YAML::EndSeq;
- }
-
- void UnexpectedValue(YAML::Emitter& out, std::string& desiredError)
- {
- desiredError = YAML::ErrorMsg::UNEXPECTED_VALUE_TOKEN;
-
- out << YAML::BeginSeq;
- out << YAML::Value << "hi";
- out << YAML::EndSeq;
- }
- }
}
diff --git a/yaml-reader/tests.h b/yaml-reader/tests.h
index a062a09..fb33c24 100644
--- a/yaml-reader/tests.h
+++ b/yaml-reader/tests.h
@@ -3,10 +3,32 @@
namespace YAML { class Emitter; }
namespace Test {
- void RunAll(bool verbose);
- bool Inout(const std::string& file, bool verbose);
+ void RunAll();
+ bool RunParserTests();
bool RunEmitterTests();
+
+ namespace Parser {
+ // scalar tests
+ void SimpleScalar(std::string& inputScalar, std::string& desiredOutput);
+ void MultiLineScalar(std::string& inputScalar, std::string& desiredOutput);
+ void LiteralScalar(std::string& inputScalar, std::string& desiredOutput);
+ void FoldedScalar(std::string& inputScalar, std::string& desiredOutput);
+ void ChompedFoldedScalar(std::string& inputScalar, std::string& desiredOutput);
+ void ChompedLiteralScalar(std::string& inputScalar, std::string& desiredOutput);
+ void FoldedScalarWithIndent(std::string& inputScalar, std::string& desiredOutput);
+ void ColonScalar(std::string& inputScalar, std::string& desiredOutput);
+ void QuotedScalar(std::string& inputScalar, std::string& desiredOutput);
+ void CommaScalar(std::string& inputScalar, std::string& desiredOutput);
+ void DashScalar(std::string& inputScalar, std::string& desiredOutput);
+ void URLScalar(std::string& inputScalar, std::string& desiredOutput);
+
+ // misc tests
+ bool SimpleSeq();
+ bool SimpleMap();
+ bool FlowSeq();
+ bool FlowMap();
+ }
namespace Emitter {
// correct emitting
diff --git a/yaml-reader/tests/directives.yaml b/yaml-reader/tests/directives.yaml
deleted file mode 100644
index 5e81cdd..0000000
--- a/yaml-reader/tests/directives.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-%YAML 1.2
-%TAG ! !howdy
----
-- basic node
-- ! yeah baby
diff --git a/yaml-reader/tests/mixed.yaml b/yaml-reader/tests/mixed.yaml
deleted file mode 100644
index 68cbf4a..0000000
--- a/yaml-reader/tests/mixed.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-- the main thing is a sequence
-- here's a key: value
- and another: value
-- let's inline: [1, 2, 3]
- and an inline map: {key: value, 243: 101}
-- and multiple indents:
- - here's
- - a
- - list
- and another:
- - list
- - of
- - things
-- maybe now:
- let's: get
- pretty:
- deep: here
- in:
- the: nesting
- just: to
- confuse:
- the: heck
- out:
- - of
- - the: parser
- if:
- - we
- - can
- - do: that
- what: do
- you: think?
-
\ No newline at end of file
diff --git a/yaml-reader/tests/scalars.yaml b/yaml-reader/tests/scalars.yaml
deleted file mode 100644
index 65f9a06..0000000
--- a/yaml-reader/tests/scalars.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-- normal scalar, but
- over several lines
-- |
- literal scalar - so we can draw ASCII:
-
- - -
- | - |
- ------
-- >
- and a folded scalar... so we
- can just keep writing various
- things. And if we want to keep indentation:
-
- we just indent a little
- see, this stays indented
-- >-
- Here's a folded scalar
- that gets chomped.
-- |-
- And here's a literal scalar
- that gets chomped.
-- >2
- Here's a folded scalar
- that starts with some indentation.
-- ::vector
-- ": - ()"
-- Up, up, and away!
-- -123
-- http://example.com/foo#bar
-# Inside flow collection:
-- [ ::vector,
- ": - ()",
- "Up, up and away!",
- -123,
- http://example.com/foo#bar ]
\ No newline at end of file
diff --git a/yaml-reader/tests/simple.yaml b/yaml-reader/tests/simple.yaml
deleted file mode 100644
index 69d4239..0000000
--- a/yaml-reader/tests/simple.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
----
-just a scalar
----
-and another scalar
----
-now an end document
-...
----
-and now two
-...
-...
----
-and that's it
\ No newline at end of file
diff --git a/yaml-reader/tests/test.yaml b/yaml-reader/tests/test.yaml
deleted file mode 100644
index c914749..0000000
--- a/yaml-reader/tests/test.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-- true
-- false
-- y
-- n
\ No newline at end of file