Reformatted w3c tests with xmllint

1 files changed, 69 insertions, 65 deletions

diff --git a/test/w3c/xpath/test504.scxml b/test/w3c/xpath/test504.scxml
index 08b7a2e..df9ef43 100644
--- a/test/w3c/xpath/test504.scxml
+++ b/test/w3c/xpath/test504.scxml
@@ -1,75 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?><!-- test that an external transition exits all states up the the LCCA --><scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s1" version="1.0" datamodel="xpath">
-<datamodel>
-  <data id="Var1" expr="0"/>  <!-- how often we have exited p -->
-  <data id="Var2" expr="0"/>  <!-- how often we have exited ps1 -->
-  <data id="Var3" expr="0"/>  <!-- how often we have exited ps2 -->
-  <data id="Var4" expr="0"/>  <!-- how often the transition for foo has been taken -->
-  <data id="Var5" expr="0"/>  <!-- how often we have exited s2  -->
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- test that an external transition exits all states up the the LCCA -->
+<scxml xmlns="http://www.w3.org/2005/07/scxml" xmlns:conf="http://www.w3.org/2005/scxml-conformance" initial="s1" version="1.0" datamodel="xpath">
+  <datamodel>
+    <data id="Var1" expr="0"/>
+    <!-- how often we have exited p -->
+    <data id="Var2" expr="0"/>
+    <!-- how often we have exited ps1 -->
+    <data id="Var3" expr="0"/>
+    <!-- how often we have exited ps2 -->
+    <data id="Var4" expr="0"/>
+    <!-- how often the transition for foo has been taken -->
+    <data id="Var5" expr="0"/>
+    <!-- how often we have exited s2  -->
   </datamodel>
-    
- <state id="s1">
-   <onentry>
-    <raise event="foo"/>
-    <raise event="bar"/>
+  <state id="s1">
+    <onentry>
+      <raise event="foo"/>
+      <raise event="bar"/>
     </onentry>
-   <transition target="p"/>
-   </state>
-   
-<state id="s2">
-	 <onexit>
-	 	<assign location="$Var5" expr="$Var5 + 1"/>
-	 	</onexit>
-
-<parallel id="p">
-  <onexit>
-    <assign location="$Var1" expr="$Var1 + 1"/>
-    </onexit>
-  <transition event="foo" target="ps1">
-     <assign location="$Var4" expr="$Var4 + 1"/>
-     </transition>
-     
-   <!-- make sure the transition on foo was actually taken --> 
-  <transition event="bar" cond="$Var4/text() =1" target="s3"/>
-  <transition event="bar" target="fail"/>
-  
- <state id="ps1">
-   <onexit>
-   <assign location="$Var2" expr="$Var2 + 1"/>
-   </onexit>
+    <transition target="p"/>
   </state>
-  <state id="ps2">
-   <onexit>
-   <assign location="$Var3" expr="$Var3 + 1"/>
-   </onexit>
+  <state id="s2">
+    <onexit>
+      <assign location="$Var5" expr="$Var5 + 1"/>
+    </onexit>
+    <parallel id="p">
+      <onexit>
+        <assign location="$Var1" expr="$Var1 + 1"/>
+      </onexit>
+      <transition event="foo" target="ps1">
+        <assign location="$Var4" expr="$Var4 + 1"/>
+      </transition>
+      <!-- make sure the transition on foo was actually taken -->
+      <transition event="bar" cond="$Var4/text() =1" target="s3"/>
+      <transition event="bar" target="fail"/>
+      <state id="ps1">
+        <onexit>
+          <assign location="$Var2" expr="$Var2 + 1"/>
+        </onexit>
+      </state>
+      <state id="ps2">
+        <onexit>
+          <assign location="$Var3" expr="$Var3 + 1"/>
+        </onexit>
+      </state>
+    </parallel>
   </state>
-</parallel>
-</state>
-  
-<state id="s3">
-  <!-- make sure that p was exited twice -->
+  <state id="s3">
+    <!-- make sure that p was exited twice -->
     <transition cond="$Var1/text() =2" target="s4"/>
     <transition target="fail"/>
- </state> 
- 
-<state id="s4">
-  <!-- make sure that ps1 was exited twice -->
+  </state>
+  <state id="s4">
+    <!-- make sure that ps1 was exited twice -->
     <transition cond="$Var2/text() =2" target="s5"/>
     <transition target="fail"/>
- </state> 
-  
-<state id="s5">
-  <!-- make sure that ps2 was exited twice -->
+  </state>
+  <state id="s5">
+    <!-- make sure that ps2 was exited twice -->
     <transition cond="$Var3/text() =2" target="s6"/>
     <transition target="fail"/>
- </state>
- 
-<state id="s6">
-	<!-- make sure that s1 was exited once -->
-	<transition cond="$Var5/text() =1" target="pass"/>
-	<transition target="fail"/>
-	</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
+  </state>
+  <state id="s6">
+    <!-- make sure that s1 was exited once -->
+    <transition cond="$Var5/text() =1" target="pass"/>
+    <transition target="fail"/>
+  </state>
+  <final id="pass">
+    <onentry>
+      <log label="Outcome" expr="'pass'"/>
+    </onentry>
+  </final>
+  <final id="fail">
+    <onentry>
+      <log label="Outcome" expr="'fail'"/>
+    </onentry>
+  </final>
+</scxml>