diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-22 07:40:35 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-05-22 07:40:35 (GMT) |
| commit | 1e66bfd04f864a040b1e4a68f0db0f55f15b91a3 (patch) | |
| tree | c254dc899d79e0fc6962ef2d2d5dfc26de1a6766 /test | |
| parent | f9a620340ddce2a17fd775d1e210268cac13377b (diff) | |
| download | uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.zip uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.tar.gz uscxml-1e66bfd04f864a040b1e4a68f0db0f55f15b91a3.tar.bz2 | |
Builds with MSVC again
Diffstat (limited to 'test')
| -rw-r--r-- | test/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | test/src/test-arabica-namespaces.cpp | 4 | ||||
| -rw-r--r-- | test/src/test-lifecycle.cpp | 2 | ||||
| -rw-r--r-- | test/src/test-stress.cpp | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 49169fc..f28633e 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -57,17 +57,17 @@ if (OFF) set_target_properties(test-dirmon PROPERTIES FOLDER "Tests") endif() -add_executable(test-arabica-namespaces src/test-arabica-namespaces.cpp) -target_link_libraries(test-arabica-namespaces uscxml) -add_test(test-arabica-namespaces ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-namespaces ${CMAKE_SOURCE_DIR}/test) -set_target_properties(test-arabica-namespaces PROPERTIES FOLDER "Tests") - add_executable(test-lifecycle src/test-lifecycle.cpp) target_link_libraries(test-lifecycle uscxml) add_test(test-lifecycle ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-namespaces) set_target_properties(test-lifecycle PROPERTIES FOLDER "Tests") if (NOT WIN32) + add_executable(test-arabica-namespaces src/test-arabica-namespaces.cpp) + target_link_libraries(test-arabica-namespaces uscxml) + add_test(test-arabica-namespaces ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-namespaces ${CMAKE_SOURCE_DIR}/test) + set_target_properties(test-arabica-namespaces PROPERTIES FOLDER "Tests") + add_executable(test-arabica-events src/test-arabica-events.cpp) target_link_libraries(test-arabica-events uscxml) add_test(test-arabica-events ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-arabica-events ${CMAKE_SOURCE_DIR}/test/uscxml/arabica/test-arabica-events.xml) diff --git a/test/src/test-arabica-namespaces.cpp b/test/src/test-arabica-namespaces.cpp index aa7a5b4..bc3e62f 100644 --- a/test/src/test-arabica-namespaces.cpp +++ b/test/src/test-arabica-namespaces.cpp @@ -25,8 +25,8 @@ parsed = cloneDocument(parsed);\ insertBaz(parsed);\ std::cout << parsed.first << std::endl;\ validateRootFooBarBaz(parsed);\ -assert(Interpreter::filterChildElements(origNS.xmlNSPrefix + "bar", origDoc.getDocumentElement()).size() == 3);\ -assert(Interpreter::filterChildElements(origNS.xmlNSPrefix + "baz", origDoc.getDocumentElement()).size() == 0); +assert(InterpreterImpl::filterChildElements(origNS.xmlNSPrefix + "bar", origDoc.getDocumentElement()).size() == 3);\ +assert(InterpreterImpl::filterChildElements(origNS.xmlNSPrefix + "baz", origDoc.getDocumentElement()).size() == 0); /** diff --git a/test/src/test-lifecycle.cpp b/test/src/test-lifecycle.cpp index 682e796..09341a3 100644 --- a/test/src/test-lifecycle.cpp +++ b/test/src/test-lifecycle.cpp @@ -100,7 +100,7 @@ int main(int argc, char** argv) { google::InitGoogleLogging(argv[0]); google::LogToStderr(); - Interpreter interpreter = Interpreter::fromURI("/Users/sradomski/Documents/TK/Code/uscxml/test/w3c/ecma/test530.scxml"); + Interpreter interpreter = Interpreter::fromURI("/Users/sradomski/Documents/TK/Code/uscxml/test/w3c/ecma/test207.scxml"); InterpreterState state; do { state = interpreter.step(true); diff --git a/test/src/test-stress.cpp b/test/src/test-stress.cpp index fd36b0a..6cce172 100644 --- a/test/src/test-stress.cpp +++ b/test/src/test-stress.cpp @@ -144,7 +144,7 @@ int main(int argc, char** argv) { } } -#if 1 +#if 0 while(true) { Interpreter interpreter = Interpreter::fromURI("/Users/sradomski/Documents/TK/Code/uscxml/test/w3c/ecma/test235.scxml"); interpreter.interpret(); |