From 3187670ae8fa4a22fb52180afabfe308d8daf365 Mon Sep 17 00:00:00 2001
From: Olivier Blanvillain <olivier.blanvillain@gmail.com>
Date: Sat, 4 Feb 2017 21:36:18 +0100
Subject: [PATCH 1/3] Move js tests to shared

---
 {js => shared}/src/test/scala/scala/xml/ReuseNodesTest.scala      | 0
 {js => shared}/src/test/scala/scala/xml/XMLSyntaxTest.scala       | 0
 {js => shared}/src/test/scala/scala/xml/XMLTest.scala             | 0
 .../src/test/scala/scala/xml/parsing/PiParsingTest.scala          | 0
 .../src/test/scala/scala/xml/parsing/Ticket0632Test.scala         | 0
 .../src/test/scala/scala/xml/pull/XMLEventReaderTest.scala        | 0
 6 files changed, 0 insertions(+), 0 deletions(-)
 rename {js => shared}/src/test/scala/scala/xml/ReuseNodesTest.scala (100%)
 rename {js => shared}/src/test/scala/scala/xml/XMLSyntaxTest.scala (100%)
 rename {js => shared}/src/test/scala/scala/xml/XMLTest.scala (100%)
 rename {js => shared}/src/test/scala/scala/xml/parsing/PiParsingTest.scala (100%)
 rename {js => shared}/src/test/scala/scala/xml/parsing/Ticket0632Test.scala (100%)
 rename {js => shared}/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala (100%)

diff --git a/js/src/test/scala/scala/xml/ReuseNodesTest.scala b/shared/src/test/scala/scala/xml/ReuseNodesTest.scala
similarity index 100%
rename from js/src/test/scala/scala/xml/ReuseNodesTest.scala
rename to shared/src/test/scala/scala/xml/ReuseNodesTest.scala
diff --git a/js/src/test/scala/scala/xml/XMLSyntaxTest.scala b/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
similarity index 100%
rename from js/src/test/scala/scala/xml/XMLSyntaxTest.scala
rename to shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
diff --git a/js/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala
similarity index 100%
rename from js/src/test/scala/scala/xml/XMLTest.scala
rename to shared/src/test/scala/scala/xml/XMLTest.scala
diff --git a/js/src/test/scala/scala/xml/parsing/PiParsingTest.scala b/shared/src/test/scala/scala/xml/parsing/PiParsingTest.scala
similarity index 100%
rename from js/src/test/scala/scala/xml/parsing/PiParsingTest.scala
rename to shared/src/test/scala/scala/xml/parsing/PiParsingTest.scala
diff --git a/js/src/test/scala/scala/xml/parsing/Ticket0632Test.scala b/shared/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
similarity index 100%
rename from js/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
rename to shared/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
diff --git a/js/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala b/shared/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
similarity index 100%
rename from js/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
rename to shared/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala

From 0e43f6be172113a057961ebd11ca43b545026a0d Mon Sep 17 00:00:00 2001
From: Olivier Blanvillain <olivier.blanvillain@gmail.com>
Date: Sat, 4 Feb 2017 21:48:06 +0100
Subject: [PATCH 2/3] Remove two empty test classes (these tested nothing)

---
 .../test/scala/scala/xml/ReuseNodesTest.scala | 58 -------------------
 .../scala/xml/pull/XMLEventReaderTest.scala   | 19 ------
 2 files changed, 77 deletions(-)
 delete mode 100644 shared/src/test/scala/scala/xml/ReuseNodesTest.scala
 delete mode 100644 shared/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala

