Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitc614c82

Browse files
authored
Merge pull request#5207 from sjrd/cleanup-test-files
Some cleanups in the test suite.
2 parents264f1e9 +1e15bdc commitc614c82

File tree

15 files changed

+2168
-2220
lines changed

15 files changed

+2168
-2220
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/compiler/OptimizerTest.scala

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import org.junit.Assert._
2020
importorg.junit.Assume._
2121

2222
importorg.scalajs.testsuite.utils.AssertThrows.assertThrows
23-
importorg.scalajs.testsuite.utils.Platform._
2423

2524
classOptimizerTest {
2625
importOptimizerTest._
@@ -321,22 +320,16 @@ class OptimizerTest {
321320
}
322321

323322
@TestdeffoldingDoubleWithDecimalAndString():Unit= {
324-
assumeFalse("GCC wrongly optimizes this code", usesClosureCompiler)
325-
326323
assertEquals("1.2323919403474454e+21hello",1.2323919403474454E21+"hello")
327324
assertEquals("hello1.2323919403474454e+21","hello"+1.2323919403474454E21)
328325
}
329326

330327
@TestdeffoldingDoubleThatJVMWouldPrintInScientificNotationAndString():Unit= {
331-
assumeFalse("GCC wrongly optimizes this code", usesClosureCompiler)
332-
333328
assertEquals("123456789012345hello",123456789012345d+"hello")
334329
assertEquals("hello123456789012345","hello"+123456789012345d)
335330
}
336331

337332
@TestdeffoldingDoublesToString():Unit= {
338-
assumeFalse("GCC wrongly optimizes this code", usesClosureCompiler)
339-
340333
@noinlinedeftoStringNoInline(v:Double):String= v.toString
341334
@inlinedeftest(v:Double):Unit=
342335
assertEquals(toStringNoInline(v), v.toString)

‎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
packageorg.scalajs.testsuite.jsinterop
1414

15+
importscala.scalajs.js
16+
1517
importorg.junit.Assert._
1618
importorg.junit.Test
1719

1820
classPrimitivesTest {
1921

22+
@noinline
23+
defassertJSEquals(expected: js.Any,actual: js.Any):Unit= {
24+
assertTrue(s"expected:$expected; but got:$actual",
25+
js.special.strictEquals(actual, expected))
26+
}
27+
28+
@TestdefprimitivesToJSAny():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
@TestdefjavaBoxedTypesToJSAny():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)
[8]ページ先頭
©2009-2025 Movatter.jp