summaryrefslogtreecommitdiffstats
path: root/test/src
diff options
context:
space:
mode:
authorStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-03-30 16:08:37 (GMT)
committerStefan Radomski <radomski@tk.informatik.tu-darmstadt.de>2013-03-30 16:08:37 (GMT)
commit28014abf13ca64031b8b84dcf585ec4569881ab0 (patch)
tree9680223cdbd3adde5bd80d18f1b29ea3a0990e4f /test/src
parent2317f2bf8beb03c60463a9482dbef23540f5c1e0 (diff)
downloaduscxml-28014abf13ca64031b8b84dcf585ec4569881ab0.zip
uscxml-28014abf13ca64031b8b84dcf585ec4569881ab0.tar.gz
uscxml-28014abf13ca64031b8b84dcf585ec4569881ab0.tar.bz2
Various bug fixes
- Removed scxml-test-framework related file - Array operator with V8NodeList - _event.data as DOM if content is XML
Diffstat (limited to 'test/src')
-rw-r--r--test/src/scxml-test-framework-client.cpp4
-rw-r--r--test/src/test-predicates.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/test/src/scxml-test-framework-client.cpp b/test/src/scxml-test-framework-client.cpp
index fefe3d9..73df8ce 100644
--- a/test/src/scxml-test-framework-client.cpp
+++ b/test/src/scxml-test-framework-client.cpp
@@ -112,7 +112,7 @@ public:
// return;
std::cout << "---- received:" << std::endl;
- evhttp_request_own(request.curlReq);
+// evhttp_request_own(request.curlReq);
std::cout << request.data.compound.at("content").atom << std::endl;
uscxml::Data jsonReq = uscxml::Data::fromJSON(request.data.compound.at("content").atom);
@@ -142,8 +142,8 @@ public:
assert(_interpreters.find(token) == _interpreters.end());
interpreter->setName(token);
interpreter->addMonitor(this);
- interpreter->start();
_interpreters[token] = std::make_pair(interpreter, request);
+ interpreter->start();
}
return;
}
diff --git a/test/src/test-predicates.cpp b/test/src/test-predicates.cpp
index 0149d93..08aa3e1 100644
--- a/test/src/test-predicates.cpp
+++ b/test/src/test-predicates.cpp
@@ -30,8 +30,8 @@ int main(int argc, char** argv) {
assert(Interpreter::isParallel(parallelState));
assert(!Interpreter::isCompound(parallelState)); // parallel states are not compound!
- Node<std::string> initialState = interpreter->getInitialState();
- assert(initialState == atomicState);
+ NodeSet<std::string> initialState = interpreter->getInitialStates();
+ assert(initialState[0] == atomicState);
NodeSet<std::string> childs = interpreter->getChildStates(compoundState);
Node<std::string> compundChild1 = interpreter->getState("compundChild1");