factor: trim using lists

[factor.git] / basis / xml / syntax / syntax-tests.factor

diff --git a/basis/xml/syntax/syntax-tests.factor b/basis/xml/syntax/syntax-tests.factor
index 013609746b2672df8c2ee31554a13139cc4a05e1..e002c3fb99c29b7295589cbd4a690f8a7c1dd8ef 100644 (file)
--- a/basis/xml/syntax/syntax-tests.factor
+++ b/basis/xml/syntax/syntax-tests.factor
@@ -2,7 +2,7 @@
 ! See http://factorcode.org/license.txt for BSD license.
 USING: xml io kernel math sequences strings xml.traversal
 tools.test math.parser xml.syntax xml.data xml.syntax.private
-accessors multiline locals inverse xml.writer splitting classes
+accessors multiline inverse xml.writer splitting classes
 xml.private ;
 IN: xml.syntax.tests
 
@@ -48,21 +48,21 @@ XML-NS: foo http://blah.com
     [ extract-variables ] tri
 ] unit-test
 
-[ """<?xml version="1.0" encoding="UTF-8"?>
+{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <x>
   one
-  <b val="two"/>
+  <b val=\"two\"/>
   y
   <foo/>
-</x>""" ] {
+</x>" } [
     [let "one" :> a "two" :> c "y" :> x [XML <-x-> <foo/> XML] :> d
         <XML
             <x> <-a-> <b val=<-c->/> <-d-> </x>
         XML> pprint-xml>string
-    }
+    ]
 ] unit-test
 
-{ """<?xml version="1.0" encoding="UTF-8"?>
+{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
 <doc>
   <item>
     one
@@ -73,14 +73,14 @@ XML-NS: foo http://blah.com
   <item>
     three
   </item>
-</doc>""" } [
-    "one two three" " " split
+</doc>" } [
+    "one two three" split-words
     [ [XML <item><-></item> XML] ] map
     <XML <doc><-></doc> XML> pprint-xml>string
 ] unit-test
 
-{ """<?xml version="1.0" encoding="UTF-8"?>
-<x number="3" url="http://factorcode.org/" string="hello" word="drop"/>""" }
+{ "<?xml version=\"1.0\" encoding=\"UTF-8\"?>
+<x number=\"3\" url=\"http://factorcode.org/\" string=\"hello\" word=\"drop\"/>" }
 [ 3 f "http://factorcode.org/" "hello" \ drop
   <XML <x number=<-> false=<-> url=<-> string=<-> word=<->/> XML>
   pprint-xml>string  ] unit-test
@@ -134,14 +134,14 @@ XML-NS: foo http://blah.com
 
 ! Make sure nested XML documents interpolate correctly
 {
-    """<?xml version="1.0" encoding="UTF-8"?><color><blue>it's blue!</blue></color>"""
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?><color><blue>it's blue!</blue></color>"
 } [
     "it's blue!" <XML <blue><-></blue> XML>
     <XML <color><-></color> XML> xml>string
 ] unit-test
 
 {
-    """<?xml version="1.0" encoding="UTF-8"?><a>asdf<asdf/>asdf2</a>"""
+    "<?xml version=\"1.0\" encoding=\"UTF-8\"?><a>asdf<asdf/>asdf2</a>"
 } [
     default-prolog
     "asdf"