diff --git a/shared/src/test/scala/scala/xml/ReuseNodesTest.scala b/shared/src/test/scala/scala/xml/ReuseNodesTest.scala
deleted file mode 100644
index 75f67efaf..000000000
--- a/shared/src/test/scala/scala/xml/ReuseNodesTest.scala
+++ /dev/null
@@ -1,58 +0,0 @@
-package scala.xml
-
-import scala.xml.transform._
-import org.junit.Test
-import org.junit.Assert.assertTrue
-import org.junit.Assert.assertEquals
-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
- * 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))
-    }
-    override def transform(n:Node): Seq[Node] = super.transform(n)
-  }
-
-  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
-    }
-    override def transform(n:Node): Seq[Node] = super.transform(n)
-  }
-
-  class AlternateTranformr(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))
-    }
-    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(
-           n.prefix, "changed", n.attributes, n.scope, n.child.isEmpty, n.child : _*)
-      case _ => n
-    }
-  }
-
-}
diff --git a/shared/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala b/shared/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
deleted file mode 100644
index 6cfd4e872..000000000
--- a/shared/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
+++ /dev/null
@@ -1,19 +0,0 @@
-package scala.xml
-package pull
-
-import org.junit.Test
-import org.junit.Assert.{assertFalse, assertTrue}
-
-import scala.io.Source
-import scala.xml.parsing.FatalError
-
-class XMLEventReaderTest {
-
-  val src = Source.fromString("<hello><world/>!</hello>")
-
-  private def toSource(s: String) = new Source {
-    val iter = s.iterator
-    override def reportError(pos: Int, msg: String, out: java.io.PrintStream = Console.err) {}
-  }
-
-}

From 2eafecbdbf58c8c1be530bf0dd4335098092916d Mon Sep 17 00:00:00 2001
From: Olivier Blanvillain <olivier.blanvillain@gmail.com>
Date: Sat, 4 Feb 2017 21:49:25 +0100
Subject: [PATCH 3/3] Remove duplicated shared/jvm tests, prepend JVM to test
 classes when required

Moving jv tests to shared introduced name conflicts on the duplicated calsses, the rename solves that
---
 .../test/scala/scala/xml/XMLSyntaxTest.scala  |  57 +--
 jvm/src/test/scala/scala/xml/XMLTest.scala    | 333 +-----------------
 .../scala/xml/parsing/PiParsingTest.scala     |  13 +-
 .../scala/xml/parsing/Ticket0632Test.scala    |   8 +-
 4 files changed, 6 insertions(+), 405 deletions(-)

diff --git a/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala b/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
index fa250b416..16155bc58 100644
--- a/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
+++ b/jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
@@ -8,62 +8,7 @@ import org.junit.Assert.assertTrue
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertEquals
 
