summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
Diffstat (limited to 'test/files')
-rw-r--r--test/files/jvm/xmlLiterals.scala2
-rw-r--r--test/files/jvm/xmlstuff.check19
-rw-r--r--test/files/jvm/xmlstuff.scala39
3 files changed, 57 insertions, 3 deletions
diff --git a/test/files/jvm/xmlLiterals.scala b/test/files/jvm/xmlLiterals.scala
index c45f2a1cd5..13b2591790 100644
--- a/test/files/jvm/xmlLiterals.scala
+++ b/test/files/jvm/xmlLiterals.scala
@@ -221,7 +221,7 @@ object Test03Servlet {
def main( args:Array[String] ) = {
val x = doGetXML();
Console.println( x );
- Console.println( new PrettyPrinter( 80, 2 ).toPrettyXML( x ));
+ Console.println( new PrettyPrinter( 80, 2 ).format( x ));
}
}
diff --git a/test/files/jvm/xmlstuff.check b/test/files/jvm/xmlstuff.check
index afe3a6839f..f73797cb2a 100644
--- a/test/files/jvm/xmlstuff.check
+++ b/test/files/jvm/xmlstuff.check
@@ -20,3 +20,22 @@ passed ok
passed ok
NodeSeq
passed ok
+<result>
+ <title>Blabla</title>
+ <entry>
+ <title>Blabla</title>
+ <remarks>Hallo Welt.</remarks>
+ </entry>
+</result><result>
+ <title>Blubabla</title>
+ <entry>
+ <title>Blubabla</title>
+ <remarks>Hello Blu</remarks>
+ </entry>
+</result><result>
+ <title>Blubabla</title>
+ <entry>
+ <title>Blubabla</title>
+ <remarks>rem 2</remarks>
+ </entry>
+</result>
diff --git a/test/files/jvm/xmlstuff.scala b/test/files/jvm/xmlstuff.scala
index ff6c2e03ed..3954f6f383 100644
--- a/test/files/jvm/xmlstuff.scala
+++ b/test/files/jvm/xmlstuff.scala
@@ -138,7 +138,7 @@ object Test with Application {
);
- assertSameElements(
+ assertEquals(
new NodeSeq(List( parsedxml2 )) \\ "_",
@@ -192,6 +192,41 @@ object Test with Application {
x.attribute("value") + y.attribute("bazValue")+ "!"
},
new NodeSeq(List(Text("38!"),Text("58!")))
- )
+ );
+
+ val books =
+ <bks>
+ <book><title>Blabla</title></book>
+ <book><title>Blubabla</title></book>
+ <book><title>Baaaaaaalabla</title></book>
+ </bks>;
+
+ val reviews =
+ <reviews>
+ <entry><title>Blabla</title>
+ <remarks>
+ Hallo Welt.
+ </remarks>
+ </entry>
+ <entry><title>Blubabla</title>
+ <remarks>
+ Hello Blu
+ </remarks>
+ </entry>
+ <entry><title>Blubabla</title>
+ <remarks>
+ rem 2
+ </remarks>
+ </entry>
+ </reviews>;
+
+ Console.println( new scala.xml.PrettyPrinter(80, 5).format (
+ for( val t <- books \\ "title";
+ val r <- reviews \\ "entry"; r \ "title" == t ) yield
+ <result>
+ { t }
+ { r }
+ </result>
+ ));
}