Skip to content

Commit 777667a

Browse files
bvennersbvenners
committed
Merge branch 'cheeseng-feature-external-module-separation' into 3.1.x
2 parents 8ae8fd0 + 2e2c32d commit 777667a

File tree

152 files changed

+141
-16355
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

152 files changed

+141
-16355
lines changed

‎README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ Before publishing any patch release, binary compatibility with previous version
158158
To publish scalactic, scalatest and scalatest-app use the following command:
159159

160160
$ export SCALAJS_VERSION=0.6.26
161+
$ sbt ++2.10.7 clean publishSigned "project scalatestAppJS" clean publishSigned
161162
$ sbt ++2.11.12 clean publishSigned "project scalatestAppJS" clean publishSigned
162163
$ sbt ++2.12.8 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned
163164
$ sbt ++2.13.0-M5 "project scalatestApp" clean publishSigned "project scalatestAppJS" clean publishSigned

‎project/GenRegularTests.scala‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,6 @@ object GenRegularTests4 extends GenRegularTestsBase {
8383
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/events/TestLocationServices.scala"),
8484
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/events/TestLocationJUnitSuite.scala"),
8585
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/events/examples/ExampleCancelSpec.scala"),
86-
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/jmock/SuiteExpectations.scala"),
87-
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/jmock/TestReporter.scala"),
8886
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/RunInSpurtsSpec1.scala"),
8987
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/suiteprop/SuiteExamples.scala"),
9088
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/tools/scalasbt/SlowSampleSuite.scala"),
@@ -126,7 +124,6 @@ object GenRegularTests5 extends GenRegularTestsBase {
126124
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodServices.scala"),
127125
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/MethodSuiteExamples.scala"),
128126
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/events/TestLocationMethodJUnitSuite.scala"),
129-
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/junit/junit4helpers/TestWasCalledSuite.scala"),
130127
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/time/SpanMatchers.scala"),
131128
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/UnitSpec.scala"),
132129
copyFile(targetBaseDir, "scalatest-test/src/test/scala/org/scalatest/suiteprop/SuiteExamples.scala"),

‎project/scalatest.scala‎

Lines changed: 8 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -38,15 +38,10 @@ object ScalatestBuild {
3838
// > ++ 2.10.5
3939
lazy val supportedScalaVersions = List("2.12.8", "2.11.12", "2.10.7", "2.13.0-M5")
4040

41-
val releaseVersion = "3.1.0-SNAP7"
41+
val releaseVersion = "3.1.0-SNAP8"
4242

4343
val previousReleaseVersion = "3.0.5"
4444

45-
val easyMockVersion = "3.2"
46-
val jmockVersion = "2.8.3"
47-
val mockitoVersion = "1.10.19"
48-
val testngVersion = "6.7"
49-
val junitVersion = "4.12"
5045
val pegdownVersion = "1.4.2"
5146

5247
val githubTag = "release-3.1.0" // for scaladoc source urls
@@ -204,13 +199,7 @@ object ScalatestBuild {
204199
def scalatestLibraryDependencies =
205200
Seq(
206201
"org.scala-sbt" % "test-interface" % "1.0" % "optional",
207-
"org.easymock" % "easymockclassextension" % easyMockVersion % "optional",
208-
"org.jmock" % "jmock-legacy" % jmockVersion % "optional",
209-
"org.mockito" % "mockito-core" % mockitoVersion % "optional",
210-
"org.testng" % "testng" % testngVersion % "optional",
211202
"com.google.inject" % "guice" % "4.0" % "optional",
212-
"junit" % "junit" % junitVersion % "optional",
213-
"org.seleniumhq.selenium" % "selenium-java" % "2.45.0" % "optional",
214203
"org.apache.ant" % "ant" % "1.7.1" % "optional",
215204
"org.ow2.asm" % "asm-all" % "4.1" % "optional",
216205
"org.pegdown" % "pegdown" % pegdownVersion % "optional"
@@ -236,9 +225,8 @@ object ScalatestBuild {
236225

237226
def scalatestTestLibraryDependencies(theScalaVersion: String) =
238227
Seq(
239-
"commons-io" % "commons-io" % "1.3.2" % "test",
240-
"org.eclipse.jetty" % "jetty-server" % "8.1.18.v20150929" % "test",
241-
"org.eclipse.jetty" % "jetty-webapp" % "8.1.18.v20150929" % "test"
228+
"org.scalatestplus" %% "scalatestplus-testng" % "1.0.0-SNAP2" % "test",
229+
"org.scalatestplus" %% "scalatestplus-junit" % "1.0.0-SNAP3" % "test"
242230
)
243231

244232
val scalaJSVersion = Option(System.getenv("SCALAJS_VERSION")).getOrElse("0.6.25")
@@ -258,17 +246,12 @@ object ScalatestBuild {
258246
"-m", "org.scalactic.enablers",
259247
"-m", "org.scalatest.fixture",
260248
"-m", "org.scalatest.concurrent",
261-
"-m", "org.scalatest.testng",
262-
"-m", "org.scalatest.junit",
263-
"-m", "org.scalatest.jmock",
264249
"-m", "org.scalatest.events",
265250
"-m", "org.scalatest.prop",
266251
"-m", "org.scalatest.tools",
267252
"-m", "org.scalatest.matchers",
268253
"-m", "org.scalatest.suiteprop",
269-
"-m", "org.scalatest.mock",
270254
"-m", "org.scalatest.path",
271-
"-m", "org.scalatest.selenium",
272255
"-m", "org.scalatest.exceptions",
273256
"-m", "org.scalatest.time",
274257
"-m", "org.scalatest.words",
@@ -289,16 +272,12 @@ object ScalatestBuild {
289272
"-m", "org.scalactic.enablers",
290273
"-m", "org.scalatest.fixture",
291274
"-m", "org.scalatest.concurrent",
292-
"-m", "org.scalatest.testng",
293-
"-m", "org.scalatest.junit",
294275
"-m", "org.scalatest.events",
295276
"-m", "org.scalatest.prop",
296277
"-m", "org.scalatest.tools",
297278
"-m", "org.scalatest.matchers",
298279
"-m", "org.scalatest.suiteprop",
299-
"-m", "org.scalatest.mock",
300280
"-m", "org.scalatest.path",
301-
"-m", "org.scalatest.selenium",
302281
"-m", "org.scalatest.exceptions",
303282
"-m", "org.scalatest.time",
304283
"-m", "org.scalatest.words",
@@ -315,16 +294,12 @@ object ScalatestBuild {
315294
"-m", "org.scalactic.enablers",
316295
"-m", "org.scalatest.fixture",
317296
"-m", "org.scalatest.concurrent",
318-
"-m", "org.scalatest.testng",
319-
"-m", "org.scalatest.junit",
320297
"-m", "org.scalatest.events",
321298
"-m", "org.scalatest.prop",
322299
"-m", "org.scalatest.tools",
323300
"-m", "org.scalatest.matchers",
324301
"-m", "org.scalatest.suiteprop",
325-
"-m", "org.scalatest.mock",
326302
"-m", "org.scalatest.path",
327-
"-m", "org.scalatest.selenium",
328303
"-m", "org.scalatest.exceptions",
329304
"-m", "org.scalatest.time",
330305
"-m", "org.scalatest.words",
@@ -813,37 +788,24 @@ object ScalatestBuild {
813788
"org.scalatest.compatible",
814789
"org.scalatest.concurrent",
815790
"org.scalatest.check",
816-
"org.scalatest.easymock",
817791
"org.scalatest.enablers",
818792
"org.scalatest.events",
819793
"org.scalatest.exceptions",
820794
"org.scalatest.fixture",
821795
"org.scalatest.funsuite",
822796
"org.scalatest.featurespec",
823797
"org.scalatest.funspec",
824-
"org.scalatest.jmock",
825-
"org.scalatest.junit",
826798
"org.scalatest.matchers",
827-
"org.scalatest.mock",
828-
"org.scalatest.mockito",
829799
"org.scalatest.path",
830800
"org.scalatest.prop",
831801
"org.scalatest.refspec",
832-
"org.scalatest.selenium",
833802
"org.scalatest.tags",
834803
"org.scalatest.tagobjects",
835-
"org.scalatest.testng",
836804
"org.scalatest.time",
837805
"org.scalatest.tools",
838806
"org.scalatest.verb",
839807
"org.scalatest.words",
840-
"org.scalatestplus.scalacheck",
841-
"org.scalatestplus.easymock",
842-
"org.scalatestplus.jmock",
843-
"org.scalatestplus.mockito",
844-
"org.scalatestplus.selenium",
845-
"org.scalatestplus.junit",
846-
"org.scalatestplus.testng"
808+
"org.scalatestplus.scalacheck"
847809
),
848810
OsgiKeys.importPackage := Seq(
849811
"org.scalatest.*",
@@ -1025,26 +987,19 @@ object ScalatestBuild {
1025987
"org.scalatest.compatible",
1026988
"org.scalatest.concurrent",
1027989
"org.scalatest.check",
1028-
"org.scalatest.easymock",
1029990
"org.scalatest.enablers",
1030991
"org.scalatest.events",
1031992
"org.scalatest.exceptions",
1032993
"org.scalatest.fixture",
1033994
"org.scalatest.funsuite",
1034995
"org.scalatest.featurespec",
1035996
"org.scalatest.funspec",
1036-
"org.scalatest.jmock",
1037-
"org.scalatest.junit",
1038997
"org.scalatest.matchers",
1039-
"org.scalatest.mock",
1040-
"org.scalatest.mockito",
1041998
"org.scalatest.path",
1042999
"org.scalatest.prop",
10431000
"org.scalatest.refspec",
1044-
"org.scalatest.selenium",
10451001
"org.scalatest.tags",
10461002
"org.scalatest.tagobjects",
1047-
"org.scalatest.testng",
10481003
"org.scalatest.time",
10491004
"org.scalatest.tools",
10501005
"org.scalatest.verb",
@@ -1284,40 +1239,27 @@ object ScalatestBuild {
12841239
"org.scalatest",
12851240
"org.scalatest.compatible",
12861241
"org.scalatest.concurrent",
1287-
"org.scalatest.easymock",
12881242
"org.scalatest.enablers",
12891243
"org.scalatest.events",
12901244
"org.scalatest.exceptions",
12911245
"org.scalatest.fixture",
12921246
"org.scalatest.funsuite",
12931247
"org.scalatest.featurespec",
12941248
"org.scalatest.funspec",
1295-
"org.scalatest.jmock",
1296-
"org.scalatest.junit",
12971249
"org.scalatest.matchers",
1298-
"org.scalatest.mock",
1299-
"org.scalatest.mockito",
13001250
"org.scalatest.path",
13011251
"org.scalatest.prop",
13021252
"org.scalatest.refspec",
1303-
"org.scalatest.selenium",
13041253
"org.scalatest.tags",
13051254
"org.scalatest.tagobjects",
1306-
"org.scalatest.testng",
13071255
"org.scalatest.time",
13081256
"org.scalatest.tools",
13091257
"org.scalatest.verb",
13101258
"org.scalatest.words",
13111259
"org.scalactic",
13121260
"org.scalactic.anyvals",
13131261
"org.scalactic.exceptions",
1314-
"org.scalactic.source",
1315-
"org.scalatestplus.easymock",
1316-
"org.scalatestplus.jmock",
1317-
"org.scalatestplus.mockito",
1318-
"org.scalatestplus.selenium",
1319-
"org.scalatestplus.junit",
1320-
"org.scalatestplus.testng"
1262+
"org.scalactic.source"
13211263
),
13221264
OsgiKeys.importPackage := Seq(
13231265
"org.scalatest.*",
@@ -1475,12 +1417,9 @@ object ScalatestBuild {
14751417

14761418
def gentestsLibraryDependencies =
14771419
Seq(
1478-
"org.mockito" % "mockito-core" % mockitoVersion % "optional",
1479-
"junit" % "junit" % junitVersion % "optional",
1480-
"org.testng" % "testng" % testngVersion % "optional",
1481-
"org.jmock" % "jmock-legacy" % jmockVersion % "optional",
1482-
"org.pegdown" % "pegdown" % pegdownVersion % "optional"
1483-
1420+
"org.pegdown" % "pegdown" % pegdownVersion % "optional",
1421+
"org.scalatestplus" %% "scalatestplus-testng" % "1.0.0-SNAP2" % "test",
1422+
"org.scalatestplus" %% "scalatestplus-junit" % "1.0.0-SNAP3" % "test"
14841423
)
14851424

14861425
def gentestsSharedSettings: Seq[Setting[_]] = Seq(

‎scalatest-test/src/test/scala/org/scalatest/AppendedCluesSpec.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.scalatest
1818
import exceptions.{GeneratorDrivenPropertyCheckFailedException, TableDrivenPropertyCheckFailedException, TestFailedDueToTimeoutException, TestFailedException, StackDepth, TestCanceledException, ModifiableMessage}
1919

2020
// SKIP-SCALATESTJS,NATIVE-START
21-
import org.scalatest.junit.JUnitTestFailedError
21+
import org.scalatestplus.junit.JUnitTestFailedError
2222
// SKIP-SCALATESTJS,NATIVE-END
2323
import prop.{TableDrivenPropertyChecks, TableFor1}
2424
import time.{Span, Second}

‎scalatest-test/src/test/scala/org/scalatest/BeforeAndAfterAllProp.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package org.scalatest
1717

1818
// SKIP-SCALATESTJS,NATIVE-START
19-
import org.scalatest.junit.JUnit3Suite
20-
import org.scalatest.junit.JUnitSuite
19+
import org.scalatestplus.junit.JUnit3Suite
20+
import org.scalatestplus.junit.JUnitSuite
2121
import org.scalatest.refspec.RefSpec
22-
import org.scalatest.testng.TestNGSuite
22+
import org.scalatestplus.testng.TestNGSuite
2323
import org.junit.Test
2424
import org.testng.annotations.{Test => TestNG }
2525
// SKIP-SCALATESTJS,NATIVE-END

‎scalatest-test/src/test/scala/org/scalatest/CatchReporterProp.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,13 @@
1616
package org.scalatest
1717

1818
import org.scalatest.events._
19-
import org.scalatest.junit._
19+
import org.scalatestplus.junit._
2020
import org.scalatest.time._
2121
import SharedHelpers._
2222
import java.io.ByteArrayOutputStream
2323
import java.io.PrintStream
2424
import org.junit.Test
25-
import org.scalatest.testng.TestNGSuite
25+
import org.scalatestplus.testng.TestNGSuite
2626
import org.scalatest.tools.SuiteSortingReporter
2727
import org.scalatest.tools.TestSortingReporter
2828
import org.testng.annotations.{Test => TestNG }

‎scalatest-test/src/test/scala/org/scalatest/CheckpointsSpec.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ import org.scalatest.Checkpoints._
1919
import org.scalatest.OptionValues._
2020

2121
// SKIP-SCALATESTJS,NATIVE-START
22-
import org.scalatest.junit.AssertionsForJUnit
23-
import org.scalatest.junit.JUnitTestFailedError
22+
import org.scalatestplus.junit.AssertionsForJUnit
23+
import org.scalatestplus.junit.JUnitTestFailedError
2424
// SKIP-SCALATESTJS,NATIVE-END
2525
import org.scalatest.SharedHelpers.thisLineNumber
2626
import org.scalatest.exceptions.TestFailedException

‎scalatest-test/src/test/scala/org/scalatest/ClassTaggingProp.scala‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@
1515
*/
1616
package org.scalatest
1717

18-
import org.scalatest.junit._
18+
import org.scalatestplus.junit._
1919
import org.junit.Test
2020
import org.scalatest.refspec.RefSpec
21-
import org.scalatest.testng.TestNGSuite
21+
import org.scalatestplus.testng.TestNGSuite
2222

2323
class ClassTaggingProp extends AllSuiteProp {
2424

‎scalatest-test/src/test/scala/org/scalatest/ClueSpec.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ package org.scalatest
1818
import exceptions.{GeneratorDrivenPropertyCheckFailedException, TableDrivenPropertyCheckFailedException, TestFailedDueToTimeoutException, TestCanceledException}
1919

2020
// SKIP-SCALATESTJS,NATIVE-START
21-
import org.scalatest.junit.JUnitTestFailedError
21+
import org.scalatestplus.junit.JUnitTestFailedError
2222
// SKIP-SCALATESTJS,NATIVE-END
2323
import prop.TableDrivenPropertyChecks
2424
import TableDrivenPropertyChecks._

‎scalatest-test/src/test/scala/org/scalatest/DeprecatedBeforeAndAfterAllProp.scala‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
package org.scalatest
1717

1818
// SKIP-SCALATESTJS,NATIVE-START
19-
import org.scalatest.junit.JUnit3Suite
20-
import org.scalatest.junit.JUnitSuite
19+
import org.scalatestplus.junit.JUnit3Suite
20+
import org.scalatestplus.junit.JUnitSuite
2121
import org.scalatest.refspec.RefSpec
22-
import org.scalatest.testng.TestNGSuite
22+
import org.scalatestplus.testng.TestNGSuite
2323
import org.junit.Test
2424
import org.testng.annotations.{Test => TestNG }
2525
// SKIP-SCALATESTJS,NATIVE-END

0 commit comments

Comments
 (0)