-class XMLSyntaxTest {
-
-  private def handle[A](x: Node): A = {
-    x.child(0).asInstanceOf[Atom[A]].data
-  }
-
-  @Test
-  def test1(): Unit = {
-    val xNull = <hello>{null}</hello> // these used to be Atom(unit), changed to empty children
-    assertTrue(xNull.child sameElements Nil)
-
-    val x0 = <hello>{}</hello> // these used to be Atom(unit), changed to empty children
-    val x00 = <hello>{ }</hello> //  dto.
-    val xa = <hello>{ "world" }</hello>
-
-    assertTrue(x0.child sameElements Nil)
-    assertTrue(x00.child sameElements Nil)
-    assertEquals("world", handle[String](xa))
-
-    val xb = <hello>{ 1.5 }</hello>
-    assertEquals(1.5, handle[Double](xb), 0.0)
-
-    val xc = <hello>{ 5 }</hello>
-    assertEquals(5, handle[Int](xc))
-
-    val xd = <hello>{ true }</hello>
-    assertEquals(true, handle[Boolean](xd))
-
-    val xe = <hello>{ 5:Short }</hello>
-    assertEquals((5:Short), handle[Short](xe))
-
-    val xf = <hello>{ val x = 27; x }</hello>
-    assertEquals(27, handle[Int](xf))
-
-    val xg = <hello>{ List(1,2,3,4) }</hello>
-    assertEquals("<hello>1 2 3 4</hello>", xg.toString)
-    assertFalse(xg.child.map(_.isInstanceOf[Text]).exists(identity))
-
-    val xh = <hello>{ for(x <- List(1,2,3,4) if x % 2 == 0) yield x }</hello>
-    assertEquals("<hello>2 4</hello>", xh.toString)
-    assertFalse(xh.child.map(_.isInstanceOf[Text]).exists(identity))
-  }
-
-  /** see SVN r13821 (emir): support for <elem key={x:Option[Seq[Node]]} />,
-   *  so that Options can be used for optional attributes.
-   */
-  @Test
-  def test2(): Unit = {
-    val x1: Option[Seq[Node]] = Some(<b>hello</b>)
-    val n1 = <elem key={x1} />;
-    assertEquals(x1, n1.attribute("key"))
-
-    val x2: Option[Seq[Node]] = None
-    val n2 = <elem key={x2} />;
-    assertEquals(x2, n2.attribute("key"))
-  }
+class XMLSyntaxTestJVM {
 
   @Test
   def test3(): Unit = {
diff --git a/jvm/src/test/scala/scala/xml/XMLTest.scala b/jvm/src/test/scala/scala/xml/XMLTest.scala
index c86184ffd..aea258486 100644
--- a/jvm/src/test/scala/scala/xml/XMLTest.scala
+++ b/jvm/src/test/scala/scala/xml/XMLTest.scala
@@ -17,212 +17,13 @@ import java.io.StringReader
 import scala.collection.Iterable
 import scala.xml.Utility.sort
 
-object XMLTest {
+object XMLTestJVM {
   val e: scala.xml.MetaData = Null //Node.NoAttributes
   val sc: scala.xml.NamespaceBinding = TopScope
 }
 
-class XMLTest {
-  import XMLTest.{ e, sc }
-
-  @UnitTest
-  def nodeSeq: Unit = {
-    val p = <foo>
-              <bar gt='ga' value="3"/>
-              <baz bazValue="8"/>
-              <bar value="5" gi='go'/>
-            </foo>
-
-    val pelems_1 = for (x <- p \ "bar"; y <- p \ "baz") yield {
-      Text(x.attributes("value").toString + y.attributes("bazValue").toString + "!")
-    };
-
-    val pelems_2 = NodeSeq.fromSeq(List(Text("38!"), Text("58!")));
-    assertTrue(pelems_1 sameElements pelems_2)
-    assertTrue(Text("8") sameElements (p \\ "@bazValue"))
-  }
-
-  @UnitTest
-  def queryBooks: Unit = {
-    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>;
-
-    val results1 = new scala.xml.PrettyPrinter(80, 5).formatNodes(
-      for (
-        t <- books \\ "title";
-        r <- reviews \\ "entry" if (r \ "title") xml_== t
-      ) yield <result>
-                { t }
-                { r \ "remarks" }
-              </result>);
-    val results1Expected = """<result>
-    |     <title>Blabla</title>
-    |     <remarks> Hallo Welt. </remarks>
-    |</result><result>
-    |     <title>Blubabla</title>
-    |     <remarks> Hello Blu </remarks>
-    |</result><result>
-    |     <title>Blubabla</title>
-    |     <remarks> rem 2 </remarks>
-    |</result>""".stripMargin
-    assertEquals(results1Expected, results1)
-
-    {
-      val actual = for (t @ <book><title>Blabla</title></book> <- NodeSeq.fromSeq(books.child).toList)
-        yield t
-      val expected = List(<book><title>Blabla</title></book>)
-      assertEquals(expected, actual)
-    }
-
-  }
-
-  @UnitTest
-  def queryPhoneBook: Unit = {
-    val phoneBook =
-      <phonebook>
-        <descr>
-          This is the<b>phonebook</b>
-          of the
-          <a href="http://acme.org">ACME</a>
-          corporation.
-        </descr>
-        <entry>
-          <name>John</name>
-          <phone where="work">  +41 21 693 68 67</phone>
-          <phone where="mobile">+41 79 602 23 23</phone>
-        </entry>
-      </phonebook>;
-
-    val addrBook =
-      <addrbook>
-        <descr>
-          This is the<b>addressbook</b>
-          of the
-          <a href="http://acme.org">ACME</a>
-          corporation.
-        </descr>
-        <entry>
-          <name>John</name>
-          <street> Elm Street</street>
-          <city>Dolphin City</city>
-        </entry>
-      </addrbook>;
-
-    val actual: String = new scala.xml.PrettyPrinter(80, 5).formatNodes(
-      for (
-        t <- addrBook \\ "entry";
-        r <- phoneBook \\ "entry" if (t \ "name") xml_== (r \ "name")
-      ) yield <result>
-                { t.child }
-                { r \ "phone" }
-              </result>)
-    val expected = """|<result>
-      |     <name>John</name>
-      |     <street> Elm Street</street>
-      |     <city>Dolphin City</city>
-      |     <phone where="work"> +41 21 693 68 67</phone>
-      |     <phone where="mobile">+41 79 602 23 23</phone>
-      |</result>""".stripMargin
-    assertEquals(expected, actual)
-  }
-
-  @UnitTest
-  def namespaces: Unit = {
-    val cuckoo = <cuckoo xmlns="http://cuckoo.com">
-                   <foo/>
-                   <bar/>
-                 </cuckoo>;
-    assertEquals("http://cuckoo.com", cuckoo.namespace)
-    for (n <- cuckoo \ "_") {
-      assertEquals("http://cuckoo.com", n.namespace)
-    }
-  }
-
-  @UnitTest
-  def namespacesWithNestedXmls: Unit = {
-    val foo = <f:foo xmlns:f="fooUrl"></f:foo>
-    val bar = <b:bar xmlns:b="barUrl">{foo}</b:bar>
-    val expected = """<b:bar xmlns:b="barUrl"><f:foo xmlns:f="fooUrl"></f:foo></b:bar>"""
-    val actual = bar.toString
-    assertEquals(expected, actual)
-  }
-
-  @UnitTest
-  def validationOfElements: Unit = {
-    val vtor = new scala.xml.dtd.ElementValidator();
-    {
-      import scala.xml.dtd.ELEMENTS
-      import scala.xml.dtd.ContentModel._
-      vtor.setContentModel(
-        ELEMENTS(
-          Sequ(
-            Letter(ElemName("bar")),
-            Star(Letter(ElemName("baz"))))));
-    }
-    assertTrue(vtor(<foo><bar/><baz/><baz/></foo>))
-
-    {
-      import scala.xml.dtd.MIXED
-      import scala.xml.dtd.ContentModel._
-
-      vtor.setContentModel(
-        MIXED(
-          Alt(Letter(ElemName("bar")),
-            Letter(ElemName("baz")),
-            Letter(ElemName("bal")))));
-    }
-
-    assertTrue(vtor(<foo><bar/><baz/><baz/></foo>))
-    assertTrue(vtor(<foo>ab<bar/>cd<baz/>ed<baz/>gh</foo>))
-    assertFalse(vtor(<foo> <ugha/> <bugha/> </foo>))
-  }
-
-  def validationfOfAttributes: Unit = {
-    val vtor = new scala.xml.dtd.ElementValidator();
-    vtor.setContentModel(null)
-    vtor.setMetaData(List())
-    assertFalse(vtor(<foo bar="hello"/>))
-
-    {
-      import scala.xml.dtd._
-      vtor setMetaData List(AttrDecl("bar", "CDATA", IMPLIED))
-    }
-    assertFalse(vtor(<foo href="http://foo.com" bar="hello"/>))
-    assertTrue(vtor(<foo bar="hello"/>))
-
-    {
-      import scala.xml.dtd._
-      vtor.setMetaData(List(AttrDecl("bar", "CDATA", REQUIRED)))
-    }
-    assertFalse(vtor(<foo href="http://foo.com"/>))
-    assertTrue(vtor(<foo bar="http://foo.com"/>))
-  }
+class XMLTestJVM {
+  import XMLTestJVM.{ e, sc }
 
   def Elem(prefix: String, label: String, attributes: MetaData, scope: NamespaceBinding, child: Node*): Elem =
     scala.xml.Elem.apply(prefix, label, attributes, scope, minimizeEmpty = true, child: _*)
@@ -344,21 +145,6 @@ class XMLTest {
         Elem(null, "title", e, sc, Text("Foundations of Programming Languages"))))
   }
 
-  @UnitTest
-  def groupNode = {
-    val zx1: Node = Group { <a/><b/><c/> }
-    val zy1: Node = <f>{ zx1 }</f>
-    assertEquals("<f><a/><b/><c/></f>", zy1.toString)
-
-    assertEquals("<a/><f><a/><b/><c/></f><a/><b/><c/>",
-      Group { List(<a/>, zy1, zx1) }.toString)
-
-    val zz1 = <xml:group><a/><b/><c/></xml:group>
-
-    assertTrue(zx1 xml_== zz1)
-    assertTrue(zz1.length == 3)
-  }
-
   @UnitTest
   def unparsed = {
     //    println("attribute value normalization")
@@ -386,119 +172,6 @@ class XMLTest {
     assertTrue(n.attributes.get("BAR", n, "attr").nonEmpty)
   }
 
-  @UnitTest
-  def dodgyNamespace = {
-    val x = <flog xmlns:ee="http://ee.com"><foo xmlns:dog="http://dog.com"><dog:cat/></foo></flog>
-    assertTrue(x.toString.matches(".*xmlns:dog=\"http://dog.com\".*"));
-  }
-
-  import NodeSeq.seqToNodeSeq
-
-  val ax = <hello foo="bar" x:foo="baz" xmlns:x="the namespace from outer space">
-             <world/>
-           </hello>
-
-  val cx = <z:hello foo="bar" xmlns:z="z" x:foo="baz" xmlns:x="the namespace from outer space">
-             crazy text world
-           </z:hello>
-
-  val bx = <hello foo="bar&amp;x"></hello>
-
-  @UnitTest
-  def XmlEx = {
-    assertTrue((ax \ "@foo") xml_== "bar") // uses NodeSeq.view!
-    assertTrue((ax \ "@foo") xml_== xml.Text("bar")) // dto.
-    assertTrue((bx \ "@foo") xml_== "bar&x") // dto.
-    assertTrue((bx \ "@foo") xml_sameElements List(xml.Text("bar&x")))
-    assertTrue("<hello foo=\"bar&amp;x\"></hello>" == bx.toString)
-  }
-
-  @UnitTest
-  def XmlEy {
-    val z = ax \ "@{the namespace from outer space}foo"
-    assertTrue((ax \ "@{the namespace from outer space}foo") xml_== "baz")
-    assertTrue((cx \ "@{the namespace from outer space}foo") xml_== "baz")
-
-    try {
-      ax \ "@"
-      assertTrue(false)
-    } catch {
-      case _: IllegalArgumentException =>
-    }
-    try {
-      ax \ "@{"
-      assertTrue(false)
-    } catch {
-      case _: IllegalArgumentException =>
-    }
-    try {
-      ax \ "@{}"
-      assertTrue(false)
-    } catch {
-      case _: IllegalArgumentException =>
-    }
-
-  }
-
-  @UnitTest
-  def comment =
-    assertEquals("<!-- thissa comment -->", <!-- thissa comment --> toString)
-
-  @UnitTest
-  def weirdElem =
-    assertEquals("<?this is a pi foo bar = && {{ ?>", <?this is a pi foo bar = && {{ ?> toString)
-
-  @UnitTest
-  def escape =
-    assertEquals("""
- &quot;Come, come again, whoever you are, come!
-Heathen, fire worshipper or idolatrous, come!
-Come even if you broke your penitence a hundred times,
-Ours is the portal of hope, come as you are.&quot;
-                              Mevlana Celaleddin Rumi""", <![CDATA[
- "Come, come again, whoever you are, come!
-Heathen, fire worshipper or idolatrous, come!
-Come even if you broke your penitence a hundred times,
-Ours is the portal of hope, come as you are."
-                              Mevlana Celaleddin Rumi]]> toString) // this guy will escaped, and rightly so
-
-  @UnitTest
-  def unparsed2 = {
-    object myBreak extends scala.xml.Unparsed("<br />")
-    assertEquals("<foo><br /></foo>", <foo>{ myBreak }</foo> toString) // shows use of unparsed
-  }
-
-  @UnitTest
-  def justDontFail = {
-    <x:foo xmlns:x="gaga"/> match {
-      case scala.xml.QNode("gaga", "foo", md, child @ _*) =>
-    }
-
-    <x:foo xmlns:x="gaga"/> match {
-      case scala.xml.Node("foo", md, child @ _*) =>
-    }
-  }
-
-  @UnitTest
-  def ioPosition = {
-    val out = new ByteArrayOutputStream
-    Console.withErr(out) {
-      Console.withOut(out) {
-        try {
-          xml.parsing.ConstructingParser.fromSource(io.Source.fromString("<foo>"), false).document()
-        } catch {
-          case e: Exception => println(e.getMessage)
-        }
-      }
-    }
-    out.flush()
-    assertEquals(
-      """:1:5: '/' expected instead of ''    ^
-:1:5: name expected, but char '' cannot start a name    ^
-expected closing tag of foo
-""", out.toString)
-  }
-
   def f(s: String) = {
     <entry>
       {
diff --git a/jvm/src/test/scala/scala/xml/parsing/PiParsingTest.scala b/jvm/src/test/scala/scala/xml/parsing/PiParsingTest.scala
index e9769d374..d002eeb36 100644
--- a/jvm/src/test/scala/scala/xml/parsing/PiParsingTest.scala
+++ b/jvm/src/test/scala/scala/xml/parsing/PiParsingTest.scala
@@ -6,7 +6,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import scala.xml.JUnitAssertsForXML.assertEquals
 
-class PiParsingTest {
+class PiParsingTestJVM {
 
 
   import scala.io.Source.fromString
@@ -21,12 +21,6 @@ class PiParsingTest {
     assertEquals(expected, parseNoWS("<foo>a<?pi?>b</foo>"))
   }
 
-  @Test
-  def piNoWSLiteral: Unit = {
-    val expected = "<foo>a<?pi?>b</foo>"
-    assertEquals(expected, <foo>a<?pi?>b</foo>)
-  }
-
   @Test
   def piNoWSloadString: Unit = {
     val expected = "<foo>a<?pi?>b</foo>"
@@ -44,10 +38,5 @@ class PiParsingTest {
     val expected = "<foo> a <?pi?> b </foo>"
     assertEquals(expected, xml.XML.loadString("<foo> a <?pi?> b </foo>"))
   }
-  @Test
-  def piLiteral: Unit = {
-    val expected = "<foo> a <?pi?> b </foo>"
-    assertEquals(expected, <foo> a <?pi?> b </foo>)
-  }
 
 }
diff --git a/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala b/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
index 7a6b71a71..3691071fa 100644
--- a/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
+++ b/jvm/src/test/scala/scala/xml/parsing/Ticket0632Test.scala
@@ -6,7 +6,7 @@ import org.junit.runner.RunWith
 import org.junit.runners.JUnit4
 import scala.xml.JUnitAssertsForXML.assertEquals
 
-class Ticket0632Test {
+class Ticket0632TestJVM {
 
   import scala.io.Source.fromString
   import scala.xml.parsing.ConstructingParser.fromSource
@@ -18,8 +18,6 @@ class Ticket0632Test {
     val expected = "<foo x=\"&amp;\"/>"
     assertEquals(expected, parse("<foo x='&amp;'/>"))
     assertEquals(expected, xml.XML.loadString("<foo x='&amp;'/>"))
-    assertEquals(expected, <foo x="&amp;"/>)
-    assertEquals(expected, <foo x={ "&" }/>)
   }
 
   @Test
@@ -27,8 +25,6 @@ class Ticket0632Test {
     val expected = "<foo x=\"&amp;amp;\"/>"
     assertEquals(expected, xml.XML.loadString("<foo x='&amp;amp;'/>"))
     assertEquals(expected, parse("<foo x='&amp;amp;'/>"))
-    assertEquals(expected, <foo x="&amp;amp;"/>)
-    assertEquals(expected, <foo x={ "&amp;" }/>)
   }
 
   @Test
@@ -36,8 +32,6 @@ class Ticket0632Test {
     val expected = "<foo x=\"&amp;&amp;\"/>"
     assertEquals(expected, xml.XML.loadString("<foo x='&amp;&amp;'/>"))
     assertEquals(expected, parse("<foo x='&amp;&amp;'/>"))
-    assertEquals(expected, <foo x="&amp;&amp;"/>)
-    assertEquals(expected, <foo x={ "&&" }/>)
   }
 
 }