More complete xinclude implementation and tests

14 files changed, 140 insertions, 27 deletions

diff --git a/test/ctest/CTestCustom.ctest.in b/test/ctest/CTestCustom.ctest.in
index feba4c1..07ade54 100644
--- a/test/ctest/CTestCustom.ctest.in
+++ b/test/ctest/CTestCustom.ctest.in
@@ -34,21 +34,18 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   
   
   ### Ignore for PROMELA datamodel
-  "promela/test178.scxml" # manual test
+  "promela/test178.scxml" # two identical params in _event.raw - failed
+  "promela/test230.scxml" # autoforwarded events are identical - passed
+  "promela/test250.scxml" # no onexit in cancelled invoker - passed
+  "promela/test301.scxml" # reject invalid script - passed
+  "promela/test307.scxml" # declare variable via script - failed
+  "promela/test415.scxml" # terminate on toplevel final - passed
+  # "promela/test513.txt" # manual test
+  
   "promela/test190.scxml" # string concatenation
   "promela/test224.scxml" # string operation startWith
-  "promela/test230.scxml" # manual test
-  "promela/test250.scxml" # manual test
-  "promela/test277.scxml" # no runtime checks for undeclared variables
   "promela/test280.scxml" # no runtime checks for undeclared variables
-  "promela/test301.scxml" # manual test
-  "promela/test307.scxml" # manual test
-#  "promela/test330.scxml" # no "defined" operator in promela
-# "promela/test333.scxml" # no typeof or "defined" operator in promela
-# "promela/test335.scxml" # no typeof or "defined" operator in promela
-# "promela/test337.scxml" # no typeof or "defined" operator in promela
   "promela/test350.scxml" # string concatenation
-  "promela/test415.scxml" # manual test
   "promela/test509.scxml" # string operation contains
   "promela/test518.scxml" # string operation contains
   "promela/test519.scxml" # string operation contains
@@ -57,7 +54,18 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   "promela/test530.scxml" # assigns DOM node to variable
   "promela/test534.scxml" # string operation contains
   
+  
   ### Ignore for PROMELA model checking
+
+  # manual tests
+  "spin/promela/test178.scxml" # two identical params in _event.raw - failed
+  "spin/promela/test230.scxml" # autoforwarded events are identical - passed
+  "spin/promela/test250.scxml" # no onexit in cancelled invoker - passed
+  "spin/promela/test301.scxml" # reject invalid script - passed
+  "spin/promela/test307.scxml" # declare variable via script - failed
+  "spin/promela/test415.scxml" # terminate on toplevel final - passed
+  # "spin/promela/test513.txt" # manual test
+
   # fail for syntax
   "spin/promela/test150.scxml" # test that foreach causes a new variable to be declared
   "spin/promela/test151.scxml" # test that foreach causes a new variable to be declared
@@ -68,10 +76,8 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   "spin/promela/test280.scxml" # late data binding / undeclared variable
   "spin/promela/test286.scxml" # assignment to a non-declared var causes an error
   "spin/promela/test294.scxml" # mixed types for event.data via donedata
-  "spin/promela/test301.scxml" # manual test
   "spin/promela/test302.scxml" # variable not declared
   "spin/promela/test304.scxml" # variable not declared
-  "spin/promela/test307.scxml" # manual test
   "spin/promela/test309.scxml" # 'return' as an invalid boolean expression ought to eval to false
   "spin/promela/test311.scxml" # assignment to a non-declared var
   "spin/promela/test312.scxml" # assignment of 'return'
