redsnow 0.3.1 → 0.3.2

data/ext/snowcrash/test/test-SectionParser.cc

@@ -0,0 +1,81 @@
+//
+//  test-SectionParser.cc
+//  snowcrash
+//
+//  Created by Zdenek Nemec on 6/20/14.
+//  Copyright (c) 2014 Apiary Inc. All rights reserved.
+//
+
+#include "snowcrashtest.h"
+#include "SectionParser.h"
+
+using namespace snowcrash;
+using namespace snowcrashtest;
+
+const mdp::ByteBuffer HeaderSectionFixture = \
+"# Signature\n"\
+"\n"\
+"Lorem Ipsum\n";
+
+const mdp::ByteBuffer ListSectionFixture = \
+"+ Signature\n"\
+"\n"\
+"    Lorem Ipsum\n";
+
+TEST_CASE("Header adapter with header section", "[adapter]")
+{
+    mdp::MarkdownParser markdownParser;
+    mdp::MarkdownNode markdownAST;
+    markdownParser.parse(HeaderSectionFixture, markdownAST);
+
+    REQUIRE(!markdownAST.children().empty());
+
+    REQUIRE_NOTHROW(HeaderSectionAdapter::startingNode(markdownAST.children().begin()));
+    MarkdownNodeIterator it = HeaderSectionAdapter::startingNode(markdownAST.children().begin());
+    REQUIRE(it->text == "Signature");
+
+    const MarkdownNodes& collection = HeaderSectionAdapter::startingNodeSiblings(it, markdownAST.children());
+    REQUIRE(collection.size() == 2);
+
+    REQUIRE(HeaderSectionAdapter::nextStartingNode(markdownAST.children().begin(), markdownAST.children(), it)->text == "Signature");
+}
+
+TEST_CASE("Header adapter with list section", "[adapter]")
+{
+    mdp::MarkdownParser markdownParser;
+    mdp::MarkdownNode markdownAST;
+    markdownParser.parse(ListSectionFixture, markdownAST);
+
+    REQUIRE(!markdownAST.children().empty());
+
+    REQUIRE_THROWS_AS(HeaderSectionAdapter::startingNode(markdownAST.children().begin()), std::logic_error);
+}
+
+TEST_CASE("List adapter with List section", "[adapter]")
+{
+    mdp::MarkdownParser markdownParser;
+    mdp::MarkdownNode markdownAST;
+    markdownParser.parse(ListSectionFixture, markdownAST);
+
+    REQUIRE(!markdownAST.children().empty());
+
+    REQUIRE_NOTHROW(ListSectionAdapter::startingNode(markdownAST.children().begin()));
+    MarkdownNodeIterator it = ListSectionAdapter::startingNode(markdownAST.children().begin());
+    REQUIRE(it->text == "Signature");
+
+    MarkdownNodes collection = ListSectionAdapter::startingNodeSiblings(markdownAST.children().begin(), markdownAST.children());
+    REQUIRE(collection.size() == 2);
+
+    REQUIRE(ListSectionAdapter::nextStartingNode(markdownAST.children().begin(), markdownAST.children(), it) == markdownAST.children().end());
+}
+
+TEST_CASE("List adapter with Header section", "[adapter]")
+{
+    mdp::MarkdownParser markdownParser;
+    mdp::MarkdownNode markdownAST;
+    markdownParser.parse(HeaderSectionFixture, markdownAST);
+
+    REQUIRE(!markdownAST.children().empty());
+
+    REQUIRE_THROWS_AS(ListSectionAdapter::startingNode(markdownAST.children().begin()), std::logic_error);
+}

data/ext/snowcrash/test/test-StringUtility.cc

