Skip to content

Commit 0a45eaf

Browse files
cheesengcheeseng
committed
Merge branch '3.1.x' of git://github.com/scalatest/scalatest into pass-2.13-tests
2 parents e39c528 + 5fc7c4b commit 0a45eaf

Some content is hidden

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

47 files changed

+10811
-10436
lines changed

‎project/GenGen.scala‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4230,4 +4230,19 @@ $okayAssertions$
42304230
genGeneratorDrivenSuite(dir, false, true, generatorSuiteExpectTemplate, "expect", false)*/
42314231

42324232
}
4233+
4234+
def genTestForNative(dir: File, version: String, scalaVersion: String): Seq[File] = {
4235+
genGeneratorDrivenSuite(dir, true, false, generatorSuiteAssertTemplate, "assert", false) ++
4236+
genGeneratorDrivenSuite(dir, false, false, generatorSuiteAssertTemplate, "assert", false) ++
4237+
genGeneratorDrivenSuite(dir, true, true, generatorSuiteAssertTemplate, "assert", false) ++
4238+
genGeneratorDrivenSuite(dir, false, true, generatorSuiteAssertTemplate, "assert", false) /*++
4239+
genGeneratorDrivenSuite(dir, true, false, generatorSuiteFutureAssertTemplate, "assert", true) ++
4240+
genGeneratorDrivenSuite(dir, false, false, generatorSuiteFutureAssertTemplate, "assert", true) ++
4241+
genGeneratorDrivenSuite(dir, true, true, generatorSuiteFutureAssertTemplate, "assert", true) ++
4242+
genGeneratorDrivenSuite(dir, false, true, generatorSuiteFutureAssertTemplate, "assert", true) ++
4243+
genGeneratorDrivenSuite(dir, true, false, generatorSuiteExpectTemplate, "expect", false) ++
4244+
genGeneratorDrivenSuite(dir, false, false, generatorSuiteExpectTemplate, "expect", false) ++
4245+
genGeneratorDrivenSuite(dir, true, true, generatorSuiteExpectTemplate, "expect", false) ++
4246+
genGeneratorDrivenSuite(dir, false, true, generatorSuiteExpectTemplate, "expect", false)*/
4247+
}
42334248
}

‎project/GenMustMatchersTests.scala‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,11 @@ trait GenMustMatchersTestsBase {
120120
genTestImpl(targetBaseDir, version, scalaVersion, false)
121121
}
122122

