Skip to content

Remove test duplication #133

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2017
Merged

Remove test duplication #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3187670
Move js tests to shared
OlivierBlanvillain Feb 4, 2017
0e43f6b
Remove two empty test classes (these tested nothing)
OlivierBlanvillain Feb 4, 2017
2eafecb
Remove duplicated shared/jvm tests, prepend JVM to test classes when …
OlivierBlanvillain Feb 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 0 additions & 58 deletions js/src/test/scala/scala/xml/ReuseNodesTest.scala
View file
Open in desktop

This file was deleted.

19 changes: 0 additions & 19 deletions js/src/test/scala/scala/xml/pull/XMLEventReaderTest.scala
View file
Open in desktop

This file was deleted.

57 changes: 1 addition & 56 deletions jvm/src/test/scala/scala/xml/XMLSyntaxTest.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
Loading