diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-06-27 22:32:46 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-06-27 22:32:46 (GMT) |
| commit | c70d02010ea99e6c8e35da3b767f41f1ee5dce56 (patch) | |
| tree | a0ef030204ec2eb656845d03876006d9cdc0760c /test | |
| parent | a4b506fd774ec50ad79b7531bd3698c5a6339407 (diff) | |
| download | uscxml-c70d02010ea99e6c8e35da3b767f41f1ee5dce56.zip uscxml-c70d02010ea99e6c8e35da3b767f41f1ee5dce56.tar.gz uscxml-c70d02010ea99e6c8e35da3b767f41f1ee5dce56.tar.bz2 | |
Major header movement
- Used IWYU to reorganize headers
- Dropped PHP support
- Updated tests
Diffstat (limited to 'test')
| -rw-r--r-- | test/src/test-datamodel.cpp | 1 | ||||
| -rw-r--r-- | test/src/test-eventdelay.cpp | 1 | ||||
| -rw-r--r-- | test/src/test-stress.cpp | 3 | ||||
| -rw-r--r-- | test/src/test-url.cpp | 2 | ||||
| -rw-r--r-- | test/src/test-w3c.cpp | 4 | ||||
| -rw-r--r-- | test/w3c/confEcma.xsl | 2 | ||||
| -rw-r--r-- | test/w3c/ecma/robots.txt | 4 | ||||
| -rw-r--r-- | test/w3c/ecma/test446.txt | 13 | ||||
| -rw-r--r-- | test/w3c/ecma/test513.scxml | 50 | ||||
| -rw-r--r-- | test/w3c/ecma/test513.txt | 16 | ||||
| -rw-r--r-- | test/w3c/ecma/test519.scxml | 2 | ||||
| -rw-r--r-- | test/w3c/ecma/test520.scxml | 6 | ||||
| -rw-r--r-- | test/w3c/ecma/test531.scxml | 2 | ||||
| -rw-r--r-- | test/w3c/txml/robots.txt | 4 | ||||
| -rw-r--r-- | test/w3c/txml/test446.txt | 13 | ||||
| -rw-r--r-- | test/w3c/txml/test513.txml | 54 | ||||
| -rw-r--r-- | test/w3c/txml/test513.txt | 16 | ||||
| -rw-r--r-- | test/w3c/txml/test520.txml | 6 | ||||
| -rw-r--r-- | test/w3c/txml/test531.txml | 2 | ||||
| -rw-r--r-- | test/w3c/xpath/robots.txt | 4 | ||||
| -rw-r--r-- | test/w3c/xpath/test446.txt | 13 | ||||
| -rw-r--r-- | test/w3c/xpath/test513.scxml | 50 | ||||
| -rw-r--r-- | test/w3c/xpath/test513.txt | 16 | ||||
| -rw-r--r-- | test/w3c/xpath/test520.scxml | 6 | ||||
| -rw-r--r-- | test/w3c/xpath/test531.scxml | 2 |
25 files changed, 84 insertions, 208 deletions
diff --git a/test/src/test-datamodel.cpp b/test/src/test-datamodel.cpp index 452d2b9..0dc8d8a 100644 --- a/test/src/test-datamodel.cpp +++ b/test/src/test-datamodel.cpp @@ -1,6 +1,7 @@ #include "uscxml/URL.h" #include "uscxml/Message.h" #include "uscxml/Interpreter.h" +#include "uscxml/Factory.h" #include "uscxml/server/HTTPServer.h" #include <SAX/helpers/InputSourceResolver.hpp> diff --git a/test/src/test-eventdelay.cpp b/test/src/test-eventdelay.cpp index a3fec34..12cc751 100644 --- a/test/src/test-eventdelay.cpp +++ b/test/src/test-eventdelay.cpp @@ -1,4 +1,5 @@ #include "uscxml/concurrency/eventqueue/DelayedEventQueue.h" +#include <iostream> int eventCalled = 0; diff --git a/test/src/test-stress.cpp b/test/src/test-stress.cpp index 6782328..06c1aa6 100644 --- a/test/src/test-stress.cpp +++ b/test/src/test-stress.cpp @@ -1,5 +1,8 @@ #include "uscxml/config.h" #include "uscxml/Interpreter.h" +#include "uscxml/Factory.h" +#include "uscxml/server/HTTPServer.h" + #include <glog/logging.h> #include "uscxml/plugins/invoker/filesystem/dirmon/DirMonInvoker.h" diff --git a/test/src/test-url.cpp b/test/src/test-url.cpp index 9c4d941..046cc8b 100644 --- a/test/src/test-url.cpp +++ b/test/src/test-url.cpp @@ -74,7 +74,7 @@ int main(int argc, char** argv) { {
Interpreter interpreter = Interpreter::fromURI("/Users/sradomski/Desktop/application_small.scxml");
assert(interpreter);
- std::vector<std::string> states;
+ std::list<std::string> states;
states.push_back("b");
interpreter.setConfiguration(states);
interpreter.interpret();
diff --git a/test/src/test-w3c.cpp b/test/src/test-w3c.cpp index 1052fda..4d866c0 100644 --- a/test/src/test-w3c.cpp +++ b/test/src/test-w3c.cpp @@ -1,6 +1,10 @@ #include "uscxml/config.h" #include "uscxml/Interpreter.h" #include "uscxml/DOMUtils.h" + +#include "uscxml/Factory.h" +#include "uscxml/server/HTTPServer.h" + #include "uscxml/transform/ChartToFSM.h" #include <glog/logging.h> #include <boost/algorithm/string.hpp> diff --git a/test/w3c/confEcma.xsl b/test/w3c/confEcma.xsl index b77e22c..af3c8d2 100644 --- a/test/w3c/confEcma.xsl +++ b/test/w3c/confEcma.xsl @@ -674,7 +674,7 @@ the basic http tests. In the case of python, we have to import the regexp modul <!-- returns true if _event/raw contains the param with the specified value --> <xsl:template match="//@conf:eventNamedParamHasValue"> <xsl:attribute name="cond"><xsl:analyze-string select="." regex="(\S+)(\s+)(\S+)"> - <xsl:matching-substring>_event.raw.search(<xsl:value-of select="regex-group(1)"/>=<xsl:value-of select="regex-group(3)"/>) !== -1</xsl:matching-substring></xsl:analyze-string></xsl:attribute> + <xsl:matching-substring>_event.raw.search('<xsl:value-of select="regex-group(1)"/>=<xsl:value-of select="regex-group(3)"/>') !== -1</xsl:matching-substring></xsl:analyze-string></xsl:attribute> </xsl:template> <xsl:template match="//@conf:messageBodyEquals"> diff --git a/test/w3c/ecma/robots.txt b/test/w3c/ecma/robots.txt index 54f3e01..9be2782 100644 --- a/test/w3c/ecma/robots.txt +++ b/test/w3c/ecma/robots.txt @@ -1,7 +1,7 @@ # # robots.txt for http://www.w3.org/ # -# $Id: robots.txt,v 1.66 2012/07/17 21:30:56 gerald Exp $ +# $Id: robots.txt,v 1.67 2014-06-25 13:06:01 ddavis Exp $ # # For use by search.w3.org @@ -93,4 +93,4 @@ Disallow: /2004/01/pp-impl Disallow: /Consortium/supporters Disallow: /2007/08/pyRdfa/ Disallow: /WAI/PF/comments/ - +Disallow: /participate/conferences.xml diff --git a/test/w3c/ecma/test446.txt b/test/w3c/ecma/test446.txt index 4db4843..3a26a2e 100644 --- a/test/w3c/ecma/test446.txt +++ b/test/w3c/ecma/test446.txt @@ -1,12 +1 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> -<html><head> -<title>300 Multiple Choices</title> -</head><body> -<h1>Multiple Choices</h1> -The document name you requested (<code>/Voice/2013/scxml-irp/446/test446.txt</code>) could not be found on this server. -However, we found documents with names similar to the one you requested.<p>Available documents: -<ul> -<li><a href="/Voice/2013/scxml-irp/446/test446.txml">/Voice/2013/scxml-irp/446/test446.txml</a> (common basename) -</ul> -Please consider informing the owner of the <a href="http://www.w3.org/Voice/2013/scxml-irp/">referring page</a> about the broken link. -</body></html> +[1,2,3]
\ No newline at end of file diff --git a/test/w3c/ecma/test513.scxml b/test/w3c/ecma/test513.scxml deleted file mode 100644 index c26d498..0000000 --- a/test/w3c/ecma/test513.scxml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!-- test that we get an HTTP success code back on successful delivery. To run this test, implementations -must support an extension to send: if the parameter httpResponse is present with value 'true', then when -the processor gets an http response code back, it must raise an event 'http.n1.nrest' where 'ni' is -the first digit of the response code and 'nrest' are the remaining digits--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="ecmascript" version="1.0"> - -<state id="s0" initial="s01"> - <datamodel> - <data id="Var1"/> - </datamodel> - - <onentry> - <send event="timeout" delay="30s"/> - </onentry> - <invoke type="http://www.w3.org/TR/scxml/"> - <content> - <!-- child script. Once we're running send childRunning to parent and include basicHTTPAccess URI --> - <scxml initial="child0" datamodel="ecmascript" version="1.0"> - <state id="child0"> - <onentry> - <send target="#_parent" event="childRunning"> - <param name="uri" expr="_ioprocessors['basichttp']['location']"/> - </send> - </onentry> - </state> - </scxml> - </content> - </invoke> - - <transition event="*" target="fail"/> - - <state id="s01"> - <!-- when we get the event from the child, extract the access uri and use - the basicHTTP event i/o processor to send it an event --> - <transition event="childRunning" target="s02"> - <assign location="Var1" expr="_event.data.uri"/> - <send event="test" targetexpr="Var1" httpResponse="true" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/> - </transition> - </state> - - <state id="s02"> - <!-- the child should send this back automatically. It does not need to take - any transition on the event --> - <transition event="HTTP.2" target="pass"/> - </state> - </state> - - <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final> - <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final> - -</scxml>
\ No newline at end of file diff --git a/test/w3c/ecma/test513.txt b/test/w3c/ecma/test513.txt new file mode 100644 index 0000000..08e9b01 --- /dev/null +++ b/test/w3c/ecma/test513.txt @@ -0,0 +1,16 @@ +This is a fully manual test. You send a well formed event to the 'location' URL + specified for your SCXML interpreter and check that you get a 200 response code back. + One way of doing this, using wget, is shown below (you can use any event name you + want, but you must use '_scxmleventname' to indicate the name of the event): + +$ wget \ +--post-data='key1=value1&key2=value2' \ +--header '_scxmleventname: test' \ +<!-- URL of your processor goes here --> + +--2014-06-25 17:54:49-- http://epikur.local:8090/925c760f-2093-4054-a24c-d972d75f0dcd/basichttp +Resolving epikur.local (epikur.local)... 10.211.55.2, 10.37.129.2, 10.0.1.54, ... +Connecting to epikur.local (epikur.local)|10.211.55.2|:8090... connected. +HTTP request sent, awaiting response... 200 OK +Length: 0 [text/html] +Saving to: ‘basichttp’
\ No newline at end of file diff --git a/test/w3c/ecma/test519.scxml b/test/w3c/ecma/test519.scxml index 8945354..0f937b1 100644 --- a/test/w3c/ecma/test519.scxml +++ b/test/w3c/ecma/test519.scxml @@ -10,7 +10,7 @@ </onentry> <!-- if other end sends us back this event, we succeed --> - <transition event="test" cond="_event.raw.search(param1=1) !== -1" target="pass"/> + <transition event="test" cond="_event.raw.search('param1=1') !== -1" target="pass"/> <transition event="*" target="fail"/> </state> diff --git a/test/w3c/ecma/test520.scxml b/test/w3c/ecma/test520.scxml index daaf3a8..cfef477 100644 --- a/test/w3c/ecma/test520.scxml +++ b/test/w3c/ecma/test520.scxml @@ -9,8 +9,10 @@ </send> </onentry> - <!-- if other end sends us back this event, we succeed --> - <transition event="HTTP.POST" cond="_event.raw.search(/this is some content/) !== -1" target="pass"/> + <!-- if other end sends us back this event, we succeed. Test for two common + ways of encoding --> + <transition event="HTTP.POST" cond="_event.raw.search(/this+is+some+content/) !== -1" target="pass"/> + <transition event="HTTP.POST" cond="_event.raw.search(/this%20is%20some%20content/) !== -1" target="pass"/> <transition event="*" target="fail"/> </state> diff --git a/test/w3c/ecma/test531.scxml b/test/w3c/ecma/test531.scxml index 9eaa3f3..2110135 100644 --- a/test/w3c/ecma/test531.scxml +++ b/test/w3c/ecma/test531.scxml @@ -6,7 +6,7 @@ of the raised event. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:con <onentry> <send event="timeout" delay="3s"/> <send targetexpr="_ioprocessors['basichttp']['location']" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> - <content>_scxmleventname=test</content> + <param name="_scxmleventname" expr="'test'"/> </send> </onentry> diff --git a/test/w3c/txml/robots.txt b/test/w3c/txml/robots.txt index 54f3e01..9be2782 100644 --- a/test/w3c/txml/robots.txt +++ b/test/w3c/txml/robots.txt @@ -1,7 +1,7 @@ # # robots.txt for http://www.w3.org/ # -# $Id: robots.txt,v 1.66 2012/07/17 21:30:56 gerald Exp $ +# $Id: robots.txt,v 1.67 2014-06-25 13:06:01 ddavis Exp $ # # For use by search.w3.org @@ -93,4 +93,4 @@ Disallow: /2004/01/pp-impl Disallow: /Consortium/supporters Disallow: /2007/08/pyRdfa/ Disallow: /WAI/PF/comments/ - +Disallow: /participate/conferences.xml diff --git a/test/w3c/txml/test446.txt b/test/w3c/txml/test446.txt index 4db4843..3a26a2e 100644 --- a/test/w3c/txml/test446.txt +++ b/test/w3c/txml/test446.txt @@ -1,12 +1 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> -<html><head> -<title>300 Multiple Choices</title> -</head><body> -<h1>Multiple Choices</h1> -The document name you requested (<code>/Voice/2013/scxml-irp/446/test446.txt</code>) could not be found on this server. -However, we found documents with names similar to the one you requested.<p>Available documents: -<ul> -<li><a href="/Voice/2013/scxml-irp/446/test446.txml">/Voice/2013/scxml-irp/446/test446.txml</a> (common basename) -</ul> -Please consider informing the owner of the <a href="http://www.w3.org/Voice/2013/scxml-irp/">referring page</a> about the broken link. -</body></html> +[1,2,3]
\ No newline at end of file diff --git a/test/w3c/txml/test513.txml b/test/w3c/txml/test513.txml deleted file mode 100644 index 65dda29..0000000 --- a/test/w3c/txml/test513.txml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0"?> - -<!-- test that we get an HTTP success code back on successful delivery. To run this test, implementations -must support an extension to send: if the parameter httpResponse is present with value 'true', then when -the processor gets an http response code back, it must raise an event 'http.n1.nrest' where 'ni' is -the first digit of the response code and 'nrest' are the remaining digits--> - -<scxml initial="s0" conf:datamodel="" version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance"> - -<state id="s0" initial="s01"> - <datamodel> - <data conf:id="1"/> - </datamodel> - - <onentry> - <send event="timeout" delay="30s"/> - </onentry> - <invoke type="http://www.w3.org/TR/scxml/"> - <content> - <!-- child script. Once we're running send childRunning to parent and include basicHTTPAccess URI --> - <scxml initial="child0" conf:datamodel="" version="1.0" xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance"> - <state id="child0"> - <onentry> - <send target="#_parent" event="childRunning"> - <param name="uri" conf:basicHTTPAccessURI=""/> - </send> - </onentry> - </state> - </scxml> - </content> - </invoke> - - <transition event="*" conf:targetfail=""/> - - <state id="s01"> - <!-- when we get the event from the child, extract the access uri and use - the basicHTTP event i/o processor to send it an event --> - <transition event="childRunning" target="s02"> - <assign conf:location="1" conf:eventDataFieldValue="uri"/> - <send event="test" conf:targetExpr="1" httpResponse="true" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/> - </transition> - </state> - - <state id="s02"> - <!-- the child should send this back automatically. It does not need to take - any transition on the event --> - <transition event="HTTP.2" conf:targetpass=""/> - </state> - </state> - - <conf:pass/> - <conf:fail/> - -</scxml>
\ No newline at end of file diff --git a/test/w3c/txml/test513.txt b/test/w3c/txml/test513.txt new file mode 100644 index 0000000..08e9b01 --- /dev/null +++ b/test/w3c/txml/test513.txt @@ -0,0 +1,16 @@ +This is a fully manual test. You send a well formed event to the 'location' URL + specified for your SCXML interpreter and check that you get a 200 response code back. + One way of doing this, using wget, is shown below (you can use any event name you + want, but you must use '_scxmleventname' to indicate the name of the event): + +$ wget \ +--post-data='key1=value1&key2=value2' \ +--header '_scxmleventname: test' \ +<!-- URL of your processor goes here --> + +--2014-06-25 17:54:49-- http://epikur.local:8090/925c760f-2093-4054-a24c-d972d75f0dcd/basichttp +Resolving epikur.local (epikur.local)... 10.211.55.2, 10.37.129.2, 10.0.1.54, ... +Connecting to epikur.local (epikur.local)|10.211.55.2|:8090... connected. +HTTP request sent, awaiting response... 200 OK +Length: 0 [text/html] +Saving to: ‘basichttp’
\ No newline at end of file diff --git a/test/w3c/txml/test520.txml b/test/w3c/txml/test520.txml index 32ada62..7e602d0 100644 --- a/test/w3c/txml/test520.txml +++ b/test/w3c/txml/test520.txml @@ -11,8 +11,10 @@ </send> </onentry> - <!-- if other end sends us back this event, we succeed --> - <transition event="HTTP.POST" conf:messageBodyEquals="this is some content" conf:targetpass=""/> + <!-- if other end sends us back this event, we succeed. Test for two common + ways of encoding --> + <transition event="HTTP.POST" conf:messageBodyEquals="this+is+some+content" conf:targetpass=""/> + <transition event="HTTP.POST" conf:messageBodyEquals="this%20is%20some%20content" conf:targetpass=""/> <transition event="*" conf:targetfail=""/> </state> diff --git a/test/w3c/txml/test531.txml b/test/w3c/txml/test531.txml index cffe7b5..5146963 100644 --- a/test/w3c/txml/test531.txml +++ b/test/w3c/txml/test531.txml @@ -8,7 +8,7 @@ of the raised event. --> <onentry> <send event="timeout" delay="3s"/> <send conf:basicHTTPAccessURITarget="" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> - <content>_scxmleventname=test</content> + <param name="_scxmleventname" conf:quoteExpr="test"/> </send> </onentry> diff --git a/test/w3c/xpath/robots.txt b/test/w3c/xpath/robots.txt index 54f3e01..9be2782 100644 --- a/test/w3c/xpath/robots.txt +++ b/test/w3c/xpath/robots.txt @@ -1,7 +1,7 @@ # # robots.txt for http://www.w3.org/ # -# $Id: robots.txt,v 1.66 2012/07/17 21:30:56 gerald Exp $ +# $Id: robots.txt,v 1.67 2014-06-25 13:06:01 ddavis Exp $ # # For use by search.w3.org @@ -93,4 +93,4 @@ Disallow: /2004/01/pp-impl Disallow: /Consortium/supporters Disallow: /2007/08/pyRdfa/ Disallow: /WAI/PF/comments/ - +Disallow: /participate/conferences.xml diff --git a/test/w3c/xpath/test446.txt b/test/w3c/xpath/test446.txt index 4db4843..3a26a2e 100644 --- a/test/w3c/xpath/test446.txt +++ b/test/w3c/xpath/test446.txt @@ -1,12 +1 @@ -<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN"> -<html><head> -<title>300 Multiple Choices</title> -</head><body> -<h1>Multiple Choices</h1> -The document name you requested (<code>/Voice/2013/scxml-irp/446/test446.txt</code>) could not be found on this server. -However, we found documents with names similar to the one you requested.<p>Available documents: -<ul> -<li><a href="/Voice/2013/scxml-irp/446/test446.txml">/Voice/2013/scxml-irp/446/test446.txml</a> (common basename) -</ul> -Please consider informing the owner of the <a href="http://www.w3.org/Voice/2013/scxml-irp/">referring page</a> about the broken link. -</body></html> +[1,2,3]
\ No newline at end of file diff --git a/test/w3c/xpath/test513.scxml b/test/w3c/xpath/test513.scxml deleted file mode 100644 index bc29bb4..0000000 --- a/test/w3c/xpath/test513.scxml +++ /dev/null @@ -1,50 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?><!-- test that we get an HTTP success code back on successful delivery. To run this test, implementations -must support an extension to send: if the parameter httpResponse is present with value 'true', then when -the processor gets an http response code back, it must raise an event 'http.n1.nrest' where 'ni' is -the first digit of the response code and 'nrest' are the remaining digits--><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s0" datamodel="xpath" version="1.0"> - -<state id="s0" initial="s01"> - <datamodel> - <data id="Var1"/> - </datamodel> - - <onentry> - <send event="timeout" delay="30s"/> - </onentry> - <invoke type="http://www.w3.org/TR/scxml/"> - <content> - <!-- child script. Once we're running send childRunning to parent and include basicHTTPAccess URI --> - <scxml initial="child0" datamodel="xpath" version="1.0"> - <state id="child0"> - <onentry> - <send target="#_parent" event="childRunning"> - <param name="uri" expr="_ioprocessors/processor[@name="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"]/location/text()"/> - </send> - </onentry> - </state> - </scxml> - </content> - </invoke> - - <transition event="*" target="fail"/> - - <state id="s01"> - <!-- when we get the event from the child, extract the access uri and use - the basicHTTP event i/o processor to send it an event --> - <transition event="childRunning" target="s02"> - <assign location="$Var1" expr="$_event/data/data[@id='uri']/text()"/> - <send event="test" targetexpr="$Var1" httpResponse="true" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"/> - </transition> - </state> - - <state id="s02"> - <!-- the child should send this back automatically. It does not need to take - any transition on the event --> - <transition event="HTTP.2" target="pass"/> - </state> - </state> - - <final id="pass"><onentry><log label="Outcome" expr="'pass'"/></onentry></final> - <final id="fail"><onentry><log label="Outcome" expr="'fail'"/></onentry></final> - -</scxml>
\ No newline at end of file diff --git a/test/w3c/xpath/test513.txt b/test/w3c/xpath/test513.txt new file mode 100644 index 0000000..08e9b01 --- /dev/null +++ b/test/w3c/xpath/test513.txt @@ -0,0 +1,16 @@ +This is a fully manual test. You send a well formed event to the 'location' URL + specified for your SCXML interpreter and check that you get a 200 response code back. + One way of doing this, using wget, is shown below (you can use any event name you + want, but you must use '_scxmleventname' to indicate the name of the event): + +$ wget \ +--post-data='key1=value1&key2=value2' \ +--header '_scxmleventname: test' \ +<!-- URL of your processor goes here --> + +--2014-06-25 17:54:49-- http://epikur.local:8090/925c760f-2093-4054-a24c-d972d75f0dcd/basichttp +Resolving epikur.local (epikur.local)... 10.211.55.2, 10.37.129.2, 10.0.1.54, ... +Connecting to epikur.local (epikur.local)|10.211.55.2|:8090... connected. +HTTP request sent, awaiting response... 200 OK +Length: 0 [text/html] +Saving to: ‘basichttp’
\ No newline at end of file diff --git a/test/w3c/xpath/test520.scxml b/test/w3c/xpath/test520.scxml index cb54284..3c0f941 100644 --- a/test/w3c/xpath/test520.scxml +++ b/test/w3c/xpath/test520.scxml @@ -9,8 +9,10 @@ </send> </onentry> - <!-- if other end sends us back this event, we succeed --> - <transition event="HTTP.POST" cond="contains($_event/raw, this is some content)" target="pass"/> + <!-- if other end sends us back this event, we succeed. Test for two common + ways of encoding --> + <transition event="HTTP.POST" cond="contains($_event/raw, this+is+some+content)" target="pass"/> + <transition event="HTTP.POST" cond="contains($_event/raw, this%20is%20some%20content)" target="pass"/> <transition event="*" target="fail"/> </state> diff --git a/test/w3c/xpath/test531.scxml b/test/w3c/xpath/test531.scxml index 282e479..aded4d9 100644 --- a/test/w3c/xpath/test531.scxml +++ b/test/w3c/xpath/test531.scxml @@ -6,7 +6,7 @@ of the raised event. --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:con <onentry> <send event="timeout" delay="3s"/> <send targetexpr="$_ioprocessors/processor[@name="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"]/location/text()" type="http://www.w3.org/TR/scxml/#BasicHTTPEventProcessor"> - <content>_scxmleventname=test</content> + <param name="_scxmleventname" expr="'test'"/> </send> </onentry> |