Skip to content

Commit 6013f01

Browse files
committed
Cleanup historical artifacts in the JS compiler tests.
* Move things to the shared compiled tests where possible. * Fix tests that were moot because the compiler was constant-folding them away.
1 parent 37df9c2 commit 6013f01

File tree

11 files changed

+238
-292
lines changed

11 files changed

+238
-292
lines changed

test-suite/js/src/test/scala/org/scalajs/testsuite/compiler/BooleanJSTest.scala

Lines changed: 0 additions & 29 deletions
This file was deleted.

test-suite/js/src/test/scala/org/scalajs/testsuite/compiler/DefaultMethodsJSTest.scala

Lines changed: 0 additions & 38 deletions
This file was deleted.

test-suite/js/src/test/scala/org/scalajs/testsuite/compiler/FloatJSTest.scala

Lines changed: 0 additions & 93 deletions
This file was deleted.

test-suite/js/src/test/scala/org/scalajs/testsuite/compiler/IntJSTest.scala

Lines changed: 0 additions & 62 deletions
This file was deleted.

test-suite/js/src/test/scala/org/scalajs/testsuite/compiler/LongJSTest.scala

Lines changed: 0 additions & 38 deletions
This file was deleted.

test-suite/js/src/test/scala/org/scalajs/testsuite/jsinterop/PrimitivesTest.scala

Lines changed: 32 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -12,32 +12,50 @@
1212

1313
package org.scalajs.testsuite.jsinterop
1414

15+
import scala.scalajs.js
16+
1517
import org.junit.Assert._
1618
import org.junit.Test
1719

1820
class PrimitivesTest {
1921

22+
@noinline
23+
def assertJSEquals(expected: js.Any, actual: js.Any): Unit = {
24+
assertTrue(s"expected: $expected; but got: $actual",
25+
js.special.strictEquals(actual, expected))
26+
}
27+
28+
@Test def primitivesToJSAny(): Unit = {
29+
assertJSEquals(false, false)
30+
assertJSEquals(42, 42.toByte)
31+
assertJSEquals(42, 42.toShort)
32+
assertJSEquals(42, 42)
33+
assertJSEquals(42.0, 42L) // converted to Double!
34+
assertJSEquals(42.0f, 42.0f)
35+
assertJSEquals(42.0, 42.0)
36+
}
37+
2038
@Test def javaBoxedTypesToJSAny(): Unit = {
21-
assertEquals(false, new java.lang.Boolean(false))
22-
assertNull(null: java.lang.Boolean)
39+
assertJSEquals(false, new java.lang.Boolean(false))
40+
assertJSEquals(null, null: java.lang.Boolean)
2341

24-
assertEquals(42, new java.lang.Byte(42.toByte))
25-
assertNull(null: java.lang.Byte)
42+
assertJSEquals(42, new java.lang.Byte(42.toByte))
43+
assertJSEquals(null, null: java.lang.Byte)
2644

27-
assertEquals(42, new java.lang.Short(42.toShort))
28-
assertNull(null: java.lang.Short)
45+
assertJSEquals(42, new java.lang.Short(42.toShort))
46+
assertJSEquals(null, null: java.lang.Short)
2947

30-
assertEquals(42, new java.lang.Integer(42))
31-
assertNull(null: java.lang.Integer)
48+
assertJSEquals(42, new java.lang.Integer(42))
49+
assertJSEquals(null, null: java.lang.Integer)
3250

33-
assertEquals(42L, new java.lang.Long(42L))
34-
assertNull(null: java.lang.Long)
51+
assertJSEquals(42.0, new java.lang.Long(42L)) // converted to Double!
52+
assertJSEquals(null, null: java.lang.Long)
3553

36-
assertEquals(42.0f, new java.lang.Float(42.0f), 0.0f)
37-
assertNull(null: java.lang.Float)
54+
assertJSEquals(42.0f, new java.lang.Float(42.0f))
55+
assertJSEquals(null, null: java.lang.Float)
3856

39-
assertEquals(42.0, new java.lang.Double(42.0), 0.0)
40-
assertNull(null: java.lang.Double)
57+
assertJSEquals(42.0, new java.lang.Double(42.0))
58+
assertJSEquals(null, null: java.lang.Double)
4159
}
4260

4361
}

0 commit comments

Comments
 (0)