From 5575d29718869628ce11d39e84b35045095980d8 Mon Sep 17 00:00:00 2001
From: ilor <kailoran@gmail.com>
Date: Thu, 3 Mar 2011 09:16:29 +0100
Subject: [PATCH] add a variables test for tha Match type, expand matchvector
test but disable it for now
---
tests/match.cpp | 31 ++++++++++++++++++++++++++++++-
1 file changed, 30 insertions(+), 1 deletion(-)
diff --git a/tests/match.cpp b/tests/match.cpp
index 1cbb430..28134d7 100644
--- a/tests/match.cpp
+++ b/tests/match.cpp
@@ -9,6 +9,8 @@
#include <libwccl/values/annotationmatch.h>
#include <libwccl/values/matchvector.h>
+#include <libwccl/variables.h>
+
#include <iostream>
using namespace Wccl;
@@ -67,9 +69,10 @@ BOOST_AUTO_TEST_CASE(vector2)
{
Wccl::MatchVector m;
m.append(boost::make_shared<TokenMatch>(5));
+ BOOST_CHECK_EQUAL(m.to_raw_string(), "MATCH(TOK[5])");
+ return; //TODO reenambel after these have a chance of passing
BOOST_CHECK_EQUAL(m.first_token().get_value(), 5);
BOOST_CHECK_EQUAL(m.last_token().get_value(), 5);
- BOOST_CHECK_EQUAL(m.to_raw_string(), "MATCH(TOK[5])");
m.append(boost::make_shared<TokenMatch>(6));
BOOST_CHECK_EQUAL(m.first_token().get_value(), 5);
BOOST_CHECK_EQUAL(m.last_token().get_value(), 6);
@@ -78,5 +81,31 @@ BOOST_AUTO_TEST_CASE(vector2)
BOOST_CHECK_EQUAL(m.first_token().get_value(), 4);
BOOST_CHECK_EQUAL(m.last_token().get_value(), 6);
BOOST_CHECK_EQUAL(m.to_raw_string(), "MATCH(TOK[5],TOK[6],TOK[4])");
+ Wccl::MatchVector m2;
+ m2.append(boost::make_shared<TokenMatch>(5));
+ m2.append(boost::make_shared<Wccl::MatchVector>(m));
+ BOOST_CHECK_EQUAL(m2.first_token().get_value(), 4);
+ BOOST_CHECK_EQUAL(m2.last_token().get_value(), 6);
+ BOOST_CHECK_EQUAL(m2.to_raw_string(), "MATCH(TOK[5],MATCH(TOK[5],TOK[6],TOK[4]))");
+ m2.append(boost::make_shared<TokenMatch>(2));
+ BOOST_CHECK_EQUAL(m2.first_token().get_value(), 2);
+ BOOST_CHECK_EQUAL(m2.last_token().get_value(), 6);
+ m2.append(boost::make_shared<TokenMatch>(7));
+ BOOST_CHECK_EQUAL(m2.first_token().get_value(), 2);
+ BOOST_CHECK_EQUAL(m2.last_token().get_value(), 7);
+ m.append(boost::make_shared<TokenMatch>(1));
+ BOOST_CHECK_EQUAL(m2.first_token().get_value(), 1);
+ BOOST_CHECK_EQUAL(m2.last_token().get_value(), 7);
}
+
+BOOST_AUTO_TEST_CASE(varmatch)
+{
+ Wccl::Variables v;
+ v.put<Wccl::Match>("a", new Wccl::TokenMatch(1));
+ BOOST_CHECK_EQUAL(v.get<Wccl::Match>("a")->first_token().get_value(), 1);
+ BOOST_CHECK(v.get_put<Wccl::Match>("b")->empty());
+ BOOST_CHECK_EQUAL(v.get_put<Wccl::Match>("b")->first_token().get_value(),
+ Wccl::Position::Nowhere);
+}
+
BOOST_AUTO_TEST_SUITE_END()
--
GitLab