Initial version of separating out scalactic.

plinlor · Feb 9, 2015 · 523a604 · 523a604
1 parent fcf3314
commit 523a604
Show file tree

Hide file tree

Showing 1,140 changed files with 124 additions and 65 deletions.
diff --git a/...t/scala/org/scalatest/SharedHelpers.scala → ...n/scala/org/scalatest/SharedHelpers.scala b/...t/scala/org/scalatest/SharedHelpers.scala → ...n/scala/org/scalatest/SharedHelpers.scala
diff --git a/project/GenMatchers.scala b/project/GenMatchers.scala
@@ -53,7 +53,7 @@ object GenMatchers {
     val mustMatchersFile = new File(targetDir, "MustMatchers.scala")
     val mustMatchersWriter = new BufferedWriter(new FileWriter(mustMatchersFile))
     try {
-      val lines = Source.fromFile(new File("src/main/scala/org/scalatest/Matchers.scala")).getLines.toList
+      val lines = Source.fromFile(new File("scalatest/src/main/scala/org/scalatest/Matchers.scala")).getLines.toList
       for (line <- lines) {
         val mustLine = translateShouldToMust(line)
         mustMatchersWriter.write(mustLine)

diff --git a/project/GenVersions.scala b/project/GenVersions.scala
@@ -2,7 +2,7 @@ import java.io.{File, FileWriter, BufferedWriter}
 
 object GenVersions {
 
-  def genScalacticVersions(targetDir: File, version: String, scalaVersion: String): Unit = {
+  def genScalacticVersions(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
     val shortScalaVersion = scalaVersion.split("\\.").take(2).mkString(".")
     targetDir.mkdirs()
 
@@ -22,6 +22,8 @@ object GenVersions {
     scalacticVersionsFileWriter.flush()
     scalacticVersionsFileWriter.close()
     println("Generated " + scalacticVersionsFile.getAbsolutePath)
+    Seq(scalacticVersionsFile)
+
   }
 
   def genScalaTestVersions(targetDir: File, version: String, scalaVersion: String): Unit = {

diff --git a/project/scalatest.scala b/project/scalatest.scala
@@ -155,7 +155,45 @@ object ScalatestBuild extends Build {
       "org.pegdown" % "pegdown" % "1.4.2" % "optional"
     )
 
-  lazy val scalatest = Project("scalatest", file("."))
+  lazy val commonTest = Project("common-test", file("common-test"))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "Common test classes used by scalactic and scalatest"
+    ).dependsOn(LocalProject("scalatest"))
+
+  lazy val scalactic = Project("scalactic", file("scalactic"))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "Scalactic",
+      organization := "org.scalactic",
+      initialCommands in console := "import org.scalactic._",
+      sourceGenerators in Compile += {
+        Def.task{
+          GenVersions.genScalacticVersions((sourceManaged in Compile).value / "scala" / "org" / "scalactic", version.value, scalaVersion.value)
+        }.taskValue
+      },
+      scalacticDocTaskSetting
+    ).settings(osgiSettings: _*).settings(
+      OsgiKeys.exportPackage := Seq(
+        "org.scalactic",
+        "org.scalautils"
+      ),
+      OsgiKeys.additionalHeaders:= Map(
+        "Bundle-Name" -> "Scalactic",
+        "Bundle-Description" -> "Scalactic is an open-source library for Scala projects.",
+        "Bundle-DocURL" -> "http://www.scalactic.org/",
+        "Bundle-Vendor" -> "Artima, Inc."
+      )
+    )
+
+  lazy val scalacticTest = Project("scalactic-test", file("scalactic-test"))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "Scalactic Test",
+      organization := "org.scalactic"
+    ).dependsOn(scalactic, scalatest % "test", commonTest % "test")
+
+  lazy val scalatest = Project("scalatest", file("scalatest"))
    .settings(sharedSettings: _*)
    .settings(
      projectTitle := "ScalaTest",
@@ -187,30 +225,6 @@ object ScalatestBuild extends Build {
          (baseDirectory, sourceManaged in Compile, version, scalaVersion) map genFiles("gencompcls", "GenCompatibleClasses.scala")(GenCompatibleClasses.genMain),
      sourceGenerators in Compile <+=
          (baseDirectory, sourceManaged in Compile, version, scalaVersion) map genFiles("genversions", "GenVersions.scala")(GenVersions.genScalaTestVersions),
-     testOptions in Test := Seq(Tests.Argument("-l", "org.scalatest.tags.Slow",
-                                               "-m", "org.scalatest",
-                                               "-m", "org.scalactic",
-                                               "-m", "org.scalatest.fixture",
-                                               "-m", "org.scalatest.concurrent",
-                                               "-m", "org.scalatest.testng",
-                                               "-m", "org.scalatest.junit",
-                                               "-m", "org.scalatest.events",
-                                               "-m", "org.scalatest.prop",
-                                               "-m", "org.scalatest.tools",
-                                               "-m", "org.scalatest.matchers",
-                                               "-m", "org.scalatest.suiteprop",
-                                               "-m", "org.scalatest.mock",
-                                               "-m", "org.scalatest.path",
-                                               "-m", "org.scalatest.selenium",
-                                               "-m", "org.scalatest.exceptions",
-                                               "-m", "org.scalatest.time",
-                                               "-m", "org.scalatest.words",
-                                               "-m", "org.scalatest.enablers",
-                                               "-m", "org.scalautils",
-                                               "-oDI",
-                                               "-h", "target/html",
-                                               "-u", "target/junit",
-                                               "-fW", "target/result.txt")),
      scalatestDocTaskSetting
    ).settings(osgiSettings: _*).settings(
       OsgiKeys.exportPackage := Seq(
@@ -243,44 +257,47 @@ object ScalatestBuild extends Build {
         "Bundle-Vendor" -> "Artima, Inc.",
         "Main-Class" -> "org.scalatest.tools.Runner"
       )
-   )
+   ).dependsOn(scalactic)
 
-  lazy val scalactic = Project("scalactic", file("genscalactic"))
+  lazy val scalatestTest = Project("scalatest-test", file("scalatest-test"))
     .settings(sharedSettings: _*)
     .settings(
-      projectTitle := "Scalactic",
-      organization := "org.scalactic",
-      initialCommands in console := "import org.scalactic._",
-      sourceGenerators in Compile <+=
-        (baseDirectory, sourceManaged in Compile, version, scalaVersion) map genFiles("", "GenScalactic.scala")(GenScalactic.genMain),
-      sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("", "GenScalactic.scala")(GenScalactic.genTest),
-      resourceDirectories in Compile += {
-        (sourceManaged in Compile).value / "resources"
-      },
-      // TODO - This is a hack to get us on the resources list..
-      resourceGenerators in Compile += {
-        Def.task{
-          Seq((sourceManaged in Compile).value / "resources" / "org" / "scalactic" / "ScalacticBundle.properties")
-        }.taskValue
-      },
-      // Note this should be removable.
-      mappings in (Compile, packageBin) += {
-        ((sourceManaged in Compile).value / "resources" / "org" / "scalactic" / "ScalacticBundle.properties") -> "org/scalactic/ScalacticBundle.properties"
-      },
-      scalacticDocTaskSetting
-    ).settings(osgiSettings: _*).settings(
-      OsgiKeys.exportPackage := Seq(
-        "org.scalactic",
-        "org.scalautils"
-      ),
-      OsgiKeys.additionalHeaders:= Map(
-        "Bundle-Name" -> "Scalactic",
-        "Bundle-Description" -> "Scalactic is an open-source library for Scala projects.",
-        "Bundle-DocURL" -> "http://www.scalactic.org/",
-        "Bundle-Vendor" -> "Artima, Inc."
-      )
-    ).dependsOn(scalatest % "test")
+      projectTitle := "ScalaTest Test",
+      organization := "org.scalatest",
+      libraryDependencies ++= crossBuildLibraryDependencies(scalaVersion.value),
+      libraryDependencies ++= scalatestLibraryDependencies,
+      testOptions in Test := Seq(Tests.Argument("-l", "org.scalatest.tags.Slow",
+        "-m", "org.scalatest",
+        "-m", "org.scalactic",
+        "-m", "org.scalatest.fixture",
+        "-m", "org.scalatest.concurrent",
+        "-m", "org.scalatest.testng",
+        "-m", "org.scalatest.junit",
+        "-m", "org.scalatest.events",
+        "-m", "org.scalatest.prop",
+        "-m", "org.scalatest.tools",
+        "-m", "org.scalatest.matchers",
+        "-m", "org.scalatest.suiteprop",
+        "-m", "org.scalatest.mock",
+        "-m", "org.scalatest.path",
+        "-m", "org.scalatest.selenium",
+        "-m", "org.scalatest.exceptions",
+        "-m", "org.scalatest.time",
+        "-m", "org.scalatest.words",
+        "-m", "org.scalatest.enablers",
+        "-m", "org.scalautils",
+        "-oDI",
+        "-h", "target/html",
+        "-u", "target/junit",
+        "-fW", "target/result.txt"))
+    ).dependsOn(scalatest % "test", commonTest % "test")
+
+  lazy val scalatestAll = Project("scalatest-all", file("."))
+    .settings(sharedSettings: _*)
+    .settings(
+      projectTitle := "ScalaTest All",
+      organization := "org.scalatest"
+    ).dependsOn(scalactic % "compile-internal", scalatest % "compile-internal").aggregate(scalactic, scalatest, scalacticTest, scalatestTest)
 
   def gentestsLibraryDependencies =
     Seq(

diff --git a/...cala/org/scalactic/AccumulationSpec.scala → ...cala/org/scalactic/AccumulationSpec.scala b/...cala/org/scalactic/AccumulationSpec.scala → ...cala/org/scalactic/AccumulationSpec.scala
diff --git a/...est/scala/org/scalactic/CatcherSpec.scala → ...est/scala/org/scalactic/CatcherSpec.scala b/...est/scala/org/scalactic/CatcherSpec.scala → ...est/scala/org/scalactic/CatcherSpec.scala
diff --git a/src/test/scala/org/scalactic/ChainSpec.scala → .../test/scala/org/scalactic/ChainSpec.scala b/src/test/scala/org/scalactic/ChainSpec.scala → .../test/scala/org/scalactic/ChainSpec.scala
diff --git a/...onCheckedMapEqualityConstraintsSpec.scala → ...onCheckedMapEqualityConstraintsSpec.scala b/...onCheckedMapEqualityConstraintsSpec.scala → ...onCheckedMapEqualityConstraintsSpec.scala
diff --git a/...onCheckedSeqEqualityConstraintsSpec.scala → ...onCheckedSeqEqualityConstraintsSpec.scala b/...onCheckedSeqEqualityConstraintsSpec.scala → ...onCheckedSeqEqualityConstraintsSpec.scala
diff --git a/...onCheckedSetEqualityConstraintsSpec.scala → ...onCheckedSetEqualityConstraintsSpec.scala b/...onCheckedSetEqualityConstraintsSpec.scala → ...onCheckedSetEqualityConstraintsSpec.scala
diff --git a/...dTraversableEqualityConstraintsSpec.scala → ...dTraversableEqualityConstraintsSpec.scala b/...dTraversableEqualityConstraintsSpec.scala → ...dTraversableEqualityConstraintsSpec.scala
diff --git a/...onCheckedTripleEqualsExplicitlySpec.scala → ...onCheckedTripleEqualsExplicitlySpec.scala b/...onCheckedTripleEqualsExplicitlySpec.scala → ...onCheckedTripleEqualsExplicitlySpec.scala
diff --git a/...c/ConversionCheckedTripleEqualsSpec.scala → ...c/ConversionCheckedTripleEqualsSpec.scala b/...c/ConversionCheckedTripleEqualsSpec.scala → ...c/ConversionCheckedTripleEqualsSpec.scala
diff --git a/...st/scala/org/scalactic/DecidersSpec.scala → ...st/scala/org/scalactic/DecidersSpec.scala b/...st/scala/org/scalactic/DecidersSpec.scala → ...st/scala/org/scalactic/DecidersSpec.scala
diff --git a/...a/org/scalactic/DefaultEqualitySpec.scala → ...a/org/scalactic/DefaultEqualitySpec.scala b/...a/org/scalactic/DefaultEqualitySpec.scala → ...a/org/scalactic/DefaultEqualitySpec.scala
diff --git a/...scala/org/scalactic/EitherSugarSpec.scala → ...scala/org/scalactic/EitherSugarSpec.scala b/...scala/org/scalactic/EitherSugarSpec.scala → ...scala/org/scalactic/EitherSugarSpec.scala
diff --git a/...st/scala/org/scalactic/EqualitySpec.scala → ...st/scala/org/scalactic/EqualitySpec.scala b/...st/scala/org/scalactic/EqualitySpec.scala → ...st/scala/org/scalactic/EqualitySpec.scala
diff --git a/src/test/scala/org/scalactic/EverySpec.scala → .../test/scala/org/scalactic/EverySpec.scala b/src/test/scala/org/scalactic/EverySpec.scala → .../test/scala/org/scalactic/EverySpec.scala
diff --git a/...org/scalactic/ExplicitlySpecHelpers.scala → ...org/scalactic/ExplicitlySpecHelpers.scala b/...org/scalactic/ExplicitlySpecHelpers.scala → ...org/scalactic/ExplicitlySpecHelpers.scala
diff --git a/...scala/org/scalactic/NormMethodsSpec.scala → ...scala/org/scalactic/NormMethodsSpec.scala b/...scala/org/scalactic/NormMethodsSpec.scala → ...scala/org/scalactic/NormMethodsSpec.scala
diff --git a/...ala/org/scalactic/NormalizationSpec.scala → ...ala/org/scalactic/NormalizationSpec.scala b/...ala/org/scalactic/NormalizationSpec.scala → ...ala/org/scalactic/NormalizationSpec.scala
diff --git a/...g/scalactic/NormalizingEqualitySpec.scala → ...g/scalactic/NormalizingEqualitySpec.scala b/...g/scalactic/NormalizingEqualitySpec.scala → ...g/scalactic/NormalizingEqualitySpec.scala
diff --git a/...ctic/NumericEqualityConstraintsSpec.scala → ...ctic/NumericEqualityConstraintsSpec.scala b/...ctic/NumericEqualityConstraintsSpec.scala → ...ctic/NumericEqualityConstraintsSpec.scala
diff --git a/...scala/org/scalactic/OptionSugarSpec.scala → ...scala/org/scalactic/OptionSugarSpec.scala b/...scala/org/scalactic/OptionSugarSpec.scala → ...scala/org/scalactic/OptionSugarSpec.scala
diff --git a/src/test/scala/org/scalactic/OrSpec.scala → ...src/test/scala/org/scalactic/OrSpec.scala b/src/test/scala/org/scalactic/OrSpec.scala → ...src/test/scala/org/scalactic/OrSpec.scala
diff --git a/.../scala/org/scalactic/PrettifierSpec.scala → .../scala/org/scalactic/PrettifierSpec.scala b/.../scala/org/scalactic/PrettifierSpec.scala → .../scala/org/scalactic/PrettifierSpec.scala
diff --git a/...ala/org/scalactic/PrettyMethodsSpec.scala → ...ala/org/scalactic/PrettyMethodsSpec.scala b/...ala/org/scalactic/PrettyMethodsSpec.scala → ...ala/org/scalactic/PrettyMethodsSpec.scala
diff --git a/...cala/org/scalactic/RequirementsSpec.scala → ...cala/org/scalactic/RequirementsSpec.scala b/...cala/org/scalactic/RequirementsSpec.scala → ...cala/org/scalactic/RequirementsSpec.scala
diff --git a/...t/scala/org/scalactic/SnapshotsSpec.scala → ...t/scala/org/scalactic/SnapshotsSpec.scala b/...t/scala/org/scalactic/SnapshotsSpec.scala → ...t/scala/org/scalactic/SnapshotsSpec.scala
diff --git a/...test/scala/org/scalactic/SpreadSpec.scala → ...test/scala/org/scalactic/SpreadSpec.scala b/...test/scala/org/scalactic/SpreadSpec.scala → ...test/scala/org/scalactic/SpreadSpec.scala
diff --git a/.../scalactic/StringNormalizationsSpec.scala → .../scalactic/StringNormalizationsSpec.scala b/.../scalactic/StringNormalizationsSpec.scala → .../scalactic/StringNormalizationsSpec.scala
diff --git a/.../scala/org/scalactic/TimesOnIntSpec.scala → .../scala/org/scalactic/TimesOnIntSpec.scala b/.../scala/org/scalactic/TimesOnIntSpec.scala → .../scala/org/scalactic/TimesOnIntSpec.scala
@@ -16,8 +16,6 @@
 package org.scalactic
 
 import org.scalatest._
-import org.scalatest.events._
-import SharedHelpers._
 
 class TimesOnIntSpec extends FunSpec with TimesOnInt {
 

diff --git a/...t/scala/org/scalactic/ToleranceSpec.scala → ...t/scala/org/scalactic/ToleranceSpec.scala b/...t/scala/org/scalactic/ToleranceSpec.scala → ...t/scala/org/scalactic/ToleranceSpec.scala
diff --git a/.../org/scalactic/TolerantEqualitySpec.scala → .../org/scalactic/TolerantEqualitySpec.scala b/.../org/scalactic/TolerantEqualitySpec.scala → .../org/scalactic/TolerantEqualitySpec.scala
diff --git a/...g/scalactic/TolerantEquivalenceSpec.scala → ...g/scalactic/TolerantEquivalenceSpec.scala b/...g/scalactic/TolerantEquivalenceSpec.scala → ...g/scalactic/TolerantEquivalenceSpec.scala
diff --git a/...calactic/TraversableConstraintsSpec.scala → ...calactic/TraversableConstraintsSpec.scala b/...calactic/TraversableConstraintsSpec.scala → ...calactic/TraversableConstraintsSpec.scala
diff --git a/...ala/org/scalactic/TripleEqualsSpec.for210 → ...ala/org/scalactic/TripleEqualsSpec.for210 b/...ala/org/scalactic/TripleEqualsSpec.for210 → ...ala/org/scalactic/TripleEqualsSpec.for210
diff --git a/...cala/org/scalactic/TripleEqualsSpec.scala → ...cala/org/scalactic/TripleEqualsSpec.scala b/...cala/org/scalactic/TripleEqualsSpec.scala → ...cala/org/scalactic/TripleEqualsSpec.scala
diff --git a/...st/scala/org/scalactic/TrySugarSpec.scala → ...st/scala/org/scalactic/TrySugarSpec.scala b/...st/scala/org/scalactic/TrySugarSpec.scala → ...st/scala/org/scalactic/TrySugarSpec.scala
diff --git a/...peCheckedMapEqualityConstraintsSpec.scala → ...peCheckedMapEqualityConstraintsSpec.scala b/...peCheckedMapEqualityConstraintsSpec.scala → ...peCheckedMapEqualityConstraintsSpec.scala
diff --git a/...peCheckedSeqEqualityConstraintsSpec.scala → ...peCheckedSeqEqualityConstraintsSpec.scala b/...peCheckedSeqEqualityConstraintsSpec.scala → ...peCheckedSeqEqualityConstraintsSpec.scala
diff --git a/...peCheckedSetEqualityConstraintsSpec.scala → ...peCheckedSetEqualityConstraintsSpec.scala b/...peCheckedSetEqualityConstraintsSpec.scala → ...peCheckedSetEqualityConstraintsSpec.scala
diff --git a/...dTraversableEqualityConstraintsSpec.scala → ...dTraversableEqualityConstraintsSpec.scala b/...dTraversableEqualityConstraintsSpec.scala → ...dTraversableEqualityConstraintsSpec.scala
diff --git a/...peCheckedTripleEqualsExplicitlySpec.scala → ...peCheckedTripleEqualsExplicitlySpec.scala b/...peCheckedTripleEqualsExplicitlySpec.scala → ...peCheckedTripleEqualsExplicitlySpec.scala
diff --git a/src/test/scala/org/scalactic/UnitSpec.scala → ...c/test/scala/org/scalactic/UnitSpec.scala b/src/test/scala/org/scalactic/UnitSpec.scala → ...c/test/scala/org/scalactic/UnitSpec.scala
diff --git a/.../scala/org/scalactic/ValidationSpec.scala → .../scala/org/scalactic/ValidationSpec.scala b/.../scala/org/scalactic/ValidationSpec.scala → .../scala/org/scalactic/ValidationSpec.scala
diff --git a/.../org/scalactic/ScalacticBundle.properties → .../org/scalactic/ScalacticBundle.properties b/.../org/scalactic/ScalacticBundle.properties → .../org/scalactic/ScalacticBundle.properties
diff --git a/.../scalactic/AbstractStringUniformity.scala → .../scalactic/AbstractStringUniformity.scala b/.../scalactic/AbstractStringUniformity.scala → .../scalactic/AbstractStringUniformity.scala
diff --git a/...in/scala/org/scalactic/Accumulation.scala → ...in/scala/org/scalactic/Accumulation.scala b/...in/scala/org/scalactic/Accumulation.scala → ...in/scala/org/scalactic/Accumulation.scala
diff --git a/src/main/scala/org/scalactic/Bool.scala → ...c/src/main/scala/org/scalactic/Bool.scala b/src/main/scala/org/scalactic/Bool.scala → ...c/src/main/scala/org/scalactic/Bool.scala
diff --git a/...in/scala/org/scalactic/BooleanMacro.scala → ...in/scala/org/scalactic/BooleanMacro.scala b/...in/scala/org/scalactic/BooleanMacro.scala → ...in/scala/org/scalactic/BooleanMacro.scala
diff --git a/src/main/scala/org/scalactic/Catcher.scala → ...rc/main/scala/org/scalactic/Catcher.scala b/src/main/scala/org/scalactic/Catcher.scala → ...rc/main/scala/org/scalactic/Catcher.scala
diff --git a/src/main/scala/org/scalactic/Chain.scala → .../src/main/scala/org/scalactic/Chain.scala b/src/main/scala/org/scalactic/Chain.scala → .../src/main/scala/org/scalactic/Chain.scala
diff --git a/...alactic/ComposedNormalizingEquality.scala → ...alactic/ComposedNormalizingEquality.scala b/...alactic/ComposedNormalizingEquality.scala → ...alactic/ComposedNormalizingEquality.scala
diff --git a/...ctic/ComposedNormalizingEquivalence.scala → ...ctic/ComposedNormalizingEquivalence.scala b/...ctic/ComposedNormalizingEquivalence.scala → ...ctic/ComposedNormalizingEquivalence.scala
diff --git a/...main/scala/org/scalactic/Constraint.scala → ...main/scala/org/scalactic/Constraint.scala b/...main/scala/org/scalactic/Constraint.scala → ...main/scala/org/scalactic/Constraint.scala
diff --git a/...actic/ConversionCheckedTripleEquals.scala → ...actic/ConversionCheckedTripleEquals.scala b/...actic/ConversionCheckedTripleEquals.scala → ...actic/ConversionCheckedTripleEquals.scala
diff --git a/...scala/org/scalactic/DefaultEquality.scala → ...scala/org/scalactic/DefaultEquality.scala b/...scala/org/scalactic/DefaultEquality.scala → ...scala/org/scalactic/DefaultEquality.scala
diff --git a/...ain/scala/org/scalactic/EitherSugar.scala → ...ain/scala/org/scalactic/EitherSugar.scala b/...ain/scala/org/scalactic/EitherSugar.scala → ...ain/scala/org/scalactic/EitherSugar.scala
diff --git a/src/main/scala/org/scalactic/Equality.scala → ...c/main/scala/org/scalactic/Equality.scala b/src/main/scala/org/scalactic/Equality.scala → ...c/main/scala/org/scalactic/Equality.scala
diff --git a/...ain/scala/org/scalactic/Equivalence.scala → ...ain/scala/org/scalactic/Equivalence.scala b/...ain/scala/org/scalactic/Equivalence.scala → ...ain/scala/org/scalactic/Equivalence.scala
diff --git a/src/main/scala/org/scalactic/Every.scala → .../src/main/scala/org/scalactic/Every.scala b/src/main/scala/org/scalactic/Every.scala → .../src/main/scala/org/scalactic/Every.scala
diff --git a/...main/scala/org/scalactic/Explicitly.scala → ...main/scala/org/scalactic/Explicitly.scala b/...main/scala/org/scalactic/Explicitly.scala → ...main/scala/org/scalactic/Explicitly.scala
diff --git a/...scala/org/scalactic/FailureMessages.scala → ...scala/org/scalactic/FailureMessages.scala b/...scala/org/scalactic/FailureMessages.scala → ...scala/org/scalactic/FailureMessages.scala
diff --git a/...PriorityConversionCheckedConstraint.scala → ...PriorityConversionCheckedConstraint.scala b/...PriorityConversionCheckedConstraint.scala → ...PriorityConversionCheckedConstraint.scala
diff --git a/...ic/LowPriorityTypeCheckedConstraint.scala → ...ic/LowPriorityTypeCheckedConstraint.scala b/...ic/LowPriorityTypeCheckedConstraint.scala → ...ic/LowPriorityTypeCheckedConstraint.scala
diff --git a/...cala/org/scalactic/MacroOwnerRepair.scala → ...cala/org/scalactic/MacroOwnerRepair.scala b/...cala/org/scalactic/MacroOwnerRepair.scala → ...cala/org/scalactic/MacroOwnerRepair.scala
diff --git a/...rg/scalactic/MapEqualityConstraints.scala → ...rg/scalactic/MapEqualityConstraints.scala b/...rg/scalactic/MapEqualityConstraints.scala → ...rg/scalactic/MapEqualityConstraints.scala
diff --git a/...ain/scala/org/scalactic/NormMethods.scala → ...ain/scala/org/scalactic/NormMethods.scala b/...ain/scala/org/scalactic/NormMethods.scala → ...ain/scala/org/scalactic/NormMethods.scala
diff --git a/...n/scala/org/scalactic/Normalization.scala → ...n/scala/org/scalactic/Normalization.scala b/...n/scala/org/scalactic/Normalization.scala → ...n/scala/org/scalactic/Normalization.scala
diff --git a/...a/org/scalactic/NormalizingEquality.scala → ...a/org/scalactic/NormalizingEquality.scala b/...a/org/scalactic/NormalizingEquality.scala → ...a/org/scalactic/NormalizingEquality.scala
diff --git a/...rg/scalactic/NormalizingEquivalence.scala → ...rg/scalactic/NormalizingEquivalence.scala b/...rg/scalactic/NormalizingEquivalence.scala → ...rg/scalactic/NormalizingEquivalence.scala
diff --git a/...calactic/NumericEqualityConstraints.scala → ...calactic/NumericEqualityConstraints.scala b/...calactic/NumericEqualityConstraints.scala → ...calactic/NumericEqualityConstraints.scala
diff --git a/...ain/scala/org/scalactic/OptionSugar.scala → ...ain/scala/org/scalactic/OptionSugar.scala b/...ain/scala/org/scalactic/OptionSugar.scala → ...ain/scala/org/scalactic/OptionSugar.scala
diff --git a/src/main/scala/org/scalactic/Or.scala → ...tic/src/main/scala/org/scalactic/Or.scala b/src/main/scala/org/scalactic/Or.scala → ...tic/src/main/scala/org/scalactic/Or.scala
diff --git a/...main/scala/org/scalactic/Prettifier.scala → ...main/scala/org/scalactic/Prettifier.scala b/...main/scala/org/scalactic/Prettifier.scala → ...main/scala/org/scalactic/Prettifier.scala
diff --git a/...n/scala/org/scalactic/PrettyMethods.scala → ...n/scala/org/scalactic/PrettyMethods.scala b/...n/scala/org/scalactic/PrettyMethods.scala → ...n/scala/org/scalactic/PrettyMethods.scala
diff --git a/...in/scala/org/scalactic/Requirements.scala → ...in/scala/org/scalactic/Requirements.scala b/...in/scala/org/scalactic/Requirements.scala → ...in/scala/org/scalactic/Requirements.scala
diff --git a/src/main/scala/org/scalactic/Resources.scala → .../main/scala/org/scalactic/Resources.scala b/src/main/scala/org/scalactic/Resources.scala → .../main/scala/org/scalactic/Resources.scala
diff --git a/...rg/scalactic/SeqEqualityConstraints.scala → ...rg/scalactic/SeqEqualityConstraints.scala b/...rg/scalactic/SeqEqualityConstraints.scala → ...rg/scalactic/SeqEqualityConstraints.scala
diff --git a/...rg/scalactic/SetEqualityConstraints.scala → ...rg/scalactic/SetEqualityConstraints.scala b/...rg/scalactic/SetEqualityConstraints.scala → ...rg/scalactic/SetEqualityConstraints.scala
diff --git a/src/main/scala/org/scalactic/Snapshots.scala → .../main/scala/org/scalactic/Snapshots.scala b/src/main/scala/org/scalactic/Snapshots.scala → .../main/scala/org/scalactic/Snapshots.scala
diff --git a/.../org/scalactic/StringNormalizations.scala → .../org/scalactic/StringNormalizations.scala b/.../org/scalactic/StringNormalizations.scala → .../org/scalactic/StringNormalizations.scala
diff --git a/...main/scala/org/scalactic/TimesOnInt.scala → ...main/scala/org/scalactic/TimesOnInt.scala b/...main/scala/org/scalactic/TimesOnInt.scala → ...main/scala/org/scalactic/TimesOnInt.scala
diff --git a/src/main/scala/org/scalactic/Tolerance.scala → .../main/scala/org/scalactic/Tolerance.scala b/src/main/scala/org/scalactic/Tolerance.scala → .../main/scala/org/scalactic/Tolerance.scala
diff --git a/...cala/org/scalactic/TolerantNumerics.scala → ...cala/org/scalactic/TolerantNumerics.scala b/...cala/org/scalactic/TolerantNumerics.scala → ...cala/org/scalactic/TolerantNumerics.scala
diff --git a/...ctic/TraversableEqualityConstraints.scala → ...ctic/TraversableEqualityConstraints.scala b/...ctic/TraversableEqualityConstraints.scala → ...ctic/TraversableEqualityConstraints.scala
diff --git a/...in/scala/org/scalactic/TripleEquals.scala → ...in/scala/org/scalactic/TripleEquals.scala b/...in/scala/org/scalactic/TripleEquals.scala → ...in/scala/org/scalactic/TripleEquals.scala
diff --git a/...a/org/scalactic/TripleEqualsSupport.scala → ...a/org/scalactic/TripleEqualsSupport.scala b/...a/org/scalactic/TripleEqualsSupport.scala → ...a/org/scalactic/TripleEqualsSupport.scala
diff --git a/src/main/scala/org/scalactic/TrySugar.scala → ...c/main/scala/org/scalactic/TrySugar.scala b/src/main/scala/org/scalactic/TrySugar.scala → ...c/main/scala/org/scalactic/TrySugar.scala
diff --git a/...g/scalactic/TypeCheckedTripleEquals.scala → ...g/scalactic/TypeCheckedTripleEquals.scala b/...g/scalactic/TypeCheckedTripleEquals.scala → ...g/scalactic/TypeCheckedTripleEquals.scala
diff --git a/...main/scala/org/scalactic/Uniformity.scala → ...main/scala/org/scalactic/Uniformity.scala b/...main/scala/org/scalactic/Uniformity.scala → ...main/scala/org/scalactic/Uniformity.scala
diff --git a/...main/scala/org/scalactic/Validation.scala → ...main/scala/org/scalactic/Validation.scala b/...main/scala/org/scalactic/Validation.scala → ...main/scala/org/scalactic/Validation.scala
diff --git a/src/main/scala/org/scalactic/package.scala → ...rc/main/scala/org/scalactic/package.scala b/src/main/scala/org/scalactic/package.scala → ...rc/main/scala/org/scalactic/package.scala
diff --git a/.../scala/org/scalatest/osgi/OsgiSuite.scala → .../scala/org/scalatest/osgi/OsgiSuite.scala b/.../scala/org/scalatest/osgi/OsgiSuite.scala → .../scala/org/scalatest/osgi/OsgiSuite.scala
diff --git a/src/test/java/org/scalatest/FastAsLight.java → .../test/java/org/scalatest/FastAsLight.java b/src/test/java/org/scalatest/FastAsLight.java → .../test/java/org/scalatest/FastAsLight.java
diff --git a/src/test/java/org/scalatest/HasField.java → ...src/test/java/org/scalatest/HasField.java b/src/test/java/org/scalatest/HasField.java → ...src/test/java/org/scalatest/HasField.java
diff --git a/...a/org/scalatest/HasFieldAndGetMethod.java → ...a/org/scalatest/HasFieldAndGetMethod.java b/...a/org/scalatest/HasFieldAndGetMethod.java → ...a/org/scalatest/HasFieldAndGetMethod.java
diff --git a/...java/org/scalatest/HasFieldAndMethod.java → ...java/org/scalatest/HasFieldAndMethod.java b/...java/org/scalatest/HasFieldAndMethod.java → ...java/org/scalatest/HasFieldAndMethod.java
diff --git a/...scalatest/HasFieldMethodAndGetMethod.java → ...scalatest/HasFieldMethodAndGetMethod.java b/...scalatest/HasFieldMethodAndGetMethod.java → ...scalatest/HasFieldMethodAndGetMethod.java
diff --git a/...latest/PackageAccessConstructorSuite.java → ...latest/PackageAccessConstructorSuite.java b/...latest/PackageAccessConstructorSuite.java → ...latest/PackageAccessConstructorSuite.java
diff --git a/...st/java/org/scalatest/SlowAsMolasses.java → ...st/java/org/scalatest/SlowAsMolasses.java b/...st/java/org/scalatest/SlowAsMolasses.java → ...st/java/org/scalatest/SlowAsMolasses.java
diff --git a/...est/java/org/scalatest/WeakAsAKitten.java → ...est/java/org/scalatest/WeakAsAKitten.java b/...est/java/org/scalatest/WeakAsAKitten.java → ...est/java/org/scalatest/WeakAsAKitten.java
diff --git a/...ava/org/scalatest/junit/JBitterSuite.java → ...ava/org/scalatest/junit/JBitterSuite.java b/...ava/org/scalatest/junit/JBitterSuite.java → ...ava/org/scalatest/junit/JBitterSuite.java
diff --git a/...java/org/scalatest/junit/JHappySuite.java → ...java/org/scalatest/junit/JHappySuite.java b/...java/org/scalatest/junit/JHappySuite.java → ...java/org/scalatest/junit/JHappySuite.java
diff --git a/...a/org/scalatest/junit/JUnit3TestCase.java → ...a/org/scalatest/junit/JUnit3TestCase.java b/...a/org/scalatest/junit/JUnit3TestCase.java → ...a/org/scalatest/junit/JUnit3TestCase.java
diff --git a/.../org/scalatest/junit/JUnit3TestSuite.java → .../org/scalatest/junit/JUnit3TestSuite.java b/.../org/scalatest/junit/JUnit3TestSuite.java → .../org/scalatest/junit/JUnit3TestSuite.java
diff --git a/...g/scalatest/tools/PackageAccessSuite.java → ...g/scalatest/tools/PackageAccessSuite.java b/...g/scalatest/tools/PackageAccessSuite.java → ...g/scalatest/tools/PackageAccessSuite.java
diff --git a/...st/scala/org/scalatest/AMatcherSpec.scala → ...st/scala/org/scalatest/AMatcherSpec.scala b/...st/scala/org/scalatest/AMatcherSpec.scala → ...st/scala/org/scalatest/AMatcherSpec.scala
diff --git a/...est/scala/org/scalatest/AlerterSpec.scala → ...est/scala/org/scalatest/AlerterSpec.scala b/...est/scala/org/scalatest/AlerterSpec.scala → ...est/scala/org/scalatest/AlerterSpec.scala
diff --git a/...test/AllOfContainMatcherDeciderSpec.scala → ...test/AllOfContainMatcherDeciderSpec.scala b/...test/AllOfContainMatcherDeciderSpec.scala → ...test/AllOfContainMatcherDeciderSpec.scala
diff --git a/...est/AllOfContainMatcherEqualitySpec.scala → ...est/AllOfContainMatcherEqualitySpec.scala b/...est/AllOfContainMatcherEqualitySpec.scala → ...est/AllOfContainMatcherEqualitySpec.scala
diff --git a/...g/scalatest/AllOfContainMatcherSpec.scala → ...g/scalatest/AllOfContainMatcherSpec.scala b/...g/scalatest/AllOfContainMatcherSpec.scala → ...g/scalatest/AllOfContainMatcherSpec.scala
diff --git a/...st/scala/org/scalatest/AllSuiteProp.scala → ...st/scala/org/scalatest/AllSuiteProp.scala b/...st/scala/org/scalatest/AllSuiteProp.scala → ...st/scala/org/scalatest/AllSuiteProp.scala
diff --git a/...t/scala/org/scalatest/AnMatcherSpec.scala → ...t/scala/org/scalatest/AnMatcherSpec.scala b/...t/scala/org/scalatest/AnMatcherSpec.scala → ...t/scala/org/scalatest/AnMatcherSpec.scala
diff --git a/...la/org/scalatest/AnyValMatchersSpec.scala → ...la/org/scalatest/AnyValMatchersSpec.scala b/...la/org/scalatest/AnyValMatchersSpec.scala → ...la/org/scalatest/AnyValMatchersSpec.scala
diff --git a/...ala/org/scalatest/AppendedCluesSpec.scala → ...ala/org/scalatest/AppendedCluesSpec.scala b/...ala/org/scalatest/AppendedCluesSpec.scala → ...ala/org/scalatest/AppendedCluesSpec.scala
diff --git a/src/test/scala/org/scalatest/ArgsSpec.scala → ...c/test/scala/org/scalatest/ArgsSpec.scala b/src/test/scala/org/scalatest/ArgsSpec.scala → ...c/test/scala/org/scalatest/ArgsSpec.scala
diff --git a/.../scala/org/scalatest/AssertionsSpec.scala → .../scala/org/scalatest/AssertionsSpec.scala b/.../scala/org/scalatest/AssertionsSpec.scala → .../scala/org/scalatest/AssertionsSpec.scala
diff --git a/...test/BeforeAndAfterAllConfigMapSpec.scala → ...test/BeforeAndAfterAllConfigMapSpec.scala b/...test/BeforeAndAfterAllConfigMapSpec.scala → ...test/BeforeAndAfterAllConfigMapSpec.scala
diff --git a/...org/scalatest/BeforeAndAfterAllProp.scala → ...org/scalatest/BeforeAndAfterAllProp.scala b/...org/scalatest/BeforeAndAfterAllProp.scala → ...org/scalatest/BeforeAndAfterAllProp.scala
diff --git a/...org/scalatest/BeforeAndAfterAllSpec.scala → ...org/scalatest/BeforeAndAfterAllSpec.scala b/...org/scalatest/BeforeAndAfterAllSpec.scala → ...org/scalatest/BeforeAndAfterAllSpec.scala
diff --git a/...scalatest/BeforeAndAfterConfigSuite.scala → ...scalatest/BeforeAndAfterConfigSuite.scala b/...scalatest/BeforeAndAfterConfigSuite.scala → ...scalatest/BeforeAndAfterConfigSuite.scala
diff --git a/...est/BeforeAndAfterEachTestDataSuite.scala → ...est/BeforeAndAfterEachTestDataSuite.scala b/...est/BeforeAndAfterEachTestDataSuite.scala → ...est/BeforeAndAfterEachTestDataSuite.scala
diff --git a/...a/org/scalatest/BeforeAndAfterSuite.scala → ...a/org/scalatest/BeforeAndAfterSuite.scala b/...a/org/scalatest/BeforeAndAfterSuite.scala → ...a/org/scalatest/BeforeAndAfterSuite.scala
diff --git a/...ala/org/scalatest/BeforeNAfterSuite.scala → ...ala/org/scalatest/BeforeNAfterSuite.scala b/...ala/org/scalatest/BeforeNAfterSuite.scala → ...ala/org/scalatest/BeforeNAfterSuite.scala
diff --git a/src/test/scala/org/scalatest/BigSuite.scala → ...c/test/scala/org/scalatest/BigSuite.scala b/src/test/scala/org/scalatest/BigSuite.scala → ...c/test/scala/org/scalatest/BigSuite.scala
diff --git a/...t/scala/org/scalatest/BigSuiteSuite.scala → ...t/scala/org/scalatest/BigSuiteSuite.scala b/...t/scala/org/scalatest/BigSuiteSuite.scala → ...t/scala/org/scalatest/BigSuiteSuite.scala
diff --git a/.../org/scalatest/BookPropertyMatchers.scala → .../org/scalatest/BookPropertyMatchers.scala b/.../org/scalatest/BookPropertyMatchers.scala → .../org/scalatest/BookPropertyMatchers.scala
diff --git a/...rg/scalatest/CancelAfterFailureSpec.scala → ...rg/scalatest/CancelAfterFailureSpec.scala b/...rg/scalatest/CancelAfterFailureSpec.scala → ...rg/scalatest/CancelAfterFailureSpec.scala
diff --git a/...ala/org/scalatest/CatchReporterProp.scala → ...ala/org/scalatest/CatchReporterProp.scala b/...ala/org/scalatest/CatchReporterProp.scala → ...ala/org/scalatest/CatchReporterProp.scala
diff --git a/...ala/org/scalatest/CatchReporterSpec.scala → ...ala/org/scalatest/CatchReporterSpec.scala b/...ala/org/scalatest/CatchReporterSpec.scala → ...ala/org/scalatest/CatchReporterSpec.scala
diff --git a/...scala/org/scalatest/CheckpointsSpec.scala → ...scala/org/scalatest/CheckpointsSpec.scala b/...scala/org/scalatest/CheckpointsSpec.scala → ...scala/org/scalatest/CheckpointsSpec.scala
diff --git a/...cala/org/scalatest/ClassTaggingProp.scala → ...cala/org/scalatest/ClassTaggingProp.scala b/...cala/org/scalatest/ClassTaggingProp.scala → ...cala/org/scalatest/ClassTaggingProp.scala
diff --git a/src/test/scala/org/scalatest/ClueSpec.scala → ...c/test/scala/org/scalatest/ClueSpec.scala b/src/test/scala/org/scalatest/ClueSpec.scala → ...c/test/scala/org/scalatest/ClueSpec.scala
diff --git a/...t/scala/org/scalatest/ConfigMapSpec.scala → ...t/scala/org/scalatest/ConfigMapSpec.scala b/...t/scala/org/scalatest/ConfigMapSpec.scala → ...t/scala/org/scalatest/ConfigMapSpec.scala
diff --git a/...scalatest/ConfigMapWrapperSuiteSpec.scala → ...scalatest/ConfigMapWrapperSuiteSpec.scala b/...scalatest/ConfigMapWrapperSuiteSpec.scala → ...scalatest/ConfigMapWrapperSuiteSpec.scala
diff --git a/...test/ContainMatcherAndOrDeciderSpec.scala → ...test/ContainMatcherAndOrDeciderSpec.scala b/...test/ContainMatcherAndOrDeciderSpec.scala → ...test/ContainMatcherAndOrDeciderSpec.scala
diff --git a/...est/ContainMatcherAndOrEqualitySpec.scala → ...est/ContainMatcherAndOrEqualitySpec.scala b/...est/ContainMatcherAndOrEqualitySpec.scala → ...est/ContainMatcherAndOrEqualitySpec.scala
diff --git a/...ainMatcherAndOrExplicitEqualitySpec.scala → ...ainMatcherAndOrExplicitEqualitySpec.scala b/...ainMatcherAndOrExplicitEqualitySpec.scala → ...ainMatcherAndOrExplicitEqualitySpec.scala
diff --git a/...g/scalatest/ContainMatcherAndOrSpec.scala → ...g/scalatest/ContainMatcherAndOrSpec.scala b/...g/scalatest/ContainMatcherAndOrSpec.scala → ...g/scalatest/ContainMatcherAndOrSpec.scala
diff --git a/...est/ConversionCheckedAssertionsSpec.scala → ...est/ConversionCheckedAssertionsSpec.scala b/...est/ConversionCheckedAssertionsSpec.scala → ...est/ConversionCheckedAssertionsSpec.scala
diff --git a/...ala/org/scalatest/CustomMatcherSpec.scala → ...ala/org/scalatest/CustomMatcherSpec.scala b/...ala/org/scalatest/CustomMatcherSpec.scala → ...ala/org/scalatest/CustomMatcherSpec.scala
diff --git a/.../scalatest/DiagrammedAssertionsSpec.scala → .../scalatest/DiagrammedAssertionsSpec.scala b/.../scalatest/DiagrammedAssertionsSpec.scala → .../scalatest/DiagrammedAssertionsSpec.scala
diff --git a/.../org/scalatest/DispatchReporterSpec.scala → .../org/scalatest/DispatchReporterSpec.scala b/.../org/scalatest/DispatchReporterSpec.scala → .../org/scalatest/DispatchReporterSpec.scala
diff --git a/...est/scala/org/scalatest/DocSpecSpec.scala → ...est/scala/org/scalatest/DocSpecSpec.scala b/...est/scala/org/scalatest/DocSpecSpec.scala → ...est/scala/org/scalatest/DocSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/EasySuite.scala → .../test/scala/org/scalatest/EasySuite.scala b/src/test/scala/org/scalatest/EasySuite.scala → .../test/scala/org/scalatest/EasySuite.scala
diff --git a/...cala/org/scalatest/EitherValuesSpec.scala → ...cala/org/scalatest/EitherValuesSpec.scala b/...cala/org/scalatest/EitherValuesSpec.scala → ...cala/org/scalatest/EitherValuesSpec.scala
diff --git a/...test/scala/org/scalatest/EmptyMocks.scala → ...test/scala/org/scalatest/EmptyMocks.scala b/...test/scala/org/scalatest/EmptyMocks.scala → ...test/scala/org/scalatest/EmptyMocks.scala
diff --git a/...a/org/scalatest/EncodedOrderingSpec.scala → ...a/org/scalatest/EncodedOrderingSpec.scala b/...a/org/scalatest/EncodedOrderingSpec.scala → ...a/org/scalatest/EncodedOrderingSpec.scala
diff --git a/...test/scala/org/scalatest/EngineSpec.scala → ...test/scala/org/scalatest/EngineSpec.scala b/...test/scala/org/scalatest/EngineSpec.scala → ...test/scala/org/scalatest/EngineSpec.scala
diff --git a/src/test/scala/org/scalatest/EntrySpec.scala → .../test/scala/org/scalatest/EntrySpec.scala b/src/test/scala/org/scalatest/EntrySpec.scala → .../test/scala/org/scalatest/EntrySpec.scala
diff --git a/...st/scala/org/scalatest/EventHelpers.scala → ...st/scala/org/scalatest/EventHelpers.scala b/...st/scala/org/scalatest/EventHelpers.scala → ...st/scala/org/scalatest/EventHelpers.scala
diff --git a/.../org/scalatest/EveryLoneElementSpec.scala → .../org/scalatest/EveryLoneElementSpec.scala b/.../org/scalatest/EveryLoneElementSpec.scala → .../org/scalatest/EveryLoneElementSpec.scala
diff --git a/...eryShouldContainAllOfLogicalAndSpec.scala → ...eryShouldContainAllOfLogicalAndSpec.scala b/...eryShouldContainAllOfLogicalAndSpec.scala → ...eryShouldContainAllOfLogicalAndSpec.scala
diff --git a/...veryShouldContainAllOfLogicalOrSpec.scala → ...veryShouldContainAllOfLogicalOrSpec.scala b/...veryShouldContainAllOfLogicalOrSpec.scala → ...veryShouldContainAllOfLogicalOrSpec.scala
diff --git a/...alatest/EveryShouldContainAllOfSpec.scala → ...alatest/EveryShouldContainAllOfSpec.scala b/...alatest/EveryShouldContainAllOfSpec.scala → ...alatest/EveryShouldContainAllOfSpec.scala
diff --git a/...ldContainAtLeastOneOfLogicalAndSpec.scala → ...ldContainAtLeastOneOfLogicalAndSpec.scala b/...ldContainAtLeastOneOfLogicalAndSpec.scala → ...ldContainAtLeastOneOfLogicalAndSpec.scala
diff --git a/...uldContainAtLeastOneOfLogicalOrSpec.scala → ...uldContainAtLeastOneOfLogicalOrSpec.scala b/...uldContainAtLeastOneOfLogicalOrSpec.scala → ...uldContainAtLeastOneOfLogicalOrSpec.scala
diff --git a/.../EveryShouldContainAtLeastOneOfSpec.scala → .../EveryShouldContainAtLeastOneOfSpec.scala b/.../EveryShouldContainAtLeastOneOfSpec.scala → .../EveryShouldContainAtLeastOneOfSpec.scala
diff --git a/...uldContainAtMostOneOfLogicalAndSpec.scala → ...uldContainAtMostOneOfLogicalAndSpec.scala b/...uldContainAtMostOneOfLogicalAndSpec.scala → ...uldContainAtMostOneOfLogicalAndSpec.scala
diff --git a/...ouldContainAtMostOneOfLogicalOrSpec.scala → ...ouldContainAtMostOneOfLogicalOrSpec.scala b/...ouldContainAtMostOneOfLogicalOrSpec.scala → ...ouldContainAtMostOneOfLogicalOrSpec.scala
diff --git a/...t/EveryShouldContainAtMostOneOfSpec.scala → ...t/EveryShouldContainAtMostOneOfSpec.scala b/...t/EveryShouldContainAtMostOneOfSpec.scala → ...t/EveryShouldContainAtMostOneOfSpec.scala
diff --git a/...yShouldContainInOrderLogicalAndSpec.scala → ...yShouldContainInOrderLogicalAndSpec.scala b/...yShouldContainInOrderLogicalAndSpec.scala → ...yShouldContainInOrderLogicalAndSpec.scala
diff --git a/...ryShouldContainInOrderLogicalOrSpec.scala → ...ryShouldContainInOrderLogicalOrSpec.scala b/...ryShouldContainInOrderLogicalOrSpec.scala → ...ryShouldContainInOrderLogicalOrSpec.scala
diff --git a/...uldContainInOrderOnlyLogicalAndSpec.scala → ...uldContainInOrderOnlyLogicalAndSpec.scala b/...uldContainInOrderOnlyLogicalAndSpec.scala → ...uldContainInOrderOnlyLogicalAndSpec.scala
diff --git a/...ouldContainInOrderOnlyLogicalOrSpec.scala → ...ouldContainInOrderOnlyLogicalOrSpec.scala b/...ouldContainInOrderOnlyLogicalOrSpec.scala → ...ouldContainInOrderOnlyLogicalOrSpec.scala
diff --git a/...t/EveryShouldContainInOrderOnlySpec.scala → ...t/EveryShouldContainInOrderOnlySpec.scala b/...t/EveryShouldContainInOrderOnlySpec.scala → ...t/EveryShouldContainInOrderOnlySpec.scala
diff --git a/...atest/EveryShouldContainInOrderSpec.scala → ...atest/EveryShouldContainInOrderSpec.scala b/...atest/EveryShouldContainInOrderSpec.scala → ...atest/EveryShouldContainInOrderSpec.scala
diff --git a/...ryShouldContainNoneOfLogicalAndSpec.scala → ...ryShouldContainNoneOfLogicalAndSpec.scala b/...ryShouldContainNoneOfLogicalAndSpec.scala → ...ryShouldContainNoneOfLogicalAndSpec.scala
diff --git a/...eryShouldContainNoneOfLogicalOrSpec.scala → ...eryShouldContainNoneOfLogicalOrSpec.scala b/...eryShouldContainNoneOfLogicalOrSpec.scala → ...eryShouldContainNoneOfLogicalOrSpec.scala
diff --git a/...latest/EveryShouldContainNoneOfSpec.scala → ...latest/EveryShouldContainNoneOfSpec.scala b/...latest/EveryShouldContainNoneOfSpec.scala → ...latest/EveryShouldContainNoneOfSpec.scala
diff --git a/...eryShouldContainOneOfLogicalAndSpec.scala → ...eryShouldContainOneOfLogicalAndSpec.scala b/...eryShouldContainOneOfLogicalAndSpec.scala → ...eryShouldContainOneOfLogicalAndSpec.scala
diff --git a/...veryShouldContainOneOfLogicalOrSpec.scala → ...veryShouldContainOneOfLogicalOrSpec.scala b/...veryShouldContainOneOfLogicalOrSpec.scala → ...veryShouldContainOneOfLogicalOrSpec.scala
diff --git a/...alatest/EveryShouldContainOneOfSpec.scala → ...alatest/EveryShouldContainOneOfSpec.scala b/...alatest/EveryShouldContainOneOfSpec.scala → ...alatest/EveryShouldContainOneOfSpec.scala
diff --git a/...veryShouldContainOnlyLogicalAndSpec.scala → ...veryShouldContainOnlyLogicalAndSpec.scala b/...veryShouldContainOnlyLogicalAndSpec.scala → ...veryShouldContainOnlyLogicalAndSpec.scala
diff --git a/...EveryShouldContainOnlyLogicalOrSpec.scala → ...EveryShouldContainOnlyLogicalOrSpec.scala b/...EveryShouldContainOnlyLogicalOrSpec.scala → ...EveryShouldContainOnlyLogicalOrSpec.scala
diff --git a/...calatest/EveryShouldContainOnlySpec.scala → ...calatest/EveryShouldContainOnlySpec.scala b/...calatest/EveryShouldContainOnlySpec.scala → ...calatest/EveryShouldContainOnlySpec.scala
diff --git a/...rg/scalatest/EveryShouldContainSpec.scala → ...rg/scalatest/EveryShouldContainSpec.scala b/...rg/scalatest/EveryShouldContainSpec.scala → ...rg/scalatest/EveryShouldContainSpec.scala
diff --git a/...tainTheSameElementsAsLogicalAndSpec.scala → ...tainTheSameElementsAsLogicalAndSpec.scala b/...tainTheSameElementsAsLogicalAndSpec.scala → ...tainTheSameElementsAsLogicalAndSpec.scala
diff --git a/...ntainTheSameElementsAsLogicalOrSpec.scala → ...ntainTheSameElementsAsLogicalOrSpec.scala b/...ntainTheSameElementsAsLogicalOrSpec.scala → ...ntainTheSameElementsAsLogicalOrSpec.scala
diff --git a/...yShouldContainTheSameElementsAsSpec.scala → ...yShouldContainTheSameElementsAsSpec.scala b/...yShouldContainTheSameElementsAsSpec.scala → ...yShouldContainTheSameElementsAsSpec.scala
diff --git a/...SameElementsInOrderAsLogicalAndSpec.scala → ...SameElementsInOrderAsLogicalAndSpec.scala b/...SameElementsInOrderAsLogicalAndSpec.scala → ...SameElementsInOrderAsLogicalAndSpec.scala
diff --git a/...eSameElementsInOrderAsLogicalOrSpec.scala → ...eSameElementsInOrderAsLogicalOrSpec.scala b/...eSameElementsInOrderAsLogicalOrSpec.scala → ...eSameElementsInOrderAsLogicalOrSpec.scala
diff --git a/...ContainTheSameElementsInOrderAsSpec.scala → ...ContainTheSameElementsInOrderAsSpec.scala b/...ContainTheSameElementsInOrderAsSpec.scala → ...ContainTheSameElementsInOrderAsSpec.scala
diff --git a/...test/ExampleBeforeAfterParallelSpec.scala → ...test/ExampleBeforeAfterParallelSpec.scala b/...test/ExampleBeforeAfterParallelSpec.scala → ...test/ExampleBeforeAfterParallelSpec.scala
diff --git a/...a/org/scalatest/ExampleParallelSpec.scala → ...a/org/scalatest/ExampleParallelSpec.scala b/...a/org/scalatest/ExampleParallelSpec.scala → ...a/org/scalatest/ExampleParallelSpec.scala
diff --git a/...cala/org/scalatest/ExampleStackSpec.scala → ...cala/org/scalatest/ExampleStackSpec.scala b/...cala/org/scalatest/ExampleStackSpec.scala → ...cala/org/scalatest/ExampleStackSpec.scala
diff --git a/...g/scalatest/ExampleSuiteTimeoutSpec.scala → ...g/scalatest/ExampleSuiteTimeoutSpec.scala b/...g/scalatest/ExampleSuiteTimeoutSpec.scala → ...g/scalatest/ExampleSuiteTimeoutSpec.scala
diff --git a/...calatest/ExampleTimeoutParallelSpec.scala → ...calatest/ExampleTimeoutParallelSpec.scala b/...calatest/ExampleTimeoutParallelSpec.scala → ...calatest/ExampleTimeoutParallelSpec.scala
diff --git a/...t/scala/org/scalatest/ExamplesSuite.scala → ...t/scala/org/scalatest/ExamplesSuite.scala b/...t/scala/org/scalatest/ExamplesSuite.scala → ...t/scala/org/scalatest/ExamplesSuite.scala
diff --git a/.../org/scalatest/FailureMessagesSuite.scala → .../org/scalatest/FailureMessagesSuite.scala b/.../org/scalatest/FailureMessagesSuite.scala → .../org/scalatest/FailureMessagesSuite.scala
diff --git a/...scala/org/scalatest/FeatureSpecSpec.scala → ...scala/org/scalatest/FeatureSpecSpec.scala b/...scala/org/scalatest/FeatureSpecSpec.scala → ...scala/org/scalatest/FeatureSpecSpec.scala
diff --git a/src/test/scala/org/scalatest/FileMocks.scala → .../test/scala/org/scalatest/FileMocks.scala b/src/test/scala/org/scalatest/FileMocks.scala → .../test/scala/org/scalatest/FileMocks.scala
diff --git a/...test/scala/org/scalatest/FilterProp.scala → ...test/scala/org/scalatest/FilterProp.scala b/...test/scala/org/scalatest/FilterProp.scala → ...test/scala/org/scalatest/FilterProp.scala
diff --git a/...test/scala/org/scalatest/FilterSpec.scala → ...test/scala/org/scalatest/FilterSpec.scala b/...test/scala/org/scalatest/FilterSpec.scala → ...test/scala/org/scalatest/FilterSpec.scala
diff --git a/...latest/FlatSpecImportedMatchersSpec.scala → ...latest/FlatSpecImportedMatchersSpec.scala b/...latest/FlatSpecImportedMatchersSpec.scala → ...latest/FlatSpecImportedMatchersSpec.scala
diff --git a/...alatest/FlatSpecMixedInMatchersSpec.scala → ...alatest/FlatSpecMixedInMatchersSpec.scala b/...alatest/FlatSpecMixedInMatchersSpec.scala → ...alatest/FlatSpecMixedInMatchersSpec.scala
diff --git a/...st/scala/org/scalatest/FlatSpecSpec.scala → ...st/scala/org/scalatest/FlatSpecSpec.scala b/...st/scala/org/scalatest/FlatSpecSpec.scala → ...st/scala/org/scalatest/FlatSpecSpec.scala
diff --git a/...st/scala/org/scalatest/FreeSpecSpec.scala → ...st/scala/org/scalatest/FreeSpecSpec.scala b/...st/scala/org/scalatest/FreeSpecSpec.scala → ...st/scala/org/scalatest/FreeSpecSpec.scala
diff --git a/...test/scala/org/scalatest/FruitMocks.scala → ...test/scala/org/scalatest/FruitMocks.scala b/...test/scala/org/scalatest/FruitMocks.scala → ...test/scala/org/scalatest/FruitMocks.scala
diff --git a/...est/scala/org/scalatest/FunSpecSpec.scala → ...est/scala/org/scalatest/FunSpecSpec.scala b/...est/scala/org/scalatest/FunSpecSpec.scala → ...est/scala/org/scalatest/FunSpecSpec.scala
diff --git a/...st/scala/org/scalatest/FunSpecSuite.scala → ...st/scala/org/scalatest/FunSpecSuite.scala b/...st/scala/org/scalatest/FunSpecSuite.scala → ...st/scala/org/scalatest/FunSpecSuite.scala
diff --git a/...st/scala/org/scalatest/FunSuiteSpec.scala → ...st/scala/org/scalatest/FunSuiteSpec.scala b/...st/scala/org/scalatest/FunSuiteSpec.scala → ...st/scala/org/scalatest/FunSuiteSpec.scala
diff --git a/...t/scala/org/scalatest/FunSuiteSuite.scala → ...t/scala/org/scalatest/FunSuiteSuite.scala b/...t/scala/org/scalatest/FunSuiteSuite.scala → ...t/scala/org/scalatest/FunSuiteSuite.scala
diff --git a/...org/scalatest/FunctionSuiteExamples.scala → ...org/scalatest/FunctionSuiteExamples.scala b/...org/scalatest/FunctionSuiteExamples.scala → ...org/scalatest/FunctionSuiteExamples.scala
diff --git a/...ala/org/scalatest/FunctionSuiteProp.scala → ...ala/org/scalatest/FunctionSuiteProp.scala b/...ala/org/scalatest/FunctionSuiteProp.scala → ...ala/org/scalatest/FunctionSuiteProp.scala
diff --git a/...ala/org/scalatest/GivenWhenThenSpec.scala → ...ala/org/scalatest/GivenWhenThenSpec.scala b/...ala/org/scalatest/GivenWhenThenSpec.scala → ...ala/org/scalatest/GivenWhenThenSpec.scala
diff --git a/...st/InOrderContainMatcherDeciderSpec.scala → ...st/InOrderContainMatcherDeciderSpec.scala b/...st/InOrderContainMatcherDeciderSpec.scala → ...st/InOrderContainMatcherDeciderSpec.scala
diff --git a/...t/InOrderContainMatcherEqualitySpec.scala → ...t/InOrderContainMatcherEqualitySpec.scala b/...t/InOrderContainMatcherEqualitySpec.scala → ...t/InOrderContainMatcherEqualitySpec.scala
diff --git a/...scalatest/InOrderContainMatcherSpec.scala → ...scalatest/InOrderContainMatcherSpec.scala b/...scalatest/InOrderContainMatcherSpec.scala → ...scalatest/InOrderContainMatcherSpec.scala
diff --git a/...nOrderOnlyContainMatcherDeciderSpec.scala → ...nOrderOnlyContainMatcherDeciderSpec.scala b/...nOrderOnlyContainMatcherDeciderSpec.scala → ...nOrderOnlyContainMatcherDeciderSpec.scala
diff --git a/...OrderOnlyContainMatcherEqualitySpec.scala → ...OrderOnlyContainMatcherEqualitySpec.scala b/...OrderOnlyContainMatcherEqualitySpec.scala → ...OrderOnlyContainMatcherEqualitySpec.scala
diff --git a/...atest/InOrderOnlyContainMatcherSpec.scala → ...atest/InOrderOnlyContainMatcherSpec.scala b/...atest/InOrderOnlyContainMatcherSpec.scala → ...atest/InOrderOnlyContainMatcherSpec.scala
diff --git a/...st/scala/org/scalatest/InformerSpec.scala → ...st/scala/org/scalatest/InformerSpec.scala b/...st/scala/org/scalatest/InformerSpec.scala → ...st/scala/org/scalatest/InformerSpec.scala
diff --git a/...cala/org/scalatest/InheritedTagProp.scala → ...cala/org/scalatest/InheritedTagProp.scala b/...cala/org/scalatest/InheritedTagProp.scala → ...cala/org/scalatest/InheritedTagProp.scala
diff --git a/...scala/org/scalatest/InsideMixinSpec.scala → ...scala/org/scalatest/InsideMixinSpec.scala b/...scala/org/scalatest/InsideMixinSpec.scala → ...scala/org/scalatest/InsideMixinSpec.scala
diff --git a/...test/scala/org/scalatest/InsideSpec.scala → ...test/scala/org/scalatest/InsideSpec.scala b/...test/scala/org/scalatest/InsideSpec.scala → ...test/scala/org/scalatest/InsideSpec.scala
diff --git a/...pectorShorthandsRegexWithGroupsSpec.scala → ...pectorShorthandsRegexWithGroupsSpec.scala b/...pectorShorthandsRegexWithGroupsSpec.scala → ...pectorShorthandsRegexWithGroupsSpec.scala
diff --git a/...g/scalatest/InspectorShorthandsSpec.scala → ...g/scalatest/InspectorShorthandsSpec.scala b/...g/scalatest/InspectorShorthandsSpec.scala → ...g/scalatest/InspectorShorthandsSpec.scala
diff --git a/.../org/scalatest/InspectorsForMapSpec.scala → .../org/scalatest/InspectorsForMapSpec.scala b/.../org/scalatest/InspectorsForMapSpec.scala → .../org/scalatest/InspectorsForMapSpec.scala
diff --git a/.../scala/org/scalatest/InspectorsSpec.scala → .../scala/org/scalatest/InspectorsSpec.scala b/.../scala/org/scalatest/InspectorsSpec.scala → .../scala/org/scalatest/InspectorsSpec.scala
diff --git a/...a/org/scalatest/ListLoneElementSpec.scala → ...a/org/scalatest/ListLoneElementSpec.scala b/...a/org/scalatest/ListLoneElementSpec.scala → ...a/org/scalatest/ListLoneElementSpec.scala
diff --git a/...est/ListShouldBeEmptyLogicalAndSpec.scala → ...est/ListShouldBeEmptyLogicalAndSpec.scala b/...est/ListShouldBeEmptyLogicalAndSpec.scala → ...est/ListShouldBeEmptyLogicalAndSpec.scala
diff --git a/...test/ListShouldBeEmptyLogicalOrSpec.scala → ...test/ListShouldBeEmptyLogicalOrSpec.scala b/...test/ListShouldBeEmptyLogicalOrSpec.scala → ...test/ListShouldBeEmptyLogicalOrSpec.scala
diff --git a/...org/scalatest/ListShouldBeEmptySpec.scala → ...org/scalatest/ListShouldBeEmptySpec.scala b/...org/scalatest/ListShouldBeEmptySpec.scala → ...org/scalatest/ListShouldBeEmptySpec.scala
diff --git a/...istShouldContainAllOfLogicalAndSpec.scala → ...istShouldContainAllOfLogicalAndSpec.scala b/...istShouldContainAllOfLogicalAndSpec.scala → ...istShouldContainAllOfLogicalAndSpec.scala
diff --git a/...ListShouldContainAllOfLogicalOrSpec.scala → ...ListShouldContainAllOfLogicalOrSpec.scala b/...ListShouldContainAllOfLogicalOrSpec.scala → ...ListShouldContainAllOfLogicalOrSpec.scala
diff --git a/...calatest/ListShouldContainAllOfSpec.scala → ...calatest/ListShouldContainAllOfSpec.scala b/...calatest/ListShouldContainAllOfSpec.scala → ...calatest/ListShouldContainAllOfSpec.scala
diff --git a/...ldContainAtLeastOneOfLogicalAndSpec.scala → ...ldContainAtLeastOneOfLogicalAndSpec.scala b/...ldContainAtLeastOneOfLogicalAndSpec.scala → ...ldContainAtLeastOneOfLogicalAndSpec.scala
diff --git a/...uldContainAtLeastOneOfLogicalOrSpec.scala → ...uldContainAtLeastOneOfLogicalOrSpec.scala b/...uldContainAtLeastOneOfLogicalOrSpec.scala → ...uldContainAtLeastOneOfLogicalOrSpec.scala
diff --git a/...t/ListShouldContainAtLeastOneOfSpec.scala → ...t/ListShouldContainAtLeastOneOfSpec.scala b/...t/ListShouldContainAtLeastOneOfSpec.scala → ...t/ListShouldContainAtLeastOneOfSpec.scala
diff --git a/...uldContainAtMostOneOfLogicalAndSpec.scala → ...uldContainAtMostOneOfLogicalAndSpec.scala b/...uldContainAtMostOneOfLogicalAndSpec.scala → ...uldContainAtMostOneOfLogicalAndSpec.scala
diff --git a/...ouldContainAtMostOneOfLogicalOrSpec.scala → ...ouldContainAtMostOneOfLogicalOrSpec.scala b/...ouldContainAtMostOneOfLogicalOrSpec.scala → ...ouldContainAtMostOneOfLogicalOrSpec.scala
diff --git a/...st/ListShouldContainAtMostOneOfSpec.scala → ...st/ListShouldContainAtMostOneOfSpec.scala b/...st/ListShouldContainAtMostOneOfSpec.scala → ...st/ListShouldContainAtMostOneOfSpec.scala
diff --git a/...tShouldContainInOrderLogicalAndSpec.scala → ...tShouldContainInOrderLogicalAndSpec.scala b/...tShouldContainInOrderLogicalAndSpec.scala → ...tShouldContainInOrderLogicalAndSpec.scala
diff --git a/...stShouldContainInOrderLogicalOrSpec.scala → ...stShouldContainInOrderLogicalOrSpec.scala b/...stShouldContainInOrderLogicalOrSpec.scala → ...stShouldContainInOrderLogicalOrSpec.scala
diff --git a/...uldContainInOrderOnlyLogicalAndSpec.scala → ...uldContainInOrderOnlyLogicalAndSpec.scala b/...uldContainInOrderOnlyLogicalAndSpec.scala → ...uldContainInOrderOnlyLogicalAndSpec.scala
diff --git a/...ouldContainInOrderOnlyLogicalOrSpec.scala → ...ouldContainInOrderOnlyLogicalOrSpec.scala b/...ouldContainInOrderOnlyLogicalOrSpec.scala → ...ouldContainInOrderOnlyLogicalOrSpec.scala
diff --git a/...st/ListShouldContainInOrderOnlySpec.scala → ...st/ListShouldContainInOrderOnlySpec.scala b/...st/ListShouldContainInOrderOnlySpec.scala → ...st/ListShouldContainInOrderOnlySpec.scala
diff --git a/...latest/ListShouldContainInOrderSpec.scala → ...latest/ListShouldContainInOrderSpec.scala b/...latest/ListShouldContainInOrderSpec.scala → ...latest/ListShouldContainInOrderSpec.scala
diff --git a/...stShouldContainNoneOfLogicalAndSpec.scala → ...stShouldContainNoneOfLogicalAndSpec.scala b/...stShouldContainNoneOfLogicalAndSpec.scala → ...stShouldContainNoneOfLogicalAndSpec.scala
diff --git a/...istShouldContainNoneOfLogicalOrSpec.scala → ...istShouldContainNoneOfLogicalOrSpec.scala b/...istShouldContainNoneOfLogicalOrSpec.scala → ...istShouldContainNoneOfLogicalOrSpec.scala
diff --git a/...alatest/ListShouldContainNoneOfSpec.scala → ...alatest/ListShouldContainNoneOfSpec.scala b/...alatest/ListShouldContainNoneOfSpec.scala → ...alatest/ListShouldContainNoneOfSpec.scala
diff --git a/...istShouldContainOneOfLogicalAndSpec.scala → ...istShouldContainOneOfLogicalAndSpec.scala b/...istShouldContainOneOfLogicalAndSpec.scala → ...istShouldContainOneOfLogicalAndSpec.scala
diff --git a/...ListShouldContainOneOfLogicalOrSpec.scala → ...ListShouldContainOneOfLogicalOrSpec.scala b/...ListShouldContainOneOfLogicalOrSpec.scala → ...ListShouldContainOneOfLogicalOrSpec.scala
diff --git a/...calatest/ListShouldContainOneOfSpec.scala → ...calatest/ListShouldContainOneOfSpec.scala b/...calatest/ListShouldContainOneOfSpec.scala → ...calatest/ListShouldContainOneOfSpec.scala
diff --git a/...ListShouldContainOnlyLogicalAndSpec.scala → ...ListShouldContainOnlyLogicalAndSpec.scala b/...ListShouldContainOnlyLogicalAndSpec.scala → ...ListShouldContainOnlyLogicalAndSpec.scala
diff --git a/.../ListShouldContainOnlyLogicalOrSpec.scala → .../ListShouldContainOnlyLogicalOrSpec.scala b/.../ListShouldContainOnlyLogicalOrSpec.scala → .../ListShouldContainOnlyLogicalOrSpec.scala
diff --git a/...scalatest/ListShouldContainOnlySpec.scala → ...scalatest/ListShouldContainOnlySpec.scala b/...scalatest/ListShouldContainOnlySpec.scala → ...scalatest/ListShouldContainOnlySpec.scala
diff --git a/...org/scalatest/ListShouldContainSpec.scala → ...org/scalatest/ListShouldContainSpec.scala b/...org/scalatest/ListShouldContainSpec.scala → ...org/scalatest/ListShouldContainSpec.scala
diff --git a/...tainTheSameElementsAsLogicalAndSpec.scala → ...tainTheSameElementsAsLogicalAndSpec.scala b/...tainTheSameElementsAsLogicalAndSpec.scala → ...tainTheSameElementsAsLogicalAndSpec.scala
diff --git a/...ntainTheSameElementsAsLogicalOrSpec.scala → ...ntainTheSameElementsAsLogicalOrSpec.scala b/...ntainTheSameElementsAsLogicalOrSpec.scala → ...ntainTheSameElementsAsLogicalOrSpec.scala
diff --git a/...tShouldContainTheSameElementsAsSpec.scala → ...tShouldContainTheSameElementsAsSpec.scala b/...tShouldContainTheSameElementsAsSpec.scala → ...tShouldContainTheSameElementsAsSpec.scala
diff --git a/...SameElementsInOrderAsLogicalAndSpec.scala → ...SameElementsInOrderAsLogicalAndSpec.scala b/...SameElementsInOrderAsLogicalAndSpec.scala → ...SameElementsInOrderAsLogicalAndSpec.scala
diff --git a/...eSameElementsInOrderAsLogicalOrSpec.scala → ...eSameElementsInOrderAsLogicalOrSpec.scala b/...eSameElementsInOrderAsLogicalOrSpec.scala → ...eSameElementsInOrderAsLogicalOrSpec.scala
diff --git a/...ContainTheSameElementsInOrderAsSpec.scala → ...ContainTheSameElementsInOrderAsSpec.scala b/...ContainTheSameElementsInOrderAsSpec.scala → ...ContainTheSameElementsInOrderAsSpec.scala
diff --git a/.../scalatest/MapShouldBeDefinedAtSpec.scala → .../scalatest/MapShouldBeDefinedAtSpec.scala b/.../scalatest/MapShouldBeDefinedAtSpec.scala → .../scalatest/MapShouldBeDefinedAtSpec.scala
diff --git a/.../scala/org/scalatest/MatcherGenSpec.scala → .../scala/org/scalatest/MatcherGenSpec.scala b/.../scala/org/scalatest/MatcherGenSpec.scala → .../scala/org/scalatest/MatcherGenSpec.scala
diff --git a/...st/scala/org/scalatest/MatchersSpec.scala → ...st/scala/org/scalatest/MatchersSpec.scala b/...st/scala/org/scalatest/MatchersSpec.scala → ...st/scala/org/scalatest/MatchersSpec.scala
diff --git a/...a/org/scalatest/MethodSuiteExamples.scala → ...a/org/scalatest/MethodSuiteExamples.scala b/...a/org/scalatest/MethodSuiteExamples.scala → ...a/org/scalatest/MethodSuiteExamples.scala
diff --git a/...scala/org/scalatest/MethodSuiteProp.scala → ...scala/org/scalatest/MethodSuiteProp.scala b/...scala/org/scalatest/MethodSuiteProp.scala → ...scala/org/scalatest/MethodSuiteProp.scala
diff --git a/...calatest/NonImplicitAssertionsSuite.scala → ...calatest/NonImplicitAssertionsSuite.scala b/...calatest/NonImplicitAssertionsSuite.scala → ...calatest/NonImplicitAssertionsSuite.scala
diff --git a/...est/NoneOfContainMatcherDeciderSpec.scala → ...est/NoneOfContainMatcherDeciderSpec.scala b/...est/NoneOfContainMatcherDeciderSpec.scala → ...est/NoneOfContainMatcherDeciderSpec.scala
diff --git a/...st/NoneOfContainMatcherEqualitySpec.scala → ...st/NoneOfContainMatcherEqualitySpec.scala b/...st/NoneOfContainMatcherEqualitySpec.scala → ...st/NoneOfContainMatcherEqualitySpec.scala
diff --git a/.../scalatest/NoneOfContainMatcherSpec.scala → .../scalatest/NoneOfContainMatcherSpec.scala b/.../scalatest/NoneOfContainMatcherSpec.scala → .../scalatest/NoneOfContainMatcherSpec.scala
diff --git a/...st/scala/org/scalatest/NotifierSpec.scala → ...st/scala/org/scalatest/NotifierSpec.scala b/...st/scala/org/scalatest/NotifierSpec.scala → ...st/scala/org/scalatest/NotifierSpec.scala
diff --git a/...test/scala/org/scalatest/OldDocSpec.scala → ...test/scala/org/scalatest/OldDocSpec.scala b/...test/scala/org/scalatest/OldDocSpec.scala → ...test/scala/org/scalatest/OldDocSpec.scala
diff --git a/...rg/scalatest/OneInstancePerTestSpec.scala → ...rg/scalatest/OneInstancePerTestSpec.scala b/...rg/scalatest/OneInstancePerTestSpec.scala → ...rg/scalatest/OneInstancePerTestSpec.scala
diff --git a/...test/OneOfContainMatcherDeciderSpec.scala → ...test/OneOfContainMatcherDeciderSpec.scala b/...test/OneOfContainMatcherDeciderSpec.scala → ...test/OneOfContainMatcherDeciderSpec.scala
diff --git a/...est/OneOfContainMatcherEqualitySpec.scala → ...est/OneOfContainMatcherEqualitySpec.scala b/...est/OneOfContainMatcherEqualitySpec.scala → ...est/OneOfContainMatcherEqualitySpec.scala
diff --git a/...g/scalatest/OneOfContainMatcherSpec.scala → ...g/scalatest/OneOfContainMatcherSpec.scala b/...g/scalatest/OneOfContainMatcherSpec.scala → ...g/scalatest/OneOfContainMatcherSpec.scala
diff --git a/...atest/OnlyContainMatcherDeciderSpec.scala → ...atest/OnlyContainMatcherDeciderSpec.scala b/...atest/OnlyContainMatcherDeciderSpec.scala → ...atest/OnlyContainMatcherDeciderSpec.scala
diff --git a/...test/OnlyContainMatcherEqualitySpec.scala → ...test/OnlyContainMatcherEqualitySpec.scala b/...test/OnlyContainMatcherEqualitySpec.scala → ...test/OnlyContainMatcherEqualitySpec.scala
diff --git a/...rg/scalatest/OnlyContainMatcherSpec.scala → ...rg/scalatest/OnlyContainMatcherSpec.scala b/...rg/scalatest/OnlyContainMatcherSpec.scala → ...rg/scalatest/OnlyContainMatcherSpec.scala
diff --git a/...t/scala/org/scalatest/OperatorNames.scala → ...t/scala/org/scalatest/OperatorNames.scala b/...t/scala/org/scalatest/OperatorNames.scala → ...t/scala/org/scalatest/OperatorNames.scala
diff --git a/...ionShouldContainOneOfLogicalAndSpec.scala → ...ionShouldContainOneOfLogicalAndSpec.scala b/...ionShouldContainOneOfLogicalAndSpec.scala → ...ionShouldContainOneOfLogicalAndSpec.scala
diff --git a/...tionShouldContainOneOfLogicalOrSpec.scala → ...tionShouldContainOneOfLogicalOrSpec.scala b/...tionShouldContainOneOfLogicalOrSpec.scala → ...tionShouldContainOneOfLogicalOrSpec.scala
diff --git a/...latest/OptionShouldContainOneOfSpec.scala → ...latest/OptionShouldContainOneOfSpec.scala b/...latest/OptionShouldContainOneOfSpec.scala → ...latest/OptionShouldContainOneOfSpec.scala
diff --git a/...g/scalatest/OptionShouldContainSpec.scala → ...g/scalatest/OptionShouldContainSpec.scala b/...g/scalatest/OptionShouldContainSpec.scala → ...g/scalatest/OptionShouldContainSpec.scala
diff --git a/...cala/org/scalatest/OptionValuesSpec.scala → ...cala/org/scalatest/OptionValuesSpec.scala b/...cala/org/scalatest/OptionValuesSpec.scala → ...cala/org/scalatest/OptionValuesSpec.scala
diff --git a/...est/scala/org/scalatest/OutcomeSpec.scala → ...est/scala/org/scalatest/OutcomeSpec.scala b/...est/scala/org/scalatest/OutcomeSpec.scala → ...est/scala/org/scalatest/OutcomeSpec.scala
diff --git a/...t/ParallelTestExecutionInfoExamples.scala → ...t/ParallelTestExecutionInfoExamples.scala b/...t/ParallelTestExecutionInfoExamples.scala → ...t/ParallelTestExecutionInfoExamples.scala
diff --git a/.../ParallelTestExecutionOrderExamples.scala → .../ParallelTestExecutionOrderExamples.scala b/.../ParallelTestExecutionOrderExamples.scala → .../ParallelTestExecutionOrderExamples.scala
diff --git a/...lTestExecutionParallelSuiteExamples.scala → ...lTestExecutionParallelSuiteExamples.scala b/...lTestExecutionParallelSuiteExamples.scala → ...lTestExecutionParallelSuiteExamples.scala
diff --git a/...scalatest/ParallelTestExecutionProp.scala → ...scalatest/ParallelTestExecutionProp.scala b/...scalatest/ParallelTestExecutionProp.scala → ...scalatest/ParallelTestExecutionProp.scala
diff --git a/...scalatest/ParallelTestExecutionSpec.scala → ...scalatest/ParallelTestExecutionSpec.scala b/...scalatest/ParallelTestExecutionSpec.scala → ...scalatest/ParallelTestExecutionSpec.scala
diff --git a/...elTestExecutionSuiteTimeoutExamples.scala → ...elTestExecutionSuiteTimeoutExamples.scala b/...elTestExecutionSuiteTimeoutExamples.scala → ...elTestExecutionSuiteTimeoutExamples.scala
diff --git a/...lelTestExecutionTestTimeoutExamples.scala → ...lelTestExecutionTestTimeoutExamples.scala b/...lelTestExecutionTestTimeoutExamples.scala → ...lelTestExecutionTestTimeoutExamples.scala
diff --git a/...scalatest/PartialFunctionValuesSpec.scala → ...scalatest/PartialFunctionValuesSpec.scala b/...scalatest/PartialFunctionValuesSpec.scala → ...scalatest/PartialFunctionValuesSpec.scala
diff --git a/...t/scala/org/scalatest/PrettyAstSpec.scala → ...t/scala/org/scalatest/PrettyAstSpec.scala b/...t/scala/org/scalatest/PrettyAstSpec.scala → ...t/scala/org/scalatest/PrettyAstSpec.scala
diff --git a/...g/scalatest/PrivateMethodTesterSpec.scala → ...g/scalatest/PrivateMethodTesterSpec.scala b/...g/scalatest/PrivateMethodTesterSpec.scala → ...g/scalatest/PrivateMethodTesterSpec.scala
diff --git a/...st/scala/org/scalatest/PropSpecSpec.scala → ...st/scala/org/scalatest/PropSpecSpec.scala b/...st/scala/org/scalatest/PropSpecSpec.scala → ...st/scala/org/scalatest/PropSpecSpec.scala
diff --git a/...cala/org/scalatest/PropertyFunSuite.scala → ...cala/org/scalatest/PropertyFunSuite.scala b/...cala/org/scalatest/PropertyFunSuite.scala → ...cala/org/scalatest/PropertyFunSuite.scala
diff --git a/...a/org/scalatest/RandomTestOrderSpec.scala → ...a/org/scalatest/RandomTestOrderSpec.scala b/...a/org/scalatest/RandomTestOrderSpec.scala → ...a/org/scalatest/RandomTestOrderSpec.scala
diff --git a/...est/scala/org/scalatest/RetriesSpec.scala → ...est/scala/org/scalatest/RetriesSpec.scala b/...est/scala/org/scalatest/RetriesSpec.scala → ...est/scala/org/scalatest/RetriesSpec.scala
diff --git a/...test/ReturnsNormallyThrowsAssertion.scala → ...test/ReturnsNormallyThrowsAssertion.scala b/...test/ReturnsNormallyThrowsAssertion.scala → ...test/ReturnsNormallyThrowsAssertion.scala
diff --git a/...cala/org/scalatest/RunInSpurtsSpec1.scala → ...cala/org/scalatest/RunInSpurtsSpec1.scala b/...cala/org/scalatest/RunInSpurtsSpec1.scala → ...cala/org/scalatest/RunInSpurtsSpec1.scala
diff --git a/...cala/org/scalatest/RunInSpurtsSpec2.scala → ...cala/org/scalatest/RunInSpurtsSpec2.scala b/...cala/org/scalatest/RunInSpurtsSpec2.scala → ...cala/org/scalatest/RunInSpurtsSpec2.scala
diff --git a/...scala/org/scalatest/RunningTestSpec.scala → ...scala/org/scalatest/RunningTestSpec.scala b/...scala/org/scalatest/RunningTestSpec.scala → ...scala/org/scalatest/RunningTestSpec.scala