123-
def genTestForScalaJS(targetBaseDir: File, version: String, scalaVersion: String): Unit = {
123+
def genTestForScalaJS(targetBaseDir: File, version: String, scalaVersion: String): Seq[File] = {
124+
genTestImpl(targetBaseDir, version, scalaVersion, true)
125+
}
126+
127+
def genTestForScalaNative(targetBaseDir: File, version: String, scalaVersion: String): Seq[File] = {
124128
genTestImpl(targetBaseDir, version, scalaVersion, true)
125129
}
126130

‎project/GenScalaTestDotty.scala‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,6 +151,8 @@ object GenScalaTestDotty {
151151
copyDir("scalatest/src/main/scala/org/scalatest/featurespec", "org/scalatest/featurespec", targetDir, List.empty) ++
152152
copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir, List.empty) ++
153153
copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir, List.empty) ++
154+
copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
155+
copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
154156
copyDir("scalatest/src/main/scala/org/scalatest/matchers", "org/scalatest/matchers", targetDir,
155157
List(
156158
"Matcher.scala", // Re-implemented with new macro
@@ -176,7 +178,9 @@ object GenScalaTestDotty {
176178
def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
177179
copyFiles("scalatest-test/src/test/scala/org/scalatest", "org/scalatest", targetDir,
178180
List(
179-
"AssertionsSpec.scala"
181+
"AssertionsSpec.scala",
182+
"ShouldCompileSpec.scala",
183+
"ShouldNotCompileSpec.scala"
180184
)
181185
) /*++
182186
copyDir("scalatest-test/src/test/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,

‎project/GenScalaTestJS.scala‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -218,6 +218,8 @@ object GenScalaTestJS {
218218
copyDir("scalatest/src/main/scala/org/scalatest/funsuite", "org/scalatest/funsuite", targetDir, List.empty) ++
219219
copyDir("scalatest/src/main/scala/org/scalatest/featurespec", "org/scalatest/featurespec", targetDir, List.empty) ++
220220
copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir, List.empty) ++
221+
copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir, List.empty) ++
222+
copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir, List.empty) ++
221223
copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
222224
copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
223225
List(

‎project/GenScalaTestNative.scala‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,12 @@ object GenScalaTestNative {
211211
copyDir("scalatest/src/main/scala/org/scalatest/funspec", "org/scalatest/funspec", targetDir,
212212
asyncs("scalatest/src/main/scala/org/scalatest/funspec")
213213
) ++
214+
copyDir("scalatest/src/main/scala/org/scalatest/freespec", "org/scalatest/freespec", targetDir,
215+
asyncs("scalatest/src/main/scala/org/scalatest/freespec")
216+
) ++
217+
copyDir("scalatest/src/main/scala/org/scalatest/flatspec", "org/scalatest/flatspec", targetDir,
218+
asyncs("scalatest/src/main/scala/org/scalatest/flatspec")
219+
) ++
214220
copyDir("scalatest/src/main/scala/org/scalatest/prop", "org/scalatest/prop", targetDir, List.empty) ++
215221
copyDir("scalatest/src/main/scala/org/scalatest/concurrent", "org/scalatest/concurrent", targetDir,
216222
List(

‎project/GenScalacticDotty.scala‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -149,13 +149,12 @@ object GenScalacticDotty {
149149
def genTest(targetDir: File, version: String, scalaVersion: String): Seq[File] =
150150
copyDir("scalactic-test/src/test/scala/org/scalactic", "org/scalactic", targetDir,
151151
List(
152-
"AccumulationSpec.scala", // ClassFormatError: Illegal field modifiers in class org/scalatest/prop/Tables: 0x9
153152
"CanEqualSpec.scala", // NotImplementedError
154-
"ChainSpec.scala", // Hang the compiler
153+
"ChainSpec.scala", // Compilation error to be investigated further
155154
"DecidersSpec.scala", // Compilation error to be investigated further
156-
"DifferSpec.scala", // macro expansion error: invalid prefix NoType
155+
"DifferSpec.scala", // Test failed when run to be investigate further.
157156
"DirectRequirementsSpec.scala", // macro expansion error: invalid prefix NoType
158-
"EverySpec.scala", // This hangs dotty
157+
"EverySpec.scala", // Compilation error to be investigated further
159158
"FutureSugarSpec.scala", // Implementation missing
160159
"NormalizationSpec.scala", // Compilation error to be investigated further.
161160
"NormMethodsSpec.scala", // Compilation error to be investigated further.

‎project/scalatest.scala‎

Lines changed: 31 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -797,6 +797,8 @@ object ScalatestBuild {
797797
"org.scalatest.funsuite",
798798
"org.scalatest.featurespec",
799799
"org.scalatest.funspec",
800+
"org.scalatest.freespec",
801+
"org.scalatest.flatpec",
800802
"org.scalatest.matchers",
801803
"org.scalatest.path",
802804
"org.scalatest.prop",
@@ -903,6 +905,8 @@ object ScalatestBuild {
903905
"org.scalatest.funsuite",
904906
"org.scalatest.featurespec",
905907
"org.scalatest.funspec",
908+
"org.scalatest.freespec",
909+
"org.scalatest.flatspec",
906910
"org.scalatest.matchers",
907911
"org.scalatest.path",
908912
"org.scalatest.prop",
@@ -995,6 +999,8 @@ object ScalatestBuild {
995999
"org.scalatest.funsuite",
9961000
"org.scalatest.featurespec",
9971001
"org.scalatest.funspec",
1002+
"org.scalatest.freespec",
1003+
"org.scalatest.flatspec",
9981004
"org.scalatest.matchers",
9991005
"org.scalatest.path",
10001006
"org.scalatest.prop",
@@ -1030,7 +1036,7 @@ object ScalatestBuild {
10301036
projectTitle := "ScalaTest Test",
10311037
organization := "org.scalatest",
10321038
libraryDependencies ++= scalatestLibraryDependencies,
1033-
libraryDependencies ++= scalatestTestLibraryDependencies(scalaVersion.value),
1039+
//libraryDependencies ++= scalatestTestLibraryDependencies(scalaVersion.value),
10341040
testOptions in Test := scalatestTestOptions,
10351041
logBuffered in Test := false,
10361042
//fork in Test := true,
@@ -1074,11 +1080,15 @@ object ScalatestBuild {
10741080
Def.task {
10751081
GenScalaTestJS.genTest((sourceManaged in Test).value, version.value, scalaVersion.value)
10761082
}.taskValue
1077-
}/*,
1078-
sourceGenerators in Test <+=
1079-
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest),
1080-
sourceGenerators in Test <+=
1081-
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)*/
1083+
},
1084+
sourceGenerators in Test +=
1085+
Def.task {
1086+
GenGen.genTest((sourceManaged in Test).value, version.value, scalaVersion.value)
1087+
},
1088+
sourceGenerators in Test +=
1089+
Def.task {
1090+
GenMustMatchersTests.genTestForScalaJS((sourceManaged in Test).value, version.value, scalaVersion.value)
1091+
}
10821092
).dependsOn(scalatestJS % "test", commonTestJS % "test").enablePlugins(ScalaJSPlugin)
10831093

10841094
lazy val scalatestNative = Project("scalatestNative", file("scalatest.native"))
@@ -1200,11 +1210,15 @@ object ScalatestBuild {
12001210
Def.task {
12011211
GenScalaTestNative.genTest((sourceManaged in Test).value / "scala", version.value, scalaVersion.value)
12021212
}.taskValue
1203-
}/*,
1204-
sourceGenerators in Test <+=
1205-
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest),
1206-
sourceGenerators in Test <+=
1207-
(baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)*/
1213+
},
1214+
sourceGenerators in Test +=
1215+
Def.task {
1216+
GenGen.genTestForNative((sourceManaged in Test).value, version.value, scalaVersion.value)
1217+
}/*, // OOM even with 14gb heap size, will turn this one when 32gb machine is common or if newer scala-native use lesser memory.
1218+
sourceGenerators in Test +=
1219+
Def.task {
1220+
GenMustMatchersTests.genTestForScalaNative((sourceManaged in Test).value, version.value, scalaVersion.value)
1221+
}*/
12081222
).dependsOn(scalatestNative % "test", commonTestNative % "test").enablePlugins(ScalaNativePlugin)
12091223

