Updated W3C tests and bug-fixes

3 files changed, 63 insertions, 3 deletions

diff --git a/test/samples/uscxml/test-markup-passing.scxml b/test/samples/uscxml/test-markup-passing.scxml
new file mode 100644
index 0000000..32866b1
--- /dev/null
+++ b/test/samples/uscxml/test-markup-passing.scxml
@@ -0,0 +1,54 @@
+<scxml binding="late" datamodel="ecmascript"
+	xmlns="http://www.w3.org/2005/07/scxml" 
+	xmlns:foo="http://uscxml.tk.informatik.tu-darmstadt.de/foo.xsd">
+	<!-- 
+		embedded markup contains a single child 
+	-->
+	<state id="markup-embedded-single">
+		<datamodel>
+			<data id="markup">
+				<root>
+					<child>1</child>
+					<foo:child>2</foo:child>
+				</root>
+			</data>
+		</datamodel>
+		<onentry>
+			<log label="markup-embedded-single" expr="markup.nodeName" />
+		</onentry>
+		<transition cond="markup.nodeName === 'root'" target="markup-embedded-many" />
+	</state>
+
+	<!-- 
+		embedded markup contains multiple childs
+	-->
+	<state id="markup-embedded-many">
+		<datamodel>
+			<data id="markup">
+				<root>
+					<child>1</child>
+					<foo:child>2</foo:child>
+				</root>
+				<root>
+					<child>1</child>
+					<foo:child>2</foo:child>
+				</root>
+			</data>
+		</datamodel>
+		<onentry>
+			<log label="markup-embedded-many" expr="markup.nodeName" />
+		</onentry>
+		<transition cond="markup.nodeName === 'data'" target="markup-file" />
+	</state>
+	
+	<state id="markup-file">
+		<datamodel>
+			<data id="markup" src="test-markup.xml" />
+		</datamodel>
+		<onentry>
+			<log label="markup-file" expr="markup.nodeName" />
+		</onentry>
+		<transition cond="markup.nodeName === 'root'" target="exit" />
+	</state>
+	<final id="exit" />
+</scxml>
\ No newline at end of file
diff --git a/test/samples/uscxml/test-markup.xml b/test/samples/uscxml/test-markup.xml
new file mode 100644
index 0000000..81da3d2
--- /dev/null
+++ b/test/samples/uscxml/test-markup.xml
@@ -0,0 +1,6 @@
+<root 
+	xmlns="http://www.w3.org/2005/07/scxml" 
+	xmlns:foo="http://uscxml.tk.informatik.tu-darmstadt.de/scenegraph.xsd">
+	<child>1</child>
+	<foo:child>2</foo:child>
+</root>
\ No newline at end of file
diff --git a/test/samples/uscxml/test-scenegraph.scxml b/test/samples/uscxml/test-scenegraph.scxml
index f0d1173..0efcd6d 100644
--- a/test/samples/uscxml/test-scenegraph.scxml
+++ b/test/samples/uscxml/test-scenegraph.scxml
@@ -23,17 +23,17 @@
 					</scenegraph:viewport>
 					<scenegraph:viewport x="0" y="50%" width="50%" height="50%" id="scene3">
 						<scenegraph:rotation id="treeRotation" pitch="100deg" roll="3.15149rad" yaw="10deg">
-							<scenegraph:node src="http://people.sc.fsu.edu/~jburkardt/data/obj/airboat.obj" />
+							<scenegraph:node src="http://cs.iupui.edu/~aharris/webDesign/vrml/tree.wrl" />
 						</scenegraph:rotation>
 					</scenegraph:viewport>
 					<scenegraph:viewport x="50%" y="50%" width="50%" height="50%" id="scene4">
 						<scenegraph:translation x="0" y="0" z="0">
-							<scenegraph:node src="http://people.sc.fsu.edu/~jburkardt/data/obj/airboat.obj" />
+							<scenegraph:node src="scenegraph/HARD_MP_VAL_000.wrl" />
 						</scenegraph:translation>
 					</scenegraph:viewport>
 					<scenegraph:viewport x="50%" y="0" width="50%" height="50%" id="scene2">
 						<scenegraph:translation x="0" y="0" z="0">
-							<scenegraph:node src="http://people.sc.fsu.edu/~jburkardt/data/obj/airboat.obj" />
+							<scenegraph:node src="http://cs.iupui.edu/~aharris/mm/vrml4/house.wrl" />
 						</scenegraph:translation>
 					</scenegraph:viewport>
 				</scenegraph:display>