From 50174e88cd7ccbaa455bc40bd214ae494378a7cc Mon Sep 17 00:00:00 2001 From: Stefan Radomski Date: Thu, 3 Jul 2014 23:21:24 +0200 Subject: Removed w3c ecma tests from xpath and vice versa --- README.md | 12 -- docs/BUILDING.md | 2 +- test/CMakeLists.txt | 6 +- test/src/test-lifecycle.cpp | 102 ---------------- test/src/test-predicates.cpp | 248 ++++++++++++++++++++------------------ test/uscxml/test-predicates.scxml | 9 -- test/w3c/confEcma.xsl | 2 +- test/w3c/convert-tests.sh | 5 +- test/w3c/ecma/test252.scxml | 4 +- test/w3c/ecma/test463.scxml | 17 --- test/w3c/ecma/test464.scxml | 16 --- test/w3c/ecma/test465.scxml | 22 ---- test/w3c/ecma/test466.scxml | 14 --- test/w3c/ecma/test467.scxml | 12 -- test/w3c/ecma/test468.scxml | 23 ---- test/w3c/ecma/test469.scxml | 25 ---- test/w3c/ecma/test470.scxml | 24 ---- test/w3c/ecma/test473.scxml | 37 ------ test/w3c/ecma/test474.scxml | 36 ------ test/w3c/ecma/test475.scxml | 36 ------ test/w3c/ecma/test476.scxml | 36 ------ test/w3c/ecma/test477.scxml | 36 ------ test/w3c/ecma/test478.scxml | 36 ------ test/w3c/ecma/test479.scxml | 36 ------ test/w3c/ecma/test480.scxml | 32 ----- test/w3c/ecma/test481.scxml | 37 ------ test/w3c/ecma/test482.scxml | 16 --- test/w3c/ecma/test483.scxml | 27 ----- test/w3c/ecma/test537.scxml | 17 --- test/w3c/ecma/test539.scxml | 26 ---- test/w3c/ecma/test540.scxml | 21 ---- test/w3c/ecma/test542.scxml | 34 ------ test/w3c/ecma/test543.scxml | 18 --- test/w3c/ecma/test544.scxml | 17 --- test/w3c/ecma/test545.scxml | 17 --- test/w3c/ecma/test546.scxml | 17 --- test/w3c/ecma/test547.scxml | 33 ----- test/w3c/ecma/test553.scxml | 2 +- test/w3c/ecma/test555.scxml | 27 ----- test/w3c/ecma/test568.scxml | 15 --- test/w3c/txml/test252.txml | 4 +- test/w3c/update-txml.sh | 2 +- test/w3c/xpath/test252.scxml | 4 +- test/w3c/xpath/test444.scxml | 16 --- test/w3c/xpath/test445.scxml | 16 --- test/w3c/xpath/test446.scxml | 21 ---- test/w3c/xpath/test448.scxml | 31 ----- test/w3c/xpath/test449.scxml | 11 -- test/w3c/xpath/test451.scxml | 18 --- test/w3c/xpath/test452.scxml | 24 ---- test/w3c/xpath/test453.scxml | 19 --- test/w3c/xpath/test456.scxml | 19 --- test/w3c/xpath/test457.scxml | 59 --------- test/w3c/xpath/test459.scxml | 35 ------ test/w3c/xpath/test460.scxml | 24 ---- test/w3c/xpath/test557.scxml | 26 ---- test/w3c/xpath/test558.scxml | 24 ---- test/w3c/xpath/test560.scxml | 19 --- test/w3c/xpath/test561.scxml | 24 ---- test/w3c/xpath/test562.scxml | 22 ---- test/w3c/xpath/test569.scxml | 15 --- test/w3c/xpath/test578.scxml | 19 --- 62 files changed, 149 insertions(+), 1455 deletions(-) delete mode 100644 test/uscxml/test-predicates.scxml delete mode 100644 test/w3c/ecma/test463.scxml delete mode 100644 test/w3c/ecma/test464.scxml delete mode 100644 test/w3c/ecma/test465.scxml delete mode 100644 test/w3c/ecma/test466.scxml delete mode 100644 test/w3c/ecma/test467.scxml delete mode 100644 test/w3c/ecma/test468.scxml delete mode 100644 test/w3c/ecma/test469.scxml delete mode 100644 test/w3c/ecma/test470.scxml delete mode 100644 test/w3c/ecma/test473.scxml delete mode 100644 test/w3c/ecma/test474.scxml delete mode 100644 test/w3c/ecma/test475.scxml delete mode 100644 test/w3c/ecma/test476.scxml delete mode 100644 test/w3c/ecma/test477.scxml delete mode 100644 test/w3c/ecma/test478.scxml delete mode 100644 test/w3c/ecma/test479.scxml delete mode 100644 test/w3c/ecma/test480.scxml delete mode 100644 test/w3c/ecma/test481.scxml delete mode 100644 test/w3c/ecma/test482.scxml delete mode 100644 test/w3c/ecma/test483.scxml delete mode 100644 test/w3c/ecma/test537.scxml delete mode 100644 test/w3c/ecma/test539.scxml delete mode 100644 test/w3c/ecma/test540.scxml delete mode 100644 test/w3c/ecma/test542.scxml delete mode 100644 test/w3c/ecma/test543.scxml delete mode 100644 test/w3c/ecma/test544.scxml delete mode 100644 test/w3c/ecma/test545.scxml delete mode 100644 test/w3c/ecma/test546.scxml delete mode 100644 test/w3c/ecma/test547.scxml delete mode 100644 test/w3c/ecma/test555.scxml delete mode 100644 test/w3c/ecma/test568.scxml delete mode 100644 test/w3c/xpath/test444.scxml delete mode 100644 test/w3c/xpath/test445.scxml delete mode 100644 test/w3c/xpath/test446.scxml delete mode 100644 test/w3c/xpath/test448.scxml delete mode 100644 test/w3c/xpath/test449.scxml delete mode 100644 test/w3c/xpath/test451.scxml delete mode 100644 test/w3c/xpath/test452.scxml delete mode 100644 test/w3c/xpath/test453.scxml delete mode 100644 test/w3c/xpath/test456.scxml delete mode 100644 test/w3c/xpath/test457.scxml delete mode 100644 test/w3c/xpath/test459.scxml delete mode 100644 test/w3c/xpath/test460.scxml delete mode 100644 test/w3c/xpath/test557.scxml delete mode 100644 test/w3c/xpath/test558.scxml delete mode 100644 test/w3c/xpath/test560.scxml delete mode 100644 test/w3c/xpath/test561.scxml delete mode 100644 test/w3c/xpath/test562.scxml delete mode 100644 test/w3c/xpath/test569.scxml delete mode 100644 test/w3c/xpath/test578.scxml diff --git a/README.md b/README.md index f0a9ea2..0296163 100644 --- a/README.md +++ b/README.md @@ -47,18 +47,6 @@ uSCXML still fails the following ecmascript tests: - - - - - - - - - - - - diff --git a/docs/BUILDING.md b/docs/BUILDING.md index fb87943..3db0be2 100644 --- a/docs/BUILDING.md +++ b/docs/BUILDING.md @@ -324,7 +324,7 @@ If we find one of those binaries (and SWIG obviously), we will enable the langua Again, if you used plain Makefiles, you will get everything you need via: $ make && make csharp - $ $ find lib -type f -iname *csharp* + $ find lib -type f -iname *csharp* lib/csharp/libuscxmlNativeCSharp.so lib/uscxmlCSharp.dll diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index 01cd07c..7a610a6 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -54,7 +54,7 @@ endif() 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) +add_test(test-lifecycle ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-lifecycle) set_target_properties(test-lifecycle PROPERTIES FOLDER "Tests") if (NOT WIN32) @@ -116,8 +116,8 @@ set_target_properties(test-url PROPERTIES FOLDER "Tests") add_executable(test-cmdline-parsing src/test-cmdline-parsing.cpp) target_link_libraries(test-cmdline-parsing uscxml) -add_test(test-cmdline-parsing ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-cmdline-parsing) -set_target_properties(test-cmdline-parsing PROPERTIES FOLDER "Tests") +# add_test(test-cmdline-parsing ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/test-cmdline-parsing) +# set_target_properties(test-cmdline-parsing PROPERTIES FOLDER "Tests") # add_executable(test-initial-config src/test-initial-config.cpp) # target_link_libraries(test-initial-config uscxml) diff --git a/test/src/test-lifecycle.cpp b/test/src/test-lifecycle.cpp index 7cbb68b..22c724a 100644 --- a/test/src/test-lifecycle.cpp +++ b/test/src/test-lifecycle.cpp @@ -410,108 +410,6 @@ int main(int argc, char** argv) { assert(interpreter.step() == USCXML_MICROSTEPPED); assert(interpreter.step() == USCXML_FINISHED); } - -#if 0 - - - if (0) { - // macrostep in between - const char* xml = - "" - " " - " " - " " - " " - " " - " " - " " - " " - " " - " " - ""; - - Interpreter interpreter = Interpreter::fromXML(xml); - - assert(interpreter.getState() == uscxml::InterpreterState::USCXML_INSTANTIATED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_IDLE); - assert(interpreter.step(true) == uscxml::InterpreterState::USCXML_MACROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_MICROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_FINISHED); - interpreter.reset(); - assert(interpreter.getState() == uscxml::InterpreterState::USCXML_INSTANTIATED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_IDLE); - assert(interpreter.step(true) == uscxml::InterpreterState::USCXML_MACROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_MICROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_FINISHED); - } - - if (1) { - // macrostep in between, external event - const char* xml = - "" - " " - " " - " " - " " - " " - " " - " " - ""; - - Interpreter interpreter = Interpreter::fromXML(xml); - - assert(interpreter.getState() == uscxml::InterpreterState::USCXML_INSTANTIATED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_IDLE); - interpreter.receive(Event("continue")); - assert(interpreter.step(true) == uscxml::InterpreterState::USCXML_MACROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_MICROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_FINISHED); - interpreter.reset(); - assert(interpreter.getState() == uscxml::InterpreterState::USCXML_INSTANTIATED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_IDLE); - interpreter.receive(Event("continue")); - assert(interpreter.step(true) == uscxml::InterpreterState::USCXML_MACROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_MICROSTEPPED); - assert(interpreter.step() == uscxml::InterpreterState::USCXML_FINISHED); - } - - if (1) { - // macrostep in between, external event - const char* xml = - "" - " " - " " - " " - " " - " " - " " - " " - ""; - - Interpreter interpreter = Interpreter::fromXML(xml); - interpreter.start(); - // assume interpreter is started - assert(interpreter.getState() & InterpreterState::USCXML_THREAD_STARTED); - tthread::this_thread::sleep_for(tthread::chrono::milliseconds(100)); - - // assume it is started and running - std::cout << interpreter.getState() << std::endl; - - assert(interpreter.getState() & InterpreterState::USCXML_THREAD_STARTED); - assert(interpreter.getState() & InterpreterState::USCXML_THREAD_RUNNING); - assert(interpreter.getState() & InterpreterState::USCXML_IDLE); - - interpreter.receive(Event("continue")); - tthread::this_thread::sleep_for(tthread::chrono::milliseconds(200)); - - std::cout << interpreter.getState() << std::endl; - int state = interpreter.getState(); - assert(state & InterpreterState::USCXML_FINISHED); - assert(!(state & InterpreterState::USCXML_THREAD_STARTED)); - assert(!(state & InterpreterState::USCXML_THREAD_RUNNING)); - - } -#endif } return EXIT_SUCCESS; } \ No newline at end of file diff --git a/test/src/test-predicates.cpp b/test/src/test-predicates.cpp index 3e3c278..d672577 100644 --- a/test/src/test-predicates.cpp +++ b/test/src/test-predicates.cpp @@ -1,123 +1,139 @@ #define protected public #include "uscxml/Interpreter.h" #undef protected +#include int main(int argc, char** argv) { - if (argc != 2) { - std::cerr << "Expected path to test-predicates.scxml" << std::endl; - exit(EXIT_FAILURE); + try { + using namespace uscxml; + using namespace Arabica::DOM; + using namespace Arabica::XPath; + + const char* xml = + "" + " " + " " + " " + " " + " " + " " + " " + ""; + + Interpreter interpreter = Interpreter::fromXML(xml); + assert(interpreter); + interpreter.getImpl()->init(); + + Node atomicState = interpreter.getImpl()->getState("atomic"); + assert(InterpreterImpl::isAtomic(atomicState)); + assert(!InterpreterImpl::isParallel(atomicState)); + assert(!InterpreterImpl::isCompound(atomicState)); + + Node compoundState = interpreter.getImpl()->getState("compound"); + assert(!InterpreterImpl::isAtomic(compoundState)); + assert(!InterpreterImpl::isParallel(compoundState)); + assert(InterpreterImpl::isCompound(compoundState)); + + Node parallelState = interpreter.getImpl()->getState("parallel"); + assert(!InterpreterImpl::isAtomic(parallelState)); + assert(InterpreterImpl::isParallel(parallelState)); + assert(!InterpreterImpl::isCompound(parallelState)); // parallel states are not compound! + + NodeSet initialState = interpreter.getImpl()->getInitialStates(); + assert(initialState[0] == atomicState); + + NodeSet childs = interpreter.getImpl()->getChildStates(compoundState); + Node compoundChild1 = interpreter.getImpl()->getState("compoundChild1"); + Node compoundChild2 = interpreter.getImpl()->getState("compoundChild2"); + assert(childs.size() > 0); + assert(InterpreterImpl::isMember(compoundChild1, childs)); + assert(InterpreterImpl::isMember(compoundChild2, childs)); + assert(!InterpreterImpl::isMember(compoundState, childs)); + + assert(InterpreterImpl::isDescendant(compoundChild1, compoundState)); + + { + std::string idrefs("id1"); + std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); + assert(tokenizedIdrefs.size() == 1); + assert(tokenizedIdrefs.front().compare("id1") == 0); + } + + { + std::string idrefs(" id1"); + std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); + assert(tokenizedIdrefs.size() == 1); + assert(tokenizedIdrefs.front().compare("id1") == 0); + } + + { + std::string idrefs(" id1 "); + std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); + assert(tokenizedIdrefs.size() == 1); + assert(tokenizedIdrefs.front().compare("id1") == 0); + } + + { + std::string idrefs(" \tid1\n "); + std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); + assert(tokenizedIdrefs.size() == 1); + assert(tokenizedIdrefs.front().compare("id1") == 0); + } + + { + std::string idrefs("id1 id2 id3"); + std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); + assert(tokenizedIdrefs.size() == 3); + assert(tokenizedIdrefs.front().compare("id1") == 0); + tokenizedIdrefs.pop_front(); + assert(tokenizedIdrefs.front().compare("id2") == 0); + tokenizedIdrefs.pop_front(); + assert(tokenizedIdrefs.front().compare("id3") == 0); + } + + { + std::string idrefs("\t id1 \nid2\n\n id3\t"); + std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); + assert(tokenizedIdrefs.size() == 3); + assert(tokenizedIdrefs.front().compare("id1") == 0); + tokenizedIdrefs.pop_front(); + assert(tokenizedIdrefs.front().compare("id2") == 0); + tokenizedIdrefs.pop_front(); + assert(tokenizedIdrefs.front().compare("id3") == 0); + } + + { + std::string idrefs("id1 \nid2 \tid3"); + std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); + assert(tokenizedIdrefs.size() == 3); + assert(tokenizedIdrefs.front().compare("id1") == 0); + tokenizedIdrefs.pop_front(); + assert(tokenizedIdrefs.front().compare("id2") == 0); + tokenizedIdrefs.pop_front(); + assert(tokenizedIdrefs.front().compare("id3") == 0); + } + + std::string transEvents; + transEvents = "error"; + assert(InterpreterImpl::nameMatch(transEvents, "error")); + assert(!InterpreterImpl::nameMatch(transEvents, "foo")); + + transEvents = "error foo"; + 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")); + // is the event name case sensitive? + // assert(!InterpreterImpl::nameMatch(transEvents, "errOr.send")); + assert(!InterpreterImpl::nameMatch(transEvents, "foobar")); + } catch(std::exception e) { + std::cout << e.what(); + return false; + } catch(uscxml::Event e) { + std::cout << e; + return false; } - - using namespace uscxml; - using namespace Arabica::DOM; - using namespace Arabica::XPath; - - Interpreter interpreter = Interpreter::fromURI(argv[1]); - assert(interpreter); - - Node atomicState = interpreter.getImpl()->getState("atomic"); - assert(InterpreterImpl::isAtomic(atomicState)); - assert(!InterpreterImpl::isParallel(atomicState)); - assert(!InterpreterImpl::isCompound(atomicState)); - - Node compoundState = interpreter.getImpl()->getState("compound"); - assert(!InterpreterImpl::isAtomic(compoundState)); - assert(!InterpreterImpl::isParallel(compoundState)); - assert(InterpreterImpl::isCompound(compoundState)); - - Node parallelState = interpreter.getImpl()->getState("parallel"); - assert(!InterpreterImpl::isAtomic(parallelState)); - assert(InterpreterImpl::isParallel(parallelState)); - assert(!InterpreterImpl::isCompound(parallelState)); // parallel states are not compound! - - NodeSet initialState = interpreter.getImpl()->getInitialStates(); - assert(initialState[0] == atomicState); - - NodeSet childs = interpreter.getImpl()->getChildStates(compoundState); - Node compoundChild1 = interpreter.getImpl()->getState("compoundChild1"); - Node compoundChild2 = interpreter.getImpl()->getState("compoundChild2"); - assert(childs.size() > 0); - assert(InterpreterImpl::isMember(compoundChild1, childs)); - assert(InterpreterImpl::isMember(compoundChild2, childs)); - assert(!InterpreterImpl::isMember(compoundState, childs)); - - assert(InterpreterImpl::isDescendant(compoundChild1, compoundState)); - - { - std::string idrefs("id1"); - std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); - assert(tokenizedIdrefs.size() == 1); - assert(tokenizedIdrefs.front().compare("id1") == 0); - } - - { - std::string idrefs(" id1"); - std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); - assert(tokenizedIdrefs.size() == 1); - assert(tokenizedIdrefs.front().compare("id1") == 0); - } - - { - std::string idrefs(" id1 "); - std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); - assert(tokenizedIdrefs.size() == 1); - assert(tokenizedIdrefs.front().compare("id1") == 0); - } - - { - std::string idrefs(" \tid1\n "); - std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); - assert(tokenizedIdrefs.size() == 1); - assert(tokenizedIdrefs.front().compare("id1") == 0); - } - - { - std::string idrefs("id1 id2 id3"); - std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); - assert(tokenizedIdrefs.size() == 3); - assert(tokenizedIdrefs.front().compare("id1") == 0); - tokenizedIdrefs.pop_front(); - assert(tokenizedIdrefs.front().compare("id2") == 0); - tokenizedIdrefs.pop_front(); - assert(tokenizedIdrefs.front().compare("id3") == 0); - } - - { - std::string idrefs("\t id1 \nid2\n\n id3\t"); - std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); - assert(tokenizedIdrefs.size() == 3); - assert(tokenizedIdrefs.front().compare("id1") == 0); - tokenizedIdrefs.pop_front(); - assert(tokenizedIdrefs.front().compare("id2") == 0); - tokenizedIdrefs.pop_front(); - assert(tokenizedIdrefs.front().compare("id3") == 0); - } - - { - std::string idrefs("id1 \nid2 \tid3"); - std::list tokenizedIdrefs = InterpreterImpl::tokenizeIdRefs(idrefs); - assert(tokenizedIdrefs.size() == 3); - assert(tokenizedIdrefs.front().compare("id1") == 0); - tokenizedIdrefs.pop_front(); - assert(tokenizedIdrefs.front().compare("id2") == 0); - tokenizedIdrefs.pop_front(); - assert(tokenizedIdrefs.front().compare("id3") == 0); - } - - std::string transEvents; - transEvents = "error"; - assert(InterpreterImpl::nameMatch(transEvents, "error")); - assert(!InterpreterImpl::nameMatch(transEvents, "foo")); - - transEvents = "error foo"; - 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")); - // is the event name case sensitive? - // assert(!InterpreterImpl::nameMatch(transEvents, "errOr.send")); - assert(!InterpreterImpl::nameMatch(transEvents, "foobar")); } \ No newline at end of file diff --git a/test/uscxml/test-predicates.scxml b/test/uscxml/test-predicates.scxml deleted file mode 100644 index 88e05cc..0000000 --- a/test/uscxml/test-predicates.scxml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/confEcma.xsl b/test/w3c/confEcma.xsl index a77d552..41a8129 100644 --- a/test/w3c/confEcma.xsl +++ b/test/w3c/confEcma.xsl @@ -275,7 +275,7 @@ events which cause the test to fail. The default value provided here is pretty - "foo" + "foo diff --git a/test/w3c/convert-tests.sh b/test/w3c/convert-tests.sh index 42f8fce..a8357aa 100755 --- a/test/w3c/convert-tests.sh +++ b/test/w3c/convert-tests.sh @@ -20,4 +20,7 @@ do done cp txml/*.txt ecma/ -cp txml/*.txt xpath/ \ No newline at end of file +cp txml/*.txt xpath/ + +find ./ecma -type f -exec grep -Ili 'datamodel="xpath"' {} \; |xargs rm -fv +find ./xpath -type f -exec grep -Ili 'datamodel="ecmascript"' {} \; |xargs rm -fv \ No newline at end of file diff --git a/test/w3c/ecma/test252.scxml b/test/w3c/ecma/test252.scxml index b33342b..14c6686 100644 --- a/test/w3c/ecma/test252.scxml +++ b/test/w3c/ecma/test252.scxml @@ -5,7 +5,7 @@ timeout indicates success. --> - + @@ -22,7 +22,7 @@ timeout indicates success. --> - + diff --git a/test/w3c/ecma/test463.scxml b/test/w3c/ecma/test463.scxml deleted file mode 100644 index 4f32b84..0000000 --- a/test/w3c/ecma/test463.scxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test464.scxml b/test/w3c/ecma/test464.scxml deleted file mode 100644 index bd640f2..0000000 --- a/test/w3c/ecma/test464.scxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test465.scxml b/test/w3c/ecma/test465.scxml deleted file mode 100644 index a91bb06..0000000 --- a/test/w3c/ecma/test465.scxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test466.scxml b/test/w3c/ecma/test466.scxml deleted file mode 100644 index 1431fab..0000000 --- a/test/w3c/ecma/test466.scxml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test467.scxml b/test/w3c/ecma/test467.scxml deleted file mode 100644 index 130b7bc..0000000 --- a/test/w3c/ecma/test467.scxml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test468.scxml b/test/w3c/ecma/test468.scxml deleted file mode 100644 index 3b6902d..0000000 --- a/test/w3c/ecma/test468.scxml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - New York - Boston - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test469.scxml b/test/w3c/ecma/test469.scxml deleted file mode 100644 index 02fe476..0000000 --- a/test/w3c/ecma/test469.scxml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test470.scxml b/test/w3c/ecma/test470.scxml deleted file mode 100644 index 3c26bb1..0000000 --- a/test/w3c/ecma/test470.scxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - 2 - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test473.scxml b/test/w3c/ecma/test473.scxml deleted file mode 100644 index 4a57129..0000000 --- a/test/w3c/ecma/test473.scxml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - 12334455 - some author - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test474.scxml b/test/w3c/ecma/test474.scxml deleted file mode 100644 index decad75..0000000 --- a/test/w3c/ecma/test474.scxml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - 12334455 - some author - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test475.scxml b/test/w3c/ecma/test475.scxml deleted file mode 100644 index 0f9cdfe..0000000 --- a/test/w3c/ecma/test475.scxml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - 12334455 - some author - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test476.scxml b/test/w3c/ecma/test476.scxml deleted file mode 100644 index d3fe8e8..0000000 --- a/test/w3c/ecma/test476.scxml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - 12334455 - some author - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test477.scxml b/test/w3c/ecma/test477.scxml deleted file mode 100644 index 1726866..0000000 --- a/test/w3c/ecma/test477.scxml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - 12334455 - some author - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test478.scxml b/test/w3c/ecma/test478.scxml deleted file mode 100644 index 9821608..0000000 --- a/test/w3c/ecma/test478.scxml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - This is not a book - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test479.scxml b/test/w3c/ecma/test479.scxml deleted file mode 100644 index 3d5b1ac..0000000 --- a/test/w3c/ecma/test479.scxml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - This is not a book - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test480.scxml b/test/w3c/ecma/test480.scxml deleted file mode 100644 index 0fde260..0000000 --- a/test/w3c/ecma/test480.scxml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test481.scxml b/test/w3c/ecma/test481.scxml deleted file mode 100644 index a0505f6..0000000 --- a/test/w3c/ecma/test481.scxml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test482.scxml b/test/w3c/ecma/test482.scxml deleted file mode 100644 index 00eb3fe..0000000 --- a/test/w3c/ecma/test482.scxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test483.scxml b/test/w3c/ecma/test483.scxml deleted file mode 100644 index 0a1b236..0000000 --- a/test/w3c/ecma/test483.scxml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test537.scxml b/test/w3c/ecma/test537.scxml deleted file mode 100644 index 350d422..0000000 --- a/test/w3c/ecma/test537.scxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test539.scxml b/test/w3c/ecma/test539.scxml deleted file mode 100644 index 450bfd9..0000000 --- a/test/w3c/ecma/test539.scxml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test540.scxml b/test/w3c/ecma/test540.scxml deleted file mode 100644 index 641509f..0000000 --- a/test/w3c/ecma/test540.scxml +++ /dev/null @@ -1,21 +0,0 @@ - - - 123 -4 5 - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test542.scxml b/test/w3c/ecma/test542.scxml deleted file mode 100644 index 1101471..0000000 --- a/test/w3c/ecma/test542.scxml +++ /dev/null @@ -1,34 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - 123 -4 5 - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test543.scxml b/test/w3c/ecma/test543.scxml deleted file mode 100644 index 2c5c6de..0000000 --- a/test/w3c/ecma/test543.scxml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test544.scxml b/test/w3c/ecma/test544.scxml deleted file mode 100644 index fd09502..0000000 --- a/test/w3c/ecma/test544.scxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test545.scxml b/test/w3c/ecma/test545.scxml deleted file mode 100644 index 1e12770..0000000 --- a/test/w3c/ecma/test545.scxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - 3 - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test546.scxml b/test/w3c/ecma/test546.scxml deleted file mode 100644 index 728843b..0000000 --- a/test/w3c/ecma/test546.scxml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - some string - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test547.scxml b/test/w3c/ecma/test547.scxml deleted file mode 100644 index 8c04c95..0000000 --- a/test/w3c/ecma/test547.scxml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - The Zen Mind - - - Freakonomics - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test553.scxml b/test/w3c/ecma/test553.scxml index 3dd0aeb..87062e4 100644 --- a/test/w3c/ecma/test553.scxml +++ b/test/w3c/ecma/test553.scxml @@ -5,7 +5,7 @@ of 's args causes an error.. --> - + diff --git a/test/w3c/ecma/test555.scxml b/test/w3c/ecma/test555.scxml deleted file mode 100644 index 79dea75..0000000 --- a/test/w3c/ecma/test555.scxml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/ecma/test568.scxml b/test/w3c/ecma/test568.scxml deleted file mode 100644 index e8b888f..0000000 --- a/test/w3c/ecma/test568.scxml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/txml/test252.txml b/test/w3c/txml/test252.txml index ba43543..40c36cb 100644 --- a/test/w3c/txml/test252.txml +++ b/test/w3c/txml/test252.txml @@ -9,7 +9,7 @@ timeout indicates success. --> - + @@ -26,7 +26,7 @@ timeout indicates success. --> - + diff --git a/test/w3c/update-txml.sh b/test/w3c/update-txml.sh index 09a9602..9fa2c99 100755 --- a/test/w3c/update-txml.sh +++ b/test/w3c/update-txml.sh @@ -14,4 +14,4 @@ rm -rf www.w3.org sed -ie "s/Var<\/xsl:attribute>/(Var.slice(0, - 1)) * 50 + 'ms'<\/xsl:attribute>/" confEcma.xsl sed -ie "s/'s'<\/xsl:attribute>/'ms'<\/xsl:attribute>/" confEcma.xsl -rm confEcma.xsle \ No newline at end of file +rm confEcma.xsle diff --git a/test/w3c/xpath/test252.scxml b/test/w3c/xpath/test252.scxml index f8d93a5..1f92127 100644 --- a/test/w3c/xpath/test252.scxml +++ b/test/w3c/xpath/test252.scxml @@ -5,7 +5,7 @@ timeout indicates success. --> - + @@ -22,7 +22,7 @@ timeout indicates success. --> - + diff --git a/test/w3c/xpath/test444.scxml b/test/w3c/xpath/test444.scxml deleted file mode 100644 index c689674..0000000 --- a/test/w3c/xpath/test444.scxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test445.scxml b/test/w3c/xpath/test445.scxml deleted file mode 100644 index f1ae24b..0000000 --- a/test/w3c/xpath/test445.scxml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test446.scxml b/test/w3c/xpath/test446.scxml deleted file mode 100644 index 64ab3c9..0000000 --- a/test/w3c/xpath/test446.scxml +++ /dev/null @@ -1,21 +0,0 @@ - - - [1, 2, 3] - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test448.scxml b/test/w3c/xpath/test448.scxml deleted file mode 100644 index adbc121..0000000 --- a/test/w3c/xpath/test448.scxml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test449.scxml b/test/w3c/xpath/test449.scxml deleted file mode 100644 index d06cc9a..0000000 --- a/test/w3c/xpath/test449.scxml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test451.scxml b/test/w3c/xpath/test451.scxml deleted file mode 100644 index e939ded..0000000 --- a/test/w3c/xpath/test451.scxml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test452.scxml b/test/w3c/xpath/test452.scxml deleted file mode 100644 index 4f38ca7..0000000 --- a/test/w3c/xpath/test452.scxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test453.scxml b/test/w3c/xpath/test453.scxml deleted file mode 100644 index 33b904d..0000000 --- a/test/w3c/xpath/test453.scxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test456.scxml b/test/w3c/xpath/test456.scxml deleted file mode 100644 index 2aebab0..0000000 --- a/test/w3c/xpath/test456.scxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test457.scxml b/test/w3c/xpath/test457.scxml deleted file mode 100644 index 86cf156..0000000 --- a/test/w3c/xpath/test457.scxml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test459.scxml b/test/w3c/xpath/test459.scxml deleted file mode 100644 index b631c25..0000000 --- a/test/w3c/xpath/test459.scxml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test460.scxml b/test/w3c/xpath/test460.scxml deleted file mode 100644 index 8ba3e5e..0000000 --- a/test/w3c/xpath/test460.scxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test557.scxml b/test/w3c/xpath/test557.scxml deleted file mode 100644 index 6f4eed1..0000000 --- a/test/w3c/xpath/test557.scxml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test558.scxml b/test/w3c/xpath/test558.scxml deleted file mode 100644 index a075100..0000000 --- a/test/w3c/xpath/test558.scxml +++ /dev/null @@ -1,24 +0,0 @@ - - - -this is -a string - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test560.scxml b/test/w3c/xpath/test560.scxml deleted file mode 100644 index d283b1a..0000000 --- a/test/w3c/xpath/test560.scxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test561.scxml b/test/w3c/xpath/test561.scxml deleted file mode 100644 index e94a813..0000000 --- a/test/w3c/xpath/test561.scxml +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test562.scxml b/test/w3c/xpath/test562.scxml deleted file mode 100644 index f5997bb..0000000 --- a/test/w3c/xpath/test562.scxml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - -this is a -string - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test569.scxml b/test/w3c/xpath/test569.scxml deleted file mode 100644 index 832a0c0..0000000 --- a/test/w3c/xpath/test569.scxml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/test/w3c/xpath/test578.scxml b/test/w3c/xpath/test578.scxml deleted file mode 100644 index 9a25195..0000000 --- a/test/w3c/xpath/test578.scxml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - { "productName" : "bar", "size" : 27 } - - - - - - - - - - - \ No newline at end of file -- cgit v0.12
Test#StatusDescriptionComment
553Failed"test that the processor does not dispatch the event if evaluation of <send>'s args causes an error."We cannot correctly identify location expressions (valid LHS) for ecmascript. Send is performed anyway.
554Failed"test that if the evaluation of <invoke>'s args causes an error, the invocation is cancelled."We cannot correctly identify location expressions (valid LHS) for ecmascript. Invoke is performed anyway.
579 Failed "Before the parent state has been visited for the first time, if a transition is executed that takes the history state as its target, the SCXML processor MUST execute any executable content in the transition after the parent state's onentry content and any content in a possible initial transition."