@@ -0,0 +1,65 @@
+//
+//  test/test-StringUtils.cc
+//  snowcrash
+//
+//  Created by Jiri Kratochvil on 10/15/14.
+//  Copyright (c) 2014 Apiary Inc. All rights reserved.
+//
+
+#include "snowcrashtest.h"
+#include "StringUtility.h"
+#include "BlueprintUtility.h"
+
+using namespace snowcrash;
+using namespace snowcrashtest;
+
+TEST_CASE("templates for compare equality", "[utility]")
+{
+    SECTION("testing equality on same types") {
+        REQUIRE(IsEqual()(1,1));
+        REQUIRE_FALSE(IsEqual()(1,2));
+
+        REQUIRE(IsEqual()('a','a'));
+        REQUIRE_FALSE(IsEqual()('a','A'));
+    }
+
+    SECTION("testing case insensitive equality on same types") {
+
+        REQUIRE(IsIEqual()('a','a'));
+        REQUIRE(IsIEqual()('a','A'));
+        REQUIRE(IsIEqual()('A','a'));
+        REQUIRE(IsIEqual()('A','A'));
+
+        REQUIRE_FALSE(IsIEqual()('a','b'));
+    }
+
+    SECTION("both version should not throw while testing diferent types") {
+        REQUIRE_NOTHROW(IsEqual()('a',1)); // allow compare diferent types - not throw
+        REQUIRE_NOTHROW(IsIEqual()('a',1)); // allow compare diferent types - not throw
+    }
+
+}
+
+TEST_CASE("container comparation", "[utility]"){
+
+    REQUIRE(MatchContainers(std::string("abc"), std::string("abc"), IsEqual()));
+
+    REQUIRE_FALSE(MatchContainers(std::string("ABC"), std::string("abc"), IsEqual()));
+
+    REQUIRE(MatchContainers(std::string("abc"), std::string("abc"), IsIEqual()));
+    REQUIRE(MatchContainers(std::string("abc"), std::string("ABC"), IsIEqual()));
+
+    REQUIRE_FALSE(MatchContainers(std::string("def"), std::string("ABC"), IsIEqual()));
+}
+
+TEST_CASE("comapare string", "[utility]"){
+
+    REQUIRE(Equal<std::string>()(std::string("abc"), std::string("abc")));
+    REQUIRE_FALSE(Equal<std::string>()(std::string("abcd"), std::string("abc")));
+
+    REQUIRE(IEqual<std::string>()(std::string("abc"), std::string("ABC")));
+    REQUIRE(IEqual<std::string>()(std::string("ABC"), std::string("ABC")));
+    REQUIRE_FALSE(IEqual<std::string>()(std::string("abcd"), std::string("abc")));
+
+}
+

data/ext/snowcrash/test/test-SymbolIdentifier.cc

@@ -0,0 +1,53 @@
+//
+//  test-SymbolIdentifier.cc
+//  snowcrash
+//
+//  Created by Zdenek Nemec on 2/7/14.
+//  Copyright (c) 2014 Apiary Inc. All rights reserved.
+//
+
+#include "snowcrash.h"
+#include "snowcrashtest.h"
+
+using namespace snowcrash;
+using namespace snowcrashtest;
+
+TEST_CASE("Punctuation in identifiers", "[symbol_identifier]")
+{
+    mdp::ByteBuffer source = "# Parcel's sticker @#!$%^&*=-?><,.~`\"' [/]\n";
+
+    ParseResult<Blueprint> blueprint;
+    parse(source, 0, blueprint);
+
+    REQUIRE(blueprint.report.error.code == Error::OK);
+    REQUIRE(blueprint.report.warnings.empty());
+
+    REQUIRE(blueprint.node.resourceGroups.size() == 1);
+    REQUIRE(blueprint.node.resourceGroups[0].resources.size() == 1);
+    REQUIRE(blueprint.node.resourceGroups[0].resources[0].name == "Parcel's sticker @#!$%^&*=-?><,.~`\"'");
+    REQUIRE(blueprint.node.resourceGroups[0].resources[0].uriTemplate == "/");
+    REQUIRE(blueprint.node.resourceGroups[0].resources[0].actions.empty());
+}
+
+TEST_CASE("Non ASCII characters in identifiers", "[symbol_identifier]")
+{
+    // Blueprint in question:
+    //R"(
+    //# Kategorii [/]
+    //");
+
+    // "Kategorii in Russian"
+    mdp::ByteBuffer source = "# \xD0\x9A\xD0\xB0\xD1\x82\xD0\xB5\xD0\xB3\xD0\xBE\xD1\x80\xD0\xB8\xD0\xB8 [/]\n";
+
+    ParseResult<Blueprint> blueprint;
+    parse(source, 0, blueprint);
+
+    REQUIRE(blueprint.report.error.code == Error::OK);
+    REQUIRE(blueprint.report.warnings.empty());
+
+    REQUIRE(blueprint.node.resourceGroups.size() == 1);
+    REQUIRE(blueprint.node.resourceGroups[0].resources.size() == 1);
+    REQUIRE(blueprint.node.resourceGroups[0].resources[0].name == "\xD0\x9A\xD0\xB0\xD1\x82\xD0\xB5\xD0\xB3\xD0\xBE\xD1\x80\xD0\xB8\xD0\xB8");
+    REQUIRE(blueprint.node.resourceGroups[0].resources[0].uriTemplate == "/");
+    REQUIRE(blueprint.node.resourceGroups[0].resources[0].actions.empty());
+}

