From c484384892098486de1b79aa30ca1d7aa8228597 Mon Sep 17 00:00:00 2001 From: squid314 Date: Sun, 3 May 2020 23:21:27 -0600 Subject: [PATCH] Enable many javalib/util/* tests other than Sets for Scala.js Partial fix for lampepfl#7113 Just enabling the tests which already passed. It looks like the upstream tests need updating for the Set pieces. --- project/Build.scala | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 78f5c15ed345..28f83260eb2e 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1030,13 +1030,28 @@ object Build { ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util/concurrent" ** "*.scala").get ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/javalib/util" * (("*.scala": FileFilter) - -- "AbstractListTest.scala" -- "AbstractMapTest.scala" -- "AbstractSetTest.scala" -- "ArrayDequeTest.scala" -- "ArrayListTest.scala" - -- "CollectionsOnCheckedCollectionTest.scala" -- "CollectionsOnCheckedListTest.scala" -- "CollectionsOnCheckedMapTest.scala" -- "CollectionsOnCheckedSetTest.scala" - -- "CollectionsOnCollectionsTest.scala" -- "CollectionsOnListsTest.scala" -- "CollectionsOnMapsTest.scala" -- "CollectionsOnSetFromMapTest.scala" -- "CollectionsOnSetsTest.scala" - -- "CollectionsOnSynchronizedCollectionTest.scala" -- "CollectionsOnSynchronizedListTest.scala" -- "CollectionsOnSynchronizedMapTest.scala" -- "CollectionsOnSynchronizedSetTest.scala" -- "CollectionsTest.scala" - -- "DequeTest.scala" -- "EventObjectTest.scala" -- "FormatterTest.scala" -- "HashMapTest.scala" -- "HashSetTest.scala" -- "IdentityHashMapTest.scala" - -- "LinkedHashMapTest.scala" -- "LinkedHashSetTest.scala" -- "LinkedListTest.scala" - -- "PriorityQueueTest.scala" -- "SortedMapTest.scala" -- "SortedSetTest.scala" -- "TreeSetTest.scala")).get + -- "AbstractSetTest.scala" + -- "CollectionsOnCheckedCollectionTest.scala" + -- "CollectionsOnCheckedListTest.scala" + -- "CollectionsOnCheckedMapTest.scala" + -- "CollectionsOnCheckedSetTest.scala" + -- "CollectionsOnCollectionsTest.scala" + -- "CollectionsOnListsTest.scala" + -- "CollectionsOnMapsTest.scala" + -- "CollectionsOnSetFromMapTest.scala" + -- "CollectionsOnSetsTest.scala" + -- "CollectionsOnSynchronizedCollectionTest.scala" + -- "CollectionsOnSynchronizedListTest.scala" + -- "CollectionsOnSynchronizedMapTest.scala" + -- "CollectionsOnSynchronizedSetTest.scala" + -- "CollectionsTest.scala" + -- "EventObjectTest.scala" + -- "FormatterTest.scala" + -- "HashSetTest.scala" + -- "LinkedHashSetTest.scala" + -- "SortedSetTest.scala" + -- "TreeSetTest.scala" + )).get ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/utils" ** "*.scala").get ++ (dir / "shared/src/test/scala/org/scalajs/testsuite/junit" ** "*.scala").get