Merge pull request #7310 from neshkeev/enable-junit-sjs-tests

nicolasstucki · web-flow · commit 5bcb1ceedc74 · 2019-09-24T21:44:12.000+02:00
Enable junit/* tests for Scala.js
diff --git a/project/Build.scala b/project/Build.scala
@@ -989,6 +989,7 @@ object Build {
           ++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/lang" ** "*.scala").get
           ++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/util" ** (("Base64Test.scala": FileFilter) || "OptionalTest.scala" || "SplittableRandom.scala" || "ObjectsTestOnJDK8.scala" || "ComparatorTestOnJDK8.scala")).get
           ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/utils" ** "*.scala").get
+          ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/junit" ** (("JUnitAnnotationsTest.scala": FileFilter) || "JUnitAssumptionsTest.scala" || "JUnitAssertionsTest.scala")).get
         )
       }
     )

Original file line number	Diff line number	Diff line change
`@@ -989,6 +989,7 @@ object Build {`
`989`	`989`	`++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/lang" ** "*.scala").get`
`990`	`990`	`++ (dir / "shared/src/test/require-jdk8/org/scalajs/testsuite/javalib/util" ** (("Base64Test.scala": FileFilter) \|\| "OptionalTest.scala" \|\| "SplittableRandom.scala" \|\| "ObjectsTestOnJDK8.scala" \|\| "ComparatorTestOnJDK8.scala")).get`
`991`	`991`	`++ (dir / "shared/src/test/scala/org/scalajs/testsuite/utils" ** "*.scala").get`
	`992`	`+ ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/junit" ** (("JUnitAnnotationsTest.scala": FileFilter) \|\| "JUnitAssumptionsTest.scala" \|\| "JUnitAssertionsTest.scala")).get`
`992`	`993`	`)`
`993`	`994`	`}`
`994`	`995`	`)`