See detailled log

Added new revised W3C tests
Hide Interpreter via PIMPL
Implemented SCXMLIOProcessor

1 files changed, 19 insertions, 20 deletions

diff --git a/test/src/test-predicates.cpp b/test/src/test-predicates.cpp
index 58faffb..954afb2 100644
--- a/test/src/test-predicates.cpp
+++ b/test/src/test-predicates.cpp
@@ -12,31 +12,30 @@ int main(int argc, char** argv) {
 	using namespace Arabica::DOM;
 	using namespace Arabica::XPath;
 
-	Interpreter* interpreter = Interpreter::fromURI(argv[1]);
-	interpreter->init();
+	Interpreter interpreter = Interpreter::fromURI(argv[1]);
 	assert(interpreter);
 
-	Node<std::string> atomicState = interpreter->getState("atomic");
+	Node<std::string> atomicState = interpreter.getState("atomic");
 	assert(Interpreter::isAtomic(atomicState));
 	assert(!Interpreter::isParallel(atomicState));
 	assert(!Interpreter::isCompound(atomicState));
 
-	Node<std::string> compoundState = interpreter->getState("compound");
+	Node<std::string> compoundState = interpreter.getState("compound");
 	assert(!Interpreter::isAtomic(compoundState));
 	assert(!Interpreter::isParallel(compoundState));
 	assert(Interpreter::isCompound(compoundState));
 
-	Node<std::string> parallelState = interpreter->getState("parallel");
+	Node<std::string> parallelState = interpreter.getState("parallel");
 	assert(!Interpreter::isAtomic(parallelState));
 	assert(Interpreter::isParallel(parallelState));
 	assert(!Interpreter::isCompound(parallelState)); // parallel states are not compound!
 
-	NodeSet<std::string> initialState = interpreter->getInitialStates();
+	NodeSet<std::string> initialState = interpreter.getInitialStates();
 	assert(initialState[0] == atomicState);
 
-	NodeSet<std::string> childs = interpreter->getChildStates(compoundState);
-	Node<std::string> compundChild1 = interpreter->getState("compundChild1");
-	Node<std::string> compundChild2 = interpreter->getState("compundChild2");
+	NodeSet<std::string> childs = interpreter.getChildStates(compoundState);
+	Node<std::string> compundChild1 = interpreter.getState("compundChild1");
+	Node<std::string> compundChild2 = interpreter.getState("compundChild2");
 	assert(childs.size() > 0);
 	assert(Interpreter::isMember(compundChild1, childs));
 	assert(Interpreter::isMember(compundChild2, childs));
@@ -46,17 +45,17 @@ int main(int argc, char** argv) {
 
 	std::string transEvents;
 	transEvents = "error";
-	assert(Interpreter::nameMatch(transEvents, "error"));
-	assert(!Interpreter::nameMatch(transEvents, "foo"));
+	assert(InterpreterImpl::nameMatch(transEvents, "error"));
+	assert(!InterpreterImpl::nameMatch(transEvents, "foo"));
 
 	transEvents = "error foo";
-	assert(Interpreter::nameMatch(transEvents, "error"));
-	assert(Interpreter::nameMatch(transEvents, "error.send"));
-	assert(Interpreter::nameMatch(transEvents, "error.send.failed"));
-	assert(Interpreter::nameMatch(transEvents, "foo"));
-	assert(Interpreter::nameMatch(transEvents, "foo.bar"));
-	assert(!Interpreter::nameMatch(transEvents, "errors.my.custom"));
-	assert(!Interpreter::nameMatch(transEvents, "errorhandler.mistake"));
-	assert(!Interpreter::nameMatch(transEvents, "errOr.send"));
-	assert(!Interpreter::nameMatch(transEvents, "foobar"));
+	assert(InterpreterImpl::nameMatch(transEvents, "error"));
+	assert(InterpreterImpl::nameMatch(transEvents, "error.send"));
+	assert(InterpreterImpl::nameMatch(transEvents, "error.send.failed"));
+	assert(InterpreterImpl::nameMatch(transEvents, "foo"));
+	assert(InterpreterImpl::nameMatch(transEvents, "foo.bar"));
+	assert(!InterpreterImpl::nameMatch(transEvents, "errors.my.custom"));
+	assert(!InterpreterImpl::nameMatch(transEvents, "errorhandler.mistake"));
+	assert(!InterpreterImpl::nameMatch(transEvents, "errOr.send"));
+	assert(!InterpreterImpl::nameMatch(transEvents, "foobar"));
 }
\ No newline at end of file