Move /src → xml/jvm/src, split test between xml/jvm and xml/shared

Author: OlivierBlanvillain

Diff for: src/test/scala/scala/xml/CompilerErrors.scala renamed to xml/jvm/src/test/scala/scala/xml/CompilerErrors.scala

@@ -10,19 +10,19 @@ import org.junit.experimental.theories.DataPoints
 import org.junit.runner.RunWith
 /**
  * This test verify that after the tranform, the resultant xml node
- * uses as many old nodes as possible. 
- * 
- * Three transformers class for case - 
- * One for orginal, one for modified, and one proposed which shows 
+ * uses as many old nodes as possible.
+ *
+ * Three transformers class for case -
+ * One for orginal, one for modified, and one proposed which shows
  * all are equivalent when it comes to reusing as many nodes as possible
  */
 object ReuseNodesTest {
- 
+
   class OriginalTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
     override def transform(ns: Seq[Node]): Seq[Node] = {
       val xs = ns.toStream map transform
       val (xs1, xs2) = xs zip ns span { case (x, n) => unchanged(n, x) }
-       
+
       if (xs2.isEmpty) ns
       else (xs1 map (_._2)) ++ xs2.head._1 ++ transform(ns drop (xs1.length + 1))
     }
@@ -32,7 +32,7 @@ object ReuseNodesTest {
   class ModifiedTranformr(rules: RewriteRule*) extends RuleTransformer(rules:_*) {
     override def transform(ns: Seq[Node]): Seq[Node] = {
       val changed = ns flatMap transform
-      
+
       if (changed.length != ns.length || (changed, ns).zipped.exists(_ != _)) changed
       else ns
     }
@@ -43,13 +43,13 @@ object ReuseNodesTest {
     override def transform(ns: Seq[Node]): Seq[Node] = {
       val xs = ns.toStream map transform
       val (xs1, xs2) = xs zip ns span { case (x, n) => unchanged(n, x) }
-       
+
       if (xs2.isEmpty) ns
       else (xs1 map (_._2)) ++ xs2.head._1 ++ transform(ns drop (xs1.length + 1))
     }
     override def transform(n:Node): Seq[Node] = super.transform(n)
   }
-   
+
   def rewriteRule = new RewriteRule {
     override def transform(n: Node): NodeSeq = n match {
       case n if n.label == "change" => Elem(
@@ -58,7 +58,7 @@ object ReuseNodesTest {
     }
   }
 
-  @DataPoints 
+  @DataPoints
   def tranformers() = Array(
       new OriginalTranformr(rewriteRule),
       new ModifiedTranformr(rewriteRule),
@@ -67,40 +67,41 @@ object ReuseNodesTest {
 
 @RunWith(classOf[Theories])
 class ReuseNodesTest {
-   
+
   @Theory
-  def transformReferentialEquality(rt:RuleTransformer) = { 
+  def transformReferentialEquality(rt:RuleTransformer) = {
     val original = <p><lost/></p>
     val tranformed = rt.transform(original)
     assertTrue(original eq tranformed)
   }
-      
+
   @Theory
-  def transformReferentialEqualityOnly(rt:RuleTransformer) = { 
+  def transformReferentialEqualityOnly(rt:RuleTransformer) = {
     val original = <changed><change><lost/><a><b><c/></b></a></change><a><b><c/></b></a></changed>
     val transformed = rt.transform(original)
     recursiveAssert(original,transformed)
   }
-  
+
   def recursiveAssert(original:Seq[Node], transformed:Seq[Node]):Unit = {
     (original.toList,transformed.toList) match {
       case (Nil, Nil) => {}
-      case (x::xs,y::ys) => { 
+      case (x::xs,y::ys) => {
         recursiveAssert(x,y)
         recursiveAssert(xs,ys)
       }
-    } 
+      case _ => {}
+    }
   }
-  
+
   def recursiveAssert(original:Node, transformed:Node):Unit = {
-    transformed.label match { 
+    transformed.label match {
       case "changed" => // do nothing expect this node to be changed
         recursiveAssert(original.child,transformed.child)
       case _ => {
         assertTrue(original eq transformed)
-        // No need to check for childrens, node being immuatable 
+        // No need to check for childrens, node being immuatable
         // childs can't be differnt if parents are refertially equal
       }
     }
   }
-}
+}

Diff for: src/test/scala/scala/xml/ReuseNodesTest.scala renamed to xml/jvm/src/test/scala/scala/xml/ReuseNodesTest.scala

@@ -17,6 +17,7 @@ import java.lang.Thread
 
 import scala.collection.Iterator
 
+
 /**
  * Mutable storage of immutable xml trees. Everything is kept in memory,
  *  with a thread periodically checking for changes and writing to file.
@@ -96,7 +97,7 @@ abstract class CachedFileStorage(private val file1: File) extends Thread {
     val c = fos.getChannel()
 
     // @todo: optimize
-    val storageNode = <nodes>{ nodes.toList }</nodes>
+    val storageNode = <nodes>{nodes.toList}</nodes>
     val w = Channels.newWriter(c, "utf-8")
     XML.write(w, storageNode, "utf-8", xmlDecl = true, doctype = null)