@@ -88,7 +94,6 @@ set(CTEST_CUSTOM_TESTS_IGNORE
   "spin/promela/test354.scxml" # mixed types for event.data
   "spin/promela/test401.scxml" # variable not declared
   "spin/promela/test402.scxml" # variable not declared
-  "spin/promela/test415.scxml" # manual test
   "spin/promela/test436.scxml" # In(s) -> _x.states[s] prevents completion as NULL dm is hardcoded
   "spin/promela/test487.scxml" # assignment of 'return'
   "spin/promela/test509.scxml" # string operation contains
@@ -101,18 +106,15 @@ set(CTEST_CUSTOM_TESTS_IGNORE
 
   # fail for semantics
   "spin/promela/test159.scxml" # error raised causes all subsequent elements to be skipped
-  "spin/promela/test178.scxml" # manual test with two identical params - failed
   "spin/promela/test194.scxml" # illegal target for send
   "spin/promela/test199.scxml" # invalid send type
   "spin/promela/test216.scxml" # nested SCXML document with srcexpr at invoke
-  "spin/promela/test230.scxml" # nested SCXML document with manual test
   "spin/promela/test298.scxml" # non-existent data model location
   "spin/promela/test331.scxml" # tests _error.type via 'error.execution'
   "spin/promela/test332.scxml" # tests _error.sendid via 'error.execution'
   "spin/promela/test343.scxml" # test that illegal <param> produces error.execution
   "spin/promela/test488.scxml" # illegal expr in <param> produces error.execution
   "spin/promela/test496.scxml" # tests error.communication with illegal target
-  "spin/promela/test513.txt"   # pure manual wget
   "spin/promela/test521.scxml" # tests error.communication with illegal target
   "spin/promela/test528.scxml" # illegal 'expr' produces error.execution
   "spin/promela/test531.scxml" # uses _ioprocessors.basichttp.location
diff --git a/test/uscxml/xinclude/test-fail-namespace1.include b/test/uscxml/xinclude/test-fail-namespace1.include
new file mode 100644
index 0000000..28f0cc6
--- /dev/null
+++ b/test/uscxml/xinclude/test-fail-namespace1.include
@@ -0,0 +1,3 @@
+<state id="start" xmlns:bar="http://www.w3.org/2001/Foo">
+	<transition target="pass" />
+</state>
diff --git a/test/uscxml/xinclude/test-fail-namespace1.scxml b/test/uscxml/xinclude/test-fail-namespace1.scxml
new file mode 100644
index 0000000..dea45c6
--- /dev/null
+++ b/test/uscxml/xinclude/test-fail-namespace1.scxml
@@ -0,0 +1,16 @@
+<!-- Namespace http://www.w3.org/2001/Foo is mapped from prefix foo and bar -> error -->
+<scxml 
+	xmlns:xi="http://www.w3.org/2001/XInclude" 
+	xmlns:foo="http://www.w3.org/2001/Foo">
+	<!-- include from file -->
+	<xi:include href="test-fail-namespace1.include" />
+	<state id="s0">
+		<transition target="fail" />
+	</state>
+	<final id="fail">
+		<onentry><log expr="FAIL!" /></onentry>
+	</final>
+	<final id="pass">
+		<onentry><log expr="PASS!" /></onentry>
+	</final>
+</scxml>
diff --git a/test/uscxml/xinclude/test-fail-namespace2.include b/test/uscxml/xinclude/test-fail-namespace2.include
new file mode 100644
index 0000000..5a69573
--- /dev/null
+++ b/test/uscxml/xinclude/test-fail-namespace2.include
@@ -0,0 +1,3 @@
+<state id="start" xmlns:foo="http://www.w3.org/2001/Bar">
+	<transition target="pass" />
+</state>
diff --git a/test/uscxml/xinclude/test-fail-namespace2.scxml b/test/uscxml/xinclude/test-fail-namespace2.scxml
new file mode 100644
index 0000000..f256e54
--- /dev/null
+++ b/test/uscxml/xinclude/test-fail-namespace2.scxml
@@ -0,0 +1,16 @@
+<!-- Prefix foo is pointing to http://www.w3.org/2001/Foo and http://www.w3.org/2001/Bar -> error -->
+<scxml 
+	xmlns:xi="http://www.w3.org/2001/XInclude" 
+	xmlns:foo="http://www.w3.org/2001/Foo">
+	<!-- include from file -->
+	<xi:include href="test-fail-namespace2.include" />
+	<state id="s0">
+		<transition target="fail" />
+	</state>
+	<final id="fail">
+		<onentry><log expr="FAIL!" /></onentry>
+	</final>
+	<final id="pass">
+		<onentry><log expr="PASS!" /></onentry>
+	</final>
+</scxml>
diff --git a/test/uscxml/xinclude/included.scxml b/test/uscxml/xinclude/test-fail-namespace3.include
index 4d8c8f5..d6b2fc7 100644
--- a/test/uscxml/xinclude/included.scxml
+++ b/test/uscxml/xinclude/test-fail-namespace3.include
@@ -1,3 +1,3 @@
 <state id="start">
 	<transition target="pass" />
-</state>
\ No newline at end of file
+</state>
diff --git a/test/uscxml/xinclude/test-fail-namespace3.scxml b/test/uscxml/xinclude/test-fail-namespace3.scxml
new file mode 100644
index 0000000..f7c6dd1
--- /dev/null
+++ b/test/uscxml/xinclude/test-fail-namespace3.scxml
@@ -0,0 +1,16 @@
+<!-- Qualified SCXML Namespace includes unqualified -> warning -->
+<scxml:scxml 
+	xmlns:xi="http://www.w3.org/2001/XInclude" 
+	xmlns:scxml="http://www.w3.org/2005/07/scxml">
+	<!-- include from file -->
+	<xi:include href="test-fail-namespace3.include" />
+	<scxml:state id="s0">
+		<scxml:transition target="fail" />
+	</scxml:state>
+	<scxml:final id="fail">
+		<scxml:onentry><scxml:log expr="FAIL!" /></scxml:onentry>
+	</scxml:final>
+	<scxml:final id="pass">
+		<scxml:onentry><scxml:log expr="PASS!" /></scxml:onentry>
+	</scxml:final>
+</scxml:scxml>
diff --git a/test/uscxml/xinclude/test-fail-namespace4.include b/test/uscxml/xinclude/test-fail-namespace4.include
new file mode 100644
index 0000000..279b53e
--- /dev/null
+++ b/test/uscxml/xinclude/test-fail-namespace4.include
@@ -0,0 +1,3 @@
+<scxml:state id="start" xmlns:scxml="http://www.w3.org/2005/07/scxml">
+	<scxml:transition target="pass" />
+</scxml:state>
diff --git a/test/uscxml/xinclude/test-fail-namespace4.scxml b/test/uscxml/xinclude/test-fail-namespace4.scxml
new file mode 100644
index 0000000..f5d4af7
--- /dev/null
+++ b/test/uscxml/xinclude/test-fail-namespace4.scxml
@@ -0,0 +1,15 @@
+<!-- Unqualified SCXML Namespace includes qualified -> error -->
+<scxml 
+	xmlns:xi="http://www.w3.org/2001/XInclude">
+	<!-- include from file -->
+	<xi:include href="test-fail-namespace4.include" />
+	<state id="s0">
+		<transition target="fail" />
+	</state>
+	<final id="fail">
+		<onentry><log expr="FAIL!" /></onentry>
+	</final>
+	<final id="pass">
+		<onentry><log expr="PASS!" /></onentry>
+	</final>
+</scxml>
diff --git a/test/uscxml/xinclude/test-recursive-include.include b/test/uscxml/xinclude/test-recursive-include.include
new file mode 100644
index 0000000..a46b928
--- /dev/null
+++ b/test/uscxml/xinclude/test-recursive-include.include
@@ -0,0 +1,5 @@
+<state id="foo" 
+	xmlns:xi="http://www.w3.org/2001/XInclude" >
+	<!-- include from file -->
+	<xi:include href="test-recursive-include.include" />
+</state>
diff --git a/test/uscxml/xinclude/test-recursive-include.scxml b/test/uscxml/xinclude/test-recursive-include.scxml
new file mode 100644
index 0000000..62618a1
--- /dev/null
+++ b/test/uscxml/xinclude/test-recursive-include.scxml
@@ -0,0 +1,15 @@
+<!-- include is recursive -> error -->
+<scxml 
+	xmlns:xi="http://www.w3.org/2001/XInclude">
+	<!-- include from file -->
+	<xi:include href="test-recursive-include.include" />
+	<state id="s0">
+		<transition target="fail" />
+	</state>
+	<final id="fail">
+		<onentry><log expr="FAIL!" /></onentry>
+	</final>
+	<final id="pass">
+		<onentry><log expr="PASS!" /></onentry>
+	</final>
+</scxml>
diff --git a/test/uscxml/xinclude/test-xinclude-simple.scxml b/test/uscxml/xinclude/test-xinclude-simple.scxml
new file mode 100644
index 0000000..72127cd
--- /dev/null
+++ b/test/uscxml/xinclude/test-xinclude-simple.scxml
@@ -0,0 +1,25 @@
+<scxml xmlns:xi="http://www.w3.org/2001/XInclude">
+	<!-- include from file -->
+	<xi:include href="text-xinclude-simple.included" />
+	<state id="s0">
+		<transition target="fail" />
+	</state>
+	<state id="s1">
+		<!-- force fallback via invalid url -->
+		<xi:include href="included.invalid">
+			<xi:fallback>
+				<transition target="s2" />
+			</xi:fallback>
+		</xi:include>
+		<transition target="fail" />
+	</state>
+	<state id="s2">
+		<transition target="pass" />
+	</state>
+	<final id="fail">
+		<onentry><log expr="FAIL!" /></onentry>
+	</final>
+	<final id="pass">
+		<onentry><log expr="PASS!" /></onentry>
+	</final>
+</scxml>
\ No newline at end of file
diff --git a/test/uscxml/xinclude/test-xinclude.scxml b/test/uscxml/xinclude/test-xinclude.scxml
deleted file mode 100644
index a07c087..0000000
--- a/test/uscxml/xinclude/test-xinclude.scxml
+++ /dev/null
@@ -1,9 +0,0 @@
-<scxml xmlns:xi="http://www.w3.org/2001/XInclude">
-	<xi:include href="included.scxml" />
-	<final id="fail">
-		<onentry><log expr="FAIL!" /></onentry>
-	</final>
-	<final id="pass">
-		<onentry><log expr="PASS!" /></onentry>
-	</final>
-</scxml>
\ No newline at end of file
diff --git a/test/uscxml/xinclude/text-xinclude-simple.included b/test/uscxml/xinclude/text-xinclude-simple.included
new file mode 100644
index 0000000..4ff416f
--- /dev/null
+++ b/test/uscxml/xinclude/text-xinclude-simple.included
@@ -0,0 +1,3 @@
+<state id="start">
+	<transition target="s1" />
+</state>
\ No newline at end of file