12101224
lazy val scalatestApp = Project("scalatestApp", file("."))
@@ -1247,6 +1261,8 @@ object ScalatestBuild {
12471261
"org.scalatest.funsuite",
12481262
"org.scalatest.featurespec",
12491263
"org.scalatest.funspec",
1264+
"org.scalatest.freespec",
1265+
"org.scalatest.flatspec",
12501266
"org.scalatest.matchers",
12511267
"org.scalatest.path",
12521268
"org.scalatest.prop",
@@ -1317,6 +1333,8 @@ object ScalatestBuild {
13171333
"org.scalatest.funsuite",
13181334
"org.scalatest.featurespec",
13191335
"org.scalatest.funspec",
1336+
"org.scalatest.freespec",
1337+
"org.scalatest.flatspec",
13201338
"org.scalatest.matchers",
13211339
"org.scalatest.path",
13221340
"org.scalatest.prop",
@@ -1385,6 +1403,8 @@ object ScalatestBuild {
13851403
"org.scalatest.funsuite",
13861404
"org.scalatest.featurespec",
13871405
"org.scalatest.funspec",
1406+
"org.scalatest.freespec",
1407+
"org.scalatest.flatspec",
13881408
"org.scalatest.matchers",
13891409
"org.scalatest.path",
13901410
"org.scalatest.prop",
@@ -1715,13 +1735,6 @@ object ScalatestBuild {
17151735
results
17161736
}
17171737

1718-
/*def genFiles(generatorSource: File, generatedFile: File)(genFun: => Seq[File]): Seq[File] = {
1719-
if (generatedFile.exists || generatorSource.lastModified > generatedFile.lastModified)
1720-
genFun()
1721-
else
1722-
Seq.empty[File]
1723-
}*/
1724-
17251738
def genJavaFiles(name: String, generatorSource: String)(gen: (File, String, String) => Unit)(basedir: File, outDir: File, theVersion: String, theScalaVersion: String): Seq[File] = {
17261739
val tdir = outDir / "java" / name
17271740
val genSource = basedir / "project" / generatorSource

‎scalactic.dotty/src/main/scala/org/scalactic/source/Position.scala‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ object Position {
7171
import refl._
7272

7373
val file = refl.rootPosition.sourceFile
74-
val fileName: String = file.getFileName.toString
74+
val fileName: String = file.jpath.getFileName.toString
7575
val filePath: String = if (showScalacticFillFilePathnames) file.toString else Resources.pleaseDefineScalacticFillFilePathnameEnvVar()
7676
val lineNo: Int = refl.rootPosition.startLine
7777
'{ Position(${fileName.toExpr}, ${filePath.toExpr}, ${lineNo.toExpr}) }

0 commit comments

Comments
 (0)