be compatible with post-M4 changes

scalacommunitybuild · Jun 28, 2018 · 448a22c · 448a22c
1 parent 583ee22
commit 448a22c
Show file tree

Hide file tree

Showing 40 changed files with 65 additions and 54 deletions.
diff --git a/project/GenFactories.scala b/project/GenFactories.scala
@@ -32,7 +32,7 @@ import org.scalatest.MatchersHelper.orMatchersAndApply
 import org.scalatest.words.MatcherWords
 import scala.collection.GenTraversable
 import scala.util.matching.Regex
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import TripleEqualsSupport.Spread
 import TripleEqualsSupport.TripleEqualsInvocation
 import org.scalatest.FailureMessages

diff --git a/scalatest/src/main/scala/org/scalatest/Assertions.scala b/scalatest/src/main/scala/org/scalatest/Assertions.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, FailureMessages => _, _ }
 import Requirements._
 import ArrayHelper.deep
 import scala.reflect.ClassTag

diff --git a/scalatest/src/main/scala/org/scalatest/AsyncEngine.scala b/scalatest/src/main/scala/org/scalatest/AsyncEngine.scala
@@ -16,7 +16,7 @@
 package org.scalatest
 
 import org.scalactic.Requirements._
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, _ }
 import org.scalatest.Suite._
 import java.util.ConcurrentModificationException
 import java.util.concurrent.atomic.AtomicReference

diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFeatureSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations

diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFlatSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations

diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFreeSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations

diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFunSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.autoTagClassAnnotations
 import words.BehaveWord

diff --git a/scalatest/src/main/scala/org/scalatest/AsyncFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncFunSuiteLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ Resources => _, _ }
 import scala.concurrent.Future
 import Suite.autoTagClassAnnotations
 

diff --git a/scalatest/src/main/scala/org/scalatest/AsyncWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/AsyncWordSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import scala.concurrent.Future
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations

diff --git a/scalatest/src/main/scala/org/scalatest/CompileMacro.scala b/scalatest/src/main/scala/org/scalatest/CompileMacro.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import org.scalatest.words.{TypeCheckWord, CompileWord}
 import scala.reflect.macros.{ Context, TypecheckException, ParseException }
 import org.scalatest.exceptions.StackDepthException

diff --git a/scalatest/src/main/scala/org/scalatest/ConfigMap.scala b/scalatest/src/main/scala/org/scalatest/ConfigMap.scala
@@ -107,7 +107,10 @@ class ConfigMap(underlying: scala.collection.Map[String, Any]) extends scala.col
 
   override def +[A >: Any](kv: (String, A)): ConfigMap = new ConfigMap(underlying + kv)
 
-  def -(key: String): ConfigMap = new ConfigMap(underlying.filter(_._1 != key))
+  def -(key: String): ConfigMap =
+    new ConfigMap(underlying.filter(_._1 != key))
+  def -(key1: String, key2: String, keys: String*): ConfigMap =
+    new ConfigMap(underlying.filter{case (k, _) => k != key1 && k != key2 && !keys.contains(k)})
 
   override def empty: ConfigMap = new ConfigMap(Map.empty[String, Any])
 

diff --git a/scalatest/src/main/scala/org/scalatest/Engine.scala b/scalatest/src/main/scala/org/scalatest/Engine.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import Requirements._
 import org.scalatest.Suite._
 import java.util.ConcurrentModificationException

diff --git a/scalatest/src/main/scala/org/scalatest/Fact.scala b/scalatest/src/main/scala/org/scalatest/Fact.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ UnquotedString => _, _ }
 import org.scalatest.exceptions.StackDepthException
 import org.scalatest.exceptions.TestFailedException
 import org.scalatest.exceptions.TestCanceledException

diff --git a/scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FeatureSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
 import java.util.ConcurrentModificationException

diff --git a/scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FreeSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations
 import java.util.ConcurrentModificationException

diff --git a/scalatest/src/main/scala/org/scalatest/FunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/FunSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 import Suite.autoTagClassAnnotations
 import words.BehaveWord
 

diff --git a/scalatest/src/main/scala/org/scalatest/InsertionOrderSet.scala b/scalatest/src/main/scala/org/scalatest/InsertionOrderSet.scala
@@ -22,7 +22,8 @@ private[scalatest] class InsertionOrderSet[A](elements: scala.collection.Seq[A])
   def contains(key: A): Boolean = list.contains(key)
   def iterator: Iterator[A] = list.iterator
   override def +(elem: A) = InsertionOrderSet[A](list :+ elem)