data/ext/snowcrash/test/test-SymbolTable.cc

@@ -0,0 +1,31 @@
+//
+//  test-SymbolTable.cc
+//  snowcrash
+//
+//  Created by Zdenek Nemec on 6/9/13.
+//  Copyright (c) 2013 Apiary Inc. All rights reserved.
+//
+
+#include "snowcrash.h"
+#include "snowcrashtest.h"
+#include "ResourceParser.h"
+
+using namespace snowcrash;
+using namespace snowcrashtest;
+
+TEST_CASE("Parse object resource symbol", "[symbol_table]")
+{
+    mdp::ByteBuffer source = \
+    "# /resource\n"\
+    "+ Super Model (text/plain)\n\n"\
+    "          {...}\n";
+
+    // Check we will get error parsing the same symbol again with the same symbol table
+    Symbols symbols;
+    SymbolHelper::buildSymbol("Super", symbols);
+
+    ParseResult<Resource> resource;
+    SectionParserHelper<Resource, ResourceParser>::parse(source, ModelBodySectionType, resource, 0, symbols);
+
+    REQUIRE(resource.report.error.code != Error::OK);
+}

data/ext/snowcrash/test/test-UriTemplateParser.cc

@@ -0,0 +1,333 @@
+//
+//  test-UriParser.c
+//  snowcrash
+//
+//  Created by Carl Griffiths on 24/02/14.
+//  Copyright (c) 2014 Apiary Inc. All rights reserved.
+//
+
+#include "catch.hpp"
+#include "UriTemplateParser.h"
+
+using namespace snowcrash;
+
+TEST_CASE("Parse a valid uri into seperate parts", "[validuriparser][issue][#79]")
+{
+
+    const snowcrash::URI uri ="http://www.test.com/other/{id}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+    REQUIRE(result.scheme == "http");
+    REQUIRE(result.host == "www.test.com");
+    REQUIRE(result.path == "/other/{id}");
+    REQUIRE(result.report.warnings.size() == 0);
+}
+
+TEST_CASE("Parse an invalid uri into seperate parts", "[invaliduriparser][issue][#79]")
+{
+
+    const snowcrash::URI uri = "http://www.test.com/other/{id}[2]";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+    REQUIRE(result.scheme == "http");
+    REQUIRE(result.host == "www.test.com");
+    REQUIRE(result.path == "/other/{id}[2]");
+    REQUIRE(result.report.warnings.size() == 1);
+}
+
+TEST_CASE("Parse uri template for invalid format curly brackets (nested brackets)", "[invalidcurlybracketparsingnested][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{id{}}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+}
+
+TEST_CASE("Parse uri template for invalid format curly brackets (missing end bracket)", "[invalidcurlybracketparsingmissingendbracket][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{id";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+}
+
+TEST_CASE("Parse uri template for supported level one variable expansion", "[supportedlevelonevariableexpansionexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{id}/{test}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 0);
+
+}
+
+TEST_CASE("Parse uri template for supported variables with % encoding and explode modifier", "[supportedpercentencodedvariablesandexplodemodifier][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{id}/{?test%20one,test%20two*}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 0);
+
+}
+
+TEST_CASE("Parse uri template for invalid % encoding", "[invalidpercentencoding][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{id}/{?test%20one,test%2Ztwo}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+
+}
+
+TEST_CASE("Parse uri template for invalid expansion", "[invalidexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{@id}/{|test}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 2);
+
+}
+
+
+TEST_CASE("Parse uri template for supported level two fragment expansion", "[supportedleveltwofragmentexpansionexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/path{id}{#var}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 0);
+
+}
+
+TEST_CASE("Parse uri template for supported level three form style query string expansion", "[supportedlevelthreeformstylequeryexpansionexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/path{?varone,vartwo}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 0);
+
+}
+
+TEST_CASE("Parse uri template for supported level three reserved expansion", "[supportedlevelthreeformstylequeryexpansionexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/path{+varone}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 0);
+
+}
+
+TEST_CASE("Parse uri template for unsupported level three label expansion", "[unsupportedlevelthreelabelexpansionexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/path{.varone}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+
+}
+
+TEST_CASE("Parse uri template for unsupported level three path segment expansion", "[unsupportedlevelthreepathsegmentexpansionexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/path{/varone}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+
+}
+
+TEST_CASE("Parse uri template for unsupported level three path style parameter expansion", "[unsupportedlevelthreepathstyleparameterexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/path{;varone,vartwo}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+
+}
+
+TEST_CASE("Parse uri template for supported level three form style query continuation expansion", "[supportedlevelthreeformstylequerycontinuationexpression][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{id}?path=test{&varone,vartwo}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 0);
+
+}
+
+TEST_CASE("Parse uri template for invalid variable name, contains spaces", "[invalidvariablenamecontainingspaces][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/path{?varone, vartwo}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+    REQUIRE(result.report.warnings[0].message == "URI template expression \"?varone, vartwo\" contains spaces. Allowed characters for expressions are A-Z a-z 0-9 _ and percent encoded characters");
+
+}
+
+TEST_CASE("Parse uri template for invalid variable name, contains hyphens", "[invalidvariablenamecontainingshyphens][issue][#78]")
+{
+    const snowcrash::URI uri = "http://www.test.com/{id}{?var-one,var-two}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+    REQUIRE(result.report.warnings[0].message == "URI template expression \"?var-one,var-two\" contains hyphens. Allowed characters for expressions are A-Z a-z 0-9 _ and percent encoded characters");
+
+}
+
+TEST_CASE("Parse uri template for invalid variable name, contains assignment", "[invalidvariablenamecontainingsassignment][issue][#78]")
+{
+    const snowcrash::URITemplate uri = "http://www.test.com/{id}{?varone=vartwo}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+    REQUIRE(result.report.warnings[0].message == "URI template expression \"?varone=vartwo\" contains assignment. Allowed characters for expressions are A-Z a-z 0-9 _ and percent encoded characters");
+
+}
+
+TEST_CASE("Parse uri template for invalid variable name, invalid % encoded", "[invalidvariablenamecontainingsbadpctencoding][issue][#78]")
+{
+    const snowcrash::URITemplate uri = "http://www.test.com/{id}{?varone%2z}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+    REQUIRE(result.report.warnings[0].message == "URI template expression \"?varone%2z\" contains invalid characters. Allowed characters for expressions are A-Z a-z 0-9 _ and percent encoded characters");
+
+}
+
+TEST_CASE("Parse uri template for variable name containing dot", "[validvariablenamecontainingdot][issue][#78]")
+{
+    const snowcrash::URITemplate uri = "http://www.test.com/{id}{?varone.data}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 0);
+}
+
+TEST_CASE("Parse uri template for invalid variable name containing multiple contiguous dots", "[invalidvariablenamecontiguousdots][issue][#78]")
+{
+    const snowcrash::URITemplate uri = "http://www.test.com/{id}{?varone..data}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(uri, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+}
+
+TEST_CASE("Parse uri template for consistent invalid character warning", "[invalidexpressionconsistentinvalidcharacterwarning][issue][#78]")
+{
+    const snowcrash::URITemplate urione = "http://www.test.com/{$a,b,c}";
+    const snowcrash::URITemplate uritwo = "http://www.test.com/{@a,b,c}";
+
+    URITemplateParser parser;
+    ParsedURITemplate result;
+    ParsedURITemplate result2;
+    mdp::CharactersRangeSet sourceBlock;
+
+    parser.parse(urione, sourceBlock, result);
+
+    REQUIRE(result.report.warnings.size() == 1);
+    REQUIRE(result.report.warnings[0].message == "URI template expression \"$a,b,c\" contains invalid characters. Allowed characters for expressions are A-Z a-z 0-9 _ and percent encoded characters");
+
+    parser.parse(urione, sourceBlock, result2);
+
+    REQUIRE(result2.report.warnings.size() == 1);
+    REQUIRE(result2.report.warnings[0].message == "URI template expression \"$a,b,c\" contains invalid characters. Allowed characters for expressions are A-Z a-z 0-9 _ and percent encoded characters");
+
+}