@@ -55,14 +55,14 @@ class UtilityTest {
}
@Test
- def issue90: Unit = {
- val x =
+ def issue90(): Unit = {
+ val x: Elem =
assertEquals("", Utility.serialize(x, minimizeTags = MinimizeMode.Always).toString)
}
@Test
- def issue183: Unit = {
- val x =
+ def issue183(): Unit = {
+ val x: Elem =
assertEquals("", Utility.serialize(x, stripComments = true).toString)
assertEquals("", Utility.serialize(x, stripComments = false).toString)
}
@@ -81,7 +81,7 @@ class UtilityTest {
Utility.Escapes.escMap.keys.toSeq
@Test
- def escapePrintablesTest: Unit = {
+ def escapePrintablesTest(): Unit = {
for {
char <- printableAscii.diff(escapedChars)
} yield {
@@ -90,7 +90,7 @@ class UtilityTest {
}
@Test
- def escapeEscapablesTest: Unit = {
+ def escapeEscapablesTest(): Unit = {
for {
char <- escapedChars
} yield {
@@ -99,7 +99,7 @@ class UtilityTest {
}
@Test
- def escapeAsciiControlCharsTest: Unit = {
+ def escapeAsciiControlCharsTest(): Unit = {
/* Escapes that Scala (Java) doesn't support.
* \u0007 -> \a (bell)
@@ -107,18 +107,18 @@ class UtilityTest {
* \u000B -> \v (vertical tab)
* \u007F -> DEL (delete)
*/
- val input = " \u0007\b\u001B\f\n\r\t\u000B\u007F"
+ val input: String = " \u0007\b\u001B\f\n\r\t\u000B\u007F"
- val expect = " \n\r\t\u007F"
+ val expect: String = " \n\r\t\u007F"
- val result = Utility.escape(input)
+ val result: String = Utility.escape(input)
assertEquals(printfc(expect), printfc(result)) // Pretty,
assertEquals(expect, result) // but verify.
}
@Test
- def escapeUnicodeExtendedControlCodesTest: Unit = {
+ def escapeUnicodeExtendedControlCodesTest(): Unit = {
for {
char <- '\u0080' to '\u009f' // Extended control codes (C1)
} yield {
@@ -127,7 +127,7 @@ class UtilityTest {
}
@Test
- def escapeUnicodeTwoBytesTest: Unit = {
+ def escapeUnicodeTwoBytesTest(): Unit = {
for {
char <- '\u00A0' to '\u07FF' // Two bytes (cont.)
} yield {
@@ -136,7 +136,7 @@ class UtilityTest {
}
@Test
- def escapeUnicodeThreeBytesTest: Unit = {
+ def escapeUnicodeThreeBytesTest(): Unit = {
for {
char <- '\u0800' to '\uFFFF' // Three bytes
} yield {
@@ -151,7 +151,7 @@ class UtilityTest {
*
* Or think of `printf("%c", i)` in C, but a little better.
*/
- def printfc(str: String) = {
+ def printfc(str: String): String = {
str.map(prettyChar).mkString
}
@@ -197,26 +197,26 @@ class UtilityTest {
(key: Char) => key.toString
}
- def issue73StartsWithAndEndsWithWSInFirst: Unit = {
- val x = {Text(" My name is ")}{Text("Harry")}
+ def issue73StartsWithAndEndsWithWSInFirst(): Unit = {
+ val x: Elem = {Text(" My name is ")}{Text("Harry")}
assertEquals(My name is Harry
, Utility.trim(x))
}
@Test
- def issue73EndsWithWSInLast: Unit = {
- val x = {Text("My name is ")}{Text("Harry ")}
+ def issue73EndsWithWSInLast(): Unit = {
+ val x: Elem = {Text("My name is ")}{Text("Harry ")}
assertEquals(My name is Harry
, Utility.trim(x))
}
@Test
- def issue73HasWSInMiddle: Unit = {
- val x = {Text("My name is")}{Text(" ")}{Text("Harry")}
+ def issue73HasWSInMiddle(): Unit = {
+ val x: Elem = {Text("My name is")}{Text(" ")}{Text("Harry")}
assertEquals(My name is Harry
, Utility.trim(x))
}
@Test
- def issue73HasWSEverywhere: Unit = {
- val x = {Text(" My name ")}{Text(" is ")}{Text(" Harry ")}
+ def issue73HasWSEverywhere(): Unit = {
+ val x: Elem = {Text(" My name ")}{Text(" is ")}{Text(" Harry ")}
assertEquals(My name is Harry
, Utility.trim(x))
}
}
diff --git a/shared/src/test/scala/scala/xml/XMLEmbeddingTest.scala b/shared/src/test/scala/scala/xml/XMLEmbeddingTest.scala
index 398ab6dde..746513ee1 100644
--- a/shared/src/test/scala/scala/xml/XMLEmbeddingTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLEmbeddingTest.scala
@@ -6,13 +6,12 @@ import org.junit.Assert.assertEquals
class XMLEmbeddingTest {
@Test
- def basic: Unit = {
- val ya = {{
+ def basic(): Unit = {
+ val ya: Elem = {{
assertEquals("{", ya.text)
- val ua = }}
+ val ua: Elem = }}
assertEquals("}", ua.text)
- val za = {{}}{{}}{{}}
+ val za: Elem = {{}}{{}}{{}}
assertEquals("{}{}{}", za.text)
}
-
}
diff --git a/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala b/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
index 700709f29..9f873abc3 100644
--- a/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLSyntaxTest.scala
@@ -14,37 +14,37 @@ class XMLSyntaxTest {
@Test
def test1(): Unit = {
- val xNull = {null} // these used to be Atom(unit), changed to empty children
+ val xNull: Elem = {null} // these used to be Atom(unit), changed to empty children
assertTrue(xNull.child sameElements Nil)
- val x0 = {} // these used to be Atom(unit), changed to empty children
- val x00 = { } // dto.
- val xa = { "world" }
+ val x0: Elem = {} // these used to be Atom(unit), changed to empty children
+ val x00: Elem = { } // dto.
+ val xa: Elem = { "world" }
assertTrue(x0.child sameElements Nil)
assertTrue(x00.child sameElements Nil)
assertEquals("world", handle[String](xa))
- val xb = { 1.5 }
+ val xb: Elem = { 1.5 }
assertEquals(1.5, handle[Double](xb), 0.0)
- val xc = { 5 }
+ val xc: Elem = { 5 }
assertEquals(5, handle[Int](xc).toLong)
- val xd = { true }
+ val xd: Elem = { true }
assertEquals(true, handle[Boolean](xd))
- val xe = { 5:Short }
+ val xe: Elem = { 5:Short }
assertEquals((5:Short).toLong, handle[Short](xe).toLong)
- val xf = { val x = 27; x }
+ val xf: Elem = { val x = 27; x }
assertEquals(27, handle[Int](xf).toLong)
- val xg = { List(1,2,3,4) }
+ val xg: Elem = { List(1,2,3,4) }
assertEquals("1 2 3 4", xg.toString)
assertFalse(xg.child.map(_.isInstanceOf[Text]).exists(identity))
- val xh = { for(x <- List(1,2,3,4) if x % 2 == 0) yield x }
+ val xh: Elem = { for(x <- List(1,2,3,4) if x % 2 == 0) yield x }
assertEquals("2 4", xh.toString)
assertFalse(xh.child.map(_.isInstanceOf[Text]).exists(identity))
}
@@ -55,12 +55,11 @@ class XMLSyntaxTest {
@Test
def test2(): Unit = {
val x1: Option[Seq[Node]] = Some(hello)
- val n1 =
+ val n1: Elem =
assertEquals(x1, n1.attribute("key"))
val x2: Option[Seq[Node]] = None
- val n2 =
+ val n2: Elem =
assertEquals(x2, n2.attribute("key"))
}
-
}
diff --git a/shared/src/test/scala/scala/xml/XMLTest.scala b/shared/src/test/scala/scala/xml/XMLTest.scala
index f57aeb2fa..4de79b799 100644
--- a/shared/src/test/scala/scala/xml/XMLTest.scala
+++ b/shared/src/test/scala/scala/xml/XMLTest.scala
@@ -6,45 +6,45 @@ import org.junit.{Test => UnitTest}
import org.junit.Assert.assertTrue
import org.junit.Assert.assertFalse
import org.junit.Assert.assertEquals
-// import scala.xml.parsing.ConstructingParser
import java.io.StringWriter
import scala.collection.Iterable
import scala.collection.Seq
+import scala.xml.dtd.{DocType, PublicID}
import scala.xml.Utility.sort
object XMLTest {
- val e: scala.xml.MetaData = Null //Node.NoAttributes
- val sc: scala.xml.NamespaceBinding = TopScope
+ val e: MetaData = Null //Node.NoAttributes
+ val sc: NamespaceBinding = TopScope
}
class XMLTest {
@UnitTest
- def nodeSeq: Unit = {
- val p =
-
-
-
-
+ def nodeSeq(): Unit = {
+ val p: Elem =
+
+
+
+
- val pelems_1 = for (x <- p \ "bar"; y <- p \ "baz") yield {
+ val pelems_1: NodeSeq = 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!")))
+ val pelems_2: NodeSeq = 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 =
+ def queryBooks(): Unit = {
+ val books: Elem =
Blabla
Blubabla
Baaaaaaalabla
- val reviews =
+ val reviews: Elem =
Blabla
@@ -66,7 +66,7 @@ class XMLTest {
- val results1 = new scala.xml.PrettyPrinter(80, 5).formatNodes(
+ val results1: String = new PrettyPrinter(80, 5).formatNodes(
for {
t <- books \\ "title"
r <- reviews \\ "entry" if (r \ "title") xml_== t
@@ -74,7 +74,7 @@ class XMLTest {
{ t }
{ r \ "remarks" }
)
- val results1Expected = """
+ val results1Expected: String = """
| Blabla
| Hallo Welt.
|
@@ -87,17 +87,16 @@ class XMLTest {
assertEquals(results1Expected, results1)
{
- val actual = for (t @ Blabla <- NodeSeq.fromSeq(books.child).toList)
+ val actual: List[Node] = for (t @ Blabla <- NodeSeq.fromSeq(books.child).toList)
yield t
- val expected = List(Blabla)
+ val expected: List[Elem] = List(Blabla)
assertEquals(expected, actual)
}
-
}
@UnitTest
- def queryPhoneBook: Unit = {
- val phoneBook =
+ def queryPhoneBook(): Unit = {
+ val phoneBook: Elem =
This is thephonebook
@@ -112,7 +111,7 @@ class XMLTest {