-  def -(elem: A) = InsertionOrderSet[A](list.filter(_ != elem))
+  override def -(elem: A) =
+    InsertionOrderSet[A](list.filter(_ != elem))
   def diff(that: scala.collection.Set[A]): InsertionOrderSet[A] = InsertionOrderSet(elements.diff(that.toSeq))
 }
 

diff --git a/scalatest/src/main/scala/org/scalatest/Inspectors.scala b/scalatest/src/main/scala/org/scalatest/Inspectors.scala
@@ -23,7 +23,7 @@ import FailureMessages.decorateToStringValue
 import enablers.Collecting
 import scala.language.higherKinds
 import enablers.InspectorAsserting
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 
 /**
  * Provides nestable <em>inspector methods</em> (or just <em>inspectors</em>) that enable assertions to be made about collections.

diff --git a/scalatest/src/main/scala/org/scalatest/LoneElement.scala b/scalatest/src/main/scala/org/scalatest/LoneElement.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, _ }
 import enablers.Collecting
 import exceptions.StackDepthException
 

diff --git a/scalatest/src/main/scala/org/scalatest/Matchers.scala b/scalatest/src/main/scala/org/scalatest/Matchers.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, Resources => _, _ }
 import org.scalatest.enablers._
 import org.scalatest.matchers._
 import org.scalatest.words._

diff --git a/scalatest/src/main/scala/org/scalatest/MatchersHelper.scala b/scalatest/src/main/scala/org/scalatest/MatchersHelper.scala
@@ -24,7 +24,7 @@ import scala.util.matching.Regex
 import java.lang.reflect.Field
 import org.scalatest.exceptions.TestFailedException
 import org.scalatest.exceptions.StackDepthException
-import org.scalactic._
+import org.scalactic.{ exceptions => _, FailureMessages => _, UnquotedString => _, _ }
 
 // TODO: drop generic support for be as an equality comparison, in favor of specific ones.
 // TODO: mention on JUnit and TestNG docs that you can now mix in ShouldMatchers or MustMatchers

diff --git a/scalatest/src/main/scala/org/scalatest/Outcome.scala b/scalatest/src/main/scala/org/scalatest/Outcome.scala
@@ -15,9 +15,9 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, _ }
 import Requirements._
-import org.scalatest.exceptions.StackDepthException
+import exceptions.StackDepthException
 
 /**
  * Superclass for the possible outcomes of running a test.

diff --git a/scalatest/src/main/scala/org/scalatest/Suite.scala b/scalatest/src/main/scala/org/scalatest/Suite.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ exceptions => _, Resources => _, _ }
 import org.scalatest.events._
 import Requirements._
 import exceptions._

diff --git a/scalatest/src/main/scala/org/scalatest/WordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/WordSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest
 
-import org.scalactic._
+import org.scalactic.{ UnquotedString => _, FailureMessages => _, _ }
 import org.scalatest.exceptions._
 import Suite.anExceptionThatShouldCauseAnAbort
 import Suite.autoTagClassAnnotations

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFeatureSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest.fixture
 
-import org.scalatest._
+import org.scalatest.{ AsyncTestSuite => _, _ }
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFlatSpecLike.scala
@@ -15,7 +15,7 @@
  */
 package org.scalatest.fixture
 
-import org.scalatest._
+import org.scalatest.{ AsyncTestSuite => _, _ }
 import org.scalactic.source
 import scala.concurrent.Future
 import java.util.ConcurrentModificationException

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFreeSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncFunSuiteLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import scala.concurrent.Future
 import org.scalatest.Suite.autoTagClassAnnotations

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/AsyncWordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/AsyncWordSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import scala.concurrent.Future

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FeatureSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FlatSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import java.util.ConcurrentModificationException
 import java.util.concurrent.atomic.AtomicReference

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FreeSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/FunSuiteLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import org.scalatest.Suite.autoTagClassAnnotations
 

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/PropSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalactic.source
 import org.scalatest.Suite.autoTagClassAnnotations
 

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/SpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import Spec._
 import Suite._

diff --git a/scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala b/scalatest/src/main/scala/org/scalatest/fixture/WordSpecLike.scala
@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.scalatest.fixture
+package org.scalatest
+package fixture
 
-import org.scalatest._
 import org.scalatest.exceptions._
 import org.scalactic.{source, Prettifier}
 import java.util.ConcurrentModificationException