Skip to content

Commit cdca669

Browse files
bvennersbvenners
committed
Merge branch 'cheeseng-sourceManaged-fix' into 3.0.x
2 parents a98ab59 + bafa9b7 commit cdca669

20 files changed

+1246
-1047
lines changed

‎project/GenCompatibleClasses.scala

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import java.io.{FileWriter, BufferedWriter, File}
22

33
object GenCompatibleClasses {
44

5-
def genMain(targetDir: File, version: String, scalaVersion: String) {
5+
def genMain(targetDir: File, version: String, scalaVersion: String): Seq[File] = {
66
targetDir.mkdirs()
77
val listCellRendererClass = Class.forName("javax.swing.ListCellRenderer")
88
val isJava7 = listCellRendererClass.getTypeParameters.length > 0
@@ -13,23 +13,25 @@ object GenCompatibleClasses {
1313
"EventHolderDefaultListModel" -> "private[tools] class EventHolderDefaultListModel extends DefaultListModel"
1414
)
1515

16-
java6Classes.foreach { case (name, cls) =>
17-
val file = new File(targetDir, name + ".scala")
18-
val bw = new BufferedWriter(new FileWriter(file))
19-
try {
20-
bw.write("package org.scalatest.tools\n")
21-
bw.write("import javax.swing._\n")
22-
if (isJava7)
23-
bw.write(cls + "[EventHolder]")
24-
else
25-
bw.write(cls)
16+
val java6ClassesFiles =
17+
java6Classes.map { case (name, cls) =>
18+
val file = new File(targetDir, name + ".scala")
19+
val bw = new BufferedWriter(new FileWriter(file))
20+
try {
21+
bw.write("package org.scalatest.tools\n")
22+
bw.write("import javax.swing._\n")
23+
if (isJava7)
24+
bw.write(cls + "[EventHolder]")
25+
else
26+
bw.write(cls)
27+
}
28+
finally {
29+
bw.flush()
30+
bw.close()
31+
}
32+
println("Generated " + file.getAbsolutePath)
33+
file
2634
}
27-
finally {
28-
bw.flush()
29-
bw.close()
30-
}
31-
println("Generated " + file.getAbsolutePath)
32-
}
3335

3436
val file = new File(targetDir, "EventHolderListCellRenderer.scala")
3537
val bw = new BufferedWriter(new FileWriter(file))
@@ -63,6 +65,8 @@ object GenCompatibleClasses {
6365
bw.flush()
6466
bw.close()
6567
}
68+
69+
java6ClassesFiles.toSeq ++ Seq(file)
6670
}
6771

6872
def main(args: Array[String]) {

‎project/GenContain1.scala

Lines changed: 129 additions & 125 deletions
Large diffs are not rendered by default.

‎project/GenContain2.scala

Lines changed: 139 additions & 135 deletions
Large diffs are not rendered by default.

‎project/GenEmpty.scala

Lines changed: 37 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ object GenEmpty {
3232
translate(line, mapping.toIterator)
3333
}
3434

35-
def genTest(targetBaseDir: File, version: String, scalaVersion: String) {
35+
def genTest(targetBaseDir: File, version: String, scalaVersion: String): Seq[File] = {
3636

3737
val sourceBaseDir = new File("scalatest-test/src/test/scala/org/scalatest")
38-
val targetDir = new File(targetBaseDir, "emptyTests")
39-
targetDir.mkdirs()
38+
39+
targetBaseDir.mkdirs()
4040

41-
def generateFile(sourceFileName: String, typeName: String, mapping: (String, String)*) {
41+
def generateFile(sourceFileName: String, typeName: String, mapping: (String, String)*): File = {
4242
val generatedFileName = sourceFileName.replaceAll("List", typeName)
43-
val generatedFile = new File(targetDir, generatedFileName)
43+
val generatedFile = new File(targetBaseDir, generatedFileName)
4444
val writer = new BufferedWriter(new FileWriter(generatedFile))
4545
try {
4646
val lines = Source.fromFile(new File(sourceBaseDir, sourceFileName)).getLines().toList // for 2.8
@@ -49,8 +49,10 @@ object GenEmpty {
4949
writer.write(generatedLine.toString)
5050
writer.newLine() // add for 2.8
5151
}
52+
generatedFile
5253
}
5354
finally {
55+
writer.flush()
5456
writer.close()
5557
println("Generated " + generatedFile.getAbsolutePath)
5658
}
@@ -117,34 +119,36 @@ object GenEmpty {
117119
"List" -> "javaMap",
118120
"//ADDITIONAL//" -> "import SharedHelpers.javaMap"
119121
)
120-
121-
generateFile("ListShouldBeEmptySpec.scala", "Array", arrayMapping: _*)
122-
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Array", arrayMapping: _*)
123-
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Array", arrayMapping: _*)
124-
125-
generateFile("ListShouldBeEmptySpec.scala", "Set", setMapping: _*)
126-
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Set", setMapping: _*)
127-
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Set", setMapping: _*)
128-
129-
generateFile("ListShouldBeEmptySpec.scala", "String", stringMapping: _*)
130-
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "String", stringMapping: _*)
131-
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "String", stringMapping: _*)
132-
133-
generateFile("ListShouldBeEmptySpec.scala", "Option", optionMapping: _*)
134-
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Option", optionMapping: _*)
135-
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Option", optionMapping: _*)
136-
137-
generateFile("ListShouldBeEmptySpec.scala", "Map", mapMapping: _*)
138-
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Map", mapMapping: _*)
139-
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Map", mapMapping: _*)
140-
141-
generateFile("ListShouldBeEmptySpec.scala", "JavaCol", javaColMapping: _*)
142-
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "JavaCol", javaColMapping: _*)
143-
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "JavaCol", javaColMapping: _*)
144-
145-
generateFile("ListShouldBeEmptySpec.scala", "JavaMap", javaMapMapping: _*)
146-
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "JavaMap", javaMapMapping: _*)
147-
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "JavaMap", javaMapMapping: _*)
122+
123+
Seq(
124+
generateFile("ListShouldBeEmptySpec.scala", "Array", arrayMapping: _*),
125+
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Array", arrayMapping: _*),
126+
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Array", arrayMapping: _*),
127+
128+
generateFile("ListShouldBeEmptySpec.scala", "Set", setMapping: _*),
129+
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Set", setMapping: _*),
130+
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Set", setMapping: _*),
131+
132+
generateFile("ListShouldBeEmptySpec.scala", "String", stringMapping: _*),
133+
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "String", stringMapping: _*),
134+
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "String", stringMapping: _*),
135+
136+
generateFile("ListShouldBeEmptySpec.scala", "Option", optionMapping: _*),
137+
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Option", optionMapping: _*),
138+
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Option", optionMapping: _*),
139+
140+
generateFile("ListShouldBeEmptySpec.scala", "Map", mapMapping: _*),
141+
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "Map", mapMapping: _*),
142+
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "Map", mapMapping: _*),
143+
144+
generateFile("ListShouldBeEmptySpec.scala", "JavaCol", javaColMapping: _*),
145+
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "JavaCol", javaColMapping: _*),
146+
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "JavaCol", javaColMapping: _*),
147+
148+
generateFile("ListShouldBeEmptySpec.scala", "JavaMap", javaMapMapping: _*),
149+
generateFile("ListShouldBeEmptyLogicalAndSpec.scala", "JavaMap", javaMapMapping: _*),
150+
generateFile("ListShouldBeEmptyLogicalOrSpec.scala", "JavaMap", javaMapMapping: _*)
151+
)
148152
}
149153

150154
def main(args: Array[String]) {

‎project/GenFactories.scala

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3011,16 +3011,16 @@ private[scalatest] class MatcherFactory$arity$Macro[-SC, $typeConstructors$] {
30113011
*/
30123012
}
30133013

3014-
def genMain(dir: File, version: String, scalaVersion: String) {
3014+
def genMain(dir: File, version: String, scalaVersion: String): Seq[File] = {
30153015
dir.mkdirs()
3016-
for (arity <- 1 to MaxArity) {
3016+
for (arity <- 1 to MaxArity) yield {
30173017
genMatcherFactory(dir, arity, false)
30183018
}
30193019
}
30203020

3021-
def genMainJS(dir: File, version: String, scalaVersion: String): Unit = {
3021+
def genMainJS(dir: File, version: String, scalaVersion: String): Seq[File] = {
30223022
dir.mkdirs()
3023-
for (arity <- 1 to MaxArity) {
3023+
for (arity <- 1 to MaxArity) yield {
30243024
genMatcherFactory(dir, arity, true)
30253025
}
30263026
}
@@ -3046,7 +3046,7 @@ private[scalatest] class MatcherFactory$arity$Macro[-SC, $typeConstructors$] {
30463046
}.mkString("\n")
30473047
}
30483048

3049-
def genMatcherFactory(targetDir: File, arity: Int, scalaJS: Boolean) {
3049+
def genMatcherFactory(targetDir: File, arity: Int, scalaJS: Boolean): File = {
30503050

30513051
def setCommonOnes(arity: Int, st: org.antlr.stringtemplate.StringTemplate) {
30523052
if (arity == 1)
@@ -3060,7 +3060,8 @@ private[scalatest] class MatcherFactory$arity$Macro[-SC, $typeConstructors$] {
30603060
st.setAttribute("commaSeparatedTCNs", commaSeparatedTCNs);
30613061
}
30623062

3063-
val bw = new BufferedWriter(new FileWriter(new File(targetDir, "MatcherFactory" + arity + ".scala")))
3063+
val targetFile = new File(targetDir, "MatcherFactory" + arity + ".scala")
3064+
val bw = new BufferedWriter(new FileWriter(targetFile))
30643065

30653066
try {
30663067

@@ -3118,6 +3119,8 @@ private[scalatest] class MatcherFactory$arity$Macro[-SC, $typeConstructors$] {
31183119
else {
31193120
bw.write("}\n")
31203121
}
3122+
3123+
targetFile
31213124
}
31223125
finally {
31233126
bw.close()

‎project/GenFramework.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,11 +383,12 @@ object Generator {
383383
def getFirstNot[T](col: GenTraversable[T], predicate: T => Boolean): T =
384384
getNextNot(col.toIterator, predicate)
385385

386-
def genFile(targetFile: File, template: ScalaFileTemplate) = {
386+
def genFile(targetFile: File, template: ScalaFileTemplate): File = {
387387
val content = template.toString
388388
val writer = new BufferedWriter(new FileWriter(targetFile))
389389
try {
390390
writer.write(content)
391+
targetFile
391392
}
392393
finally {
393394
writer.flush()

‎project/GenGen.scala

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2525,9 +2525,10 @@ $okayExpressions$
25252525

25262526
val thisYear = Calendar.getInstance.get(Calendar.YEAR)
25272527

2528-
def genPropertyChecks(targetDir: File) {
2528+
def genPropertyChecks(targetDir: File): Seq[File] = {
25292529
targetDir.mkdirs()
2530-
val bw = new BufferedWriter(new FileWriter(new File(targetDir, "GeneratorDrivenPropertyChecks.scala")))
2530+
val targetFile = new File(targetDir, "GeneratorDrivenPropertyChecks.scala")
2531+
val bw = new BufferedWriter(new FileWriter(targetFile))
25312532

25322533
try {
25332534
val st = new org.antlr.stringtemplate.StringTemplate(copyrightTemplate)
@@ -2582,14 +2583,17 @@ $okayExpressions$
25822583
}
25832584
bw.write("}\n")
25842585
bw.write(generatorDrivenPropertyChecksCompanionObjectVerbatimString)
2586+
2587+
Seq(targetFile)
25852588
}
25862589
finally {
2590+
bw.flush()
25872591
bw.close()
25882592
}
25892593
}
25902594

25912595
// Invitation style indicates how GeneratorDrivenPropertyChecks is imported
2592-
def genGeneratorDrivenSuite(targetDir: File, mixinInvitationStyle: Boolean, withTables: Boolean, doItForCheckers: Boolean) {
2596+
def genGeneratorDrivenSuite(targetDir: File, mixinInvitationStyle: Boolean, withTables: Boolean, doItForCheckers: Boolean): Seq[File] = {
25932597

25942598
targetDir.mkdirs()
25952599

@@ -2602,7 +2606,8 @@ $okayExpressions$
26022606
val suiteClassName = traitOrObjectName + (if (mixinInvitationStyle) "Mixin" else "Import") + "Suite"
26032607
val fileName = suiteClassName + ".scala"
26042608

2605-
val bw = new BufferedWriter(new FileWriter(new File(targetDir, fileName)))
2609+
val targetFile = new File(targetDir, fileName)
2610+
val bw = new BufferedWriter(new FileWriter(targetFile))
26062611

26072612
try {
26082613
val st = new org.antlr.stringtemplate.StringTemplate(copyrightTemplate)
@@ -2675,8 +2680,11 @@ $okayExpressions$
26752680
}
26762681

26772682
bw.write("}\n")
2683+
2684+
Seq(targetFile)
26782685
}
26792686
finally {
2687+
bw.flush()
26802688
bw.close()
26812689
}
26822690
}
@@ -2694,16 +2702,16 @@ $okayExpressions$
26942702
genTest(testDir, version, scalaVersion)
26952703
}
26962704

2697-
def genMain(dir: File, version: String, scalaVersion: String) {
2705+
def genMain(dir: File, version: String, scalaVersion: String): Seq[File] = {
26982706
genPropertyChecks(dir)
26992707
}
27002708

2701-
def genTest(dir: File, version: String, scalaVersion: String) {
2702-
genGeneratorDrivenSuite(dir, true, false, false)
2703-
genGeneratorDrivenSuite(dir, false, false, false)
2704-
genGeneratorDrivenSuite(dir, true, true, false)
2705-
genGeneratorDrivenSuite(dir, false, true, false)
2706-
genGeneratorDrivenSuite(dir, true, true, true)
2709+
def genTest(dir: File, version: String, scalaVersion: String): Seq[File] = {
2710+
genGeneratorDrivenSuite(dir, true, false, false) ++
2711+
genGeneratorDrivenSuite(dir, false, false, false) ++
2712+
genGeneratorDrivenSuite(dir, true, true, false) ++
2713+
genGeneratorDrivenSuite(dir, false, true, false) ++
2714+
genGeneratorDrivenSuite(dir, true, true, true) ++
27072715
genGeneratorDrivenSuite(dir, false, true, true)
27082716
}
27092717
}

‎project/GenInspectors.scala

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1446,7 +1446,7 @@ object GenInspectors {
14461446
override def toString = childrenContent
14471447
}
14481448

1449-
def genForAllSpecFile(targetDir: File) {
1449+
def genForAllSpecFile(targetDir: File): File = {
14501450
val forAllSpecFile = new File(targetDir, "ForAllInspectorsSpec.scala")
14511451
genFile(
14521452
forAllSpecFile,
@@ -1475,7 +1475,7 @@ object GenInspectors {
14751475
)
14761476
}
14771477

1478-
def genForAtLeastSpecFile(targetDir: File) {
1478+
def genForAtLeastSpecFile(targetDir: File): File = {
14791479
val forAtLeastSpecFile = new File(targetDir, "ForAtLeastInspectorsSpec.scala")
14801480
genFile(
14811481
forAtLeastSpecFile,
@@ -1504,7 +1504,7 @@ object GenInspectors {
15041504
)
15051505
}
15061506

1507-
def genForAtMostSpecFile(targetDir: File) {
1507+
def genForAtMostSpecFile(targetDir: File): File = {
15081508
val forAtMostSpecFile = new File(targetDir, "ForAtMostInspectorsSpec.scala")
15091509
genFile(
15101510
forAtMostSpecFile,
@@ -1533,7 +1533,7 @@ object GenInspectors {
15331533
)
15341534
}
15351535

1536-
def genForExactlySpecFile(targetDir: File) {
1536+
def genForExactlySpecFile(targetDir: File): File = {
15371537
val forExactlySpecFile = new File(targetDir, "ForExactlyInspectorsSpec.scala")
15381538
genFile(
15391539
forExactlySpecFile,
@@ -1562,7 +1562,7 @@ object GenInspectors {
15621562
)
15631563
}
15641564

1565-
def genForNoSpecFile(targetDir: File) {
1565+
def genForNoSpecFile(targetDir: File): File = {
15661566
val forNoSpecFile = new File(targetDir, "ForNoInspectorsSpec.scala")
15671567
genFile(
15681568
forNoSpecFile,
@@ -1591,7 +1591,7 @@ object GenInspectors {
15911591
)
15921592
}
15931593

1594-
def genForBetweenSpecFile(targetDir: File) {
1594+
def genForBetweenSpecFile(targetDir: File): File = {
15951595
val forBetweenSpecFile = new File(targetDir, "ForBetweenInspectorsSpec.scala")
15961596
genFile(
15971597
forBetweenSpecFile,
@@ -1620,7 +1620,7 @@ object GenInspectors {
16201620
)
16211621
}
16221622

1623-
def genForEverySpecFile(targetDir: File) {
1623+
def genForEverySpecFile(targetDir: File): File = {
16241624
val forEverySpecFile = new File(targetDir, "ForEveryInspectorsSpec.scala")
16251625
genFile(
16261626
forEverySpecFile,
@@ -1649,7 +1649,7 @@ object GenInspectors {
16491649
)
16501650
}
16511651

1652-
def genNestedInspectorsSpecFile(targetDir: File) {
1652+
def genNestedInspectorsSpecFile(targetDir: File): File = {
16531653
val nestedInspectorsSpecFile = new File(targetDir, "NestedInspectorsSpec.scala")
16541654
genFile(
16551655
nestedInspectorsSpecFile,
@@ -1762,15 +1762,17 @@ object GenInspectors {
17621762
targetDir
17631763
}
17641764

1765-
def genTest(targetBaseDir: File, version: String, scalaVersion: String) {
1766-
genForAllSpecFile(targetDir(targetBaseDir, "forall"))
1767-
genForAtLeastSpecFile(targetDir(targetBaseDir, "foratleast"))
1768-
genForAtMostSpecFile(targetDir(targetBaseDir, "foratmost"))
1769-
genForExactlySpecFile(targetDir(targetBaseDir, "forexactly"))
1770-
genForNoSpecFile(targetDir(targetBaseDir, "forno"))
1771-
genForBetweenSpecFile(targetDir(targetBaseDir, "forbetween"))
1772-
genForEverySpecFile(targetDir(targetBaseDir, "forevery"))
1773-
genNestedInspectorsSpecFile(targetDir(targetBaseDir, "nested"))
1765+
def genTest(targetBaseDir: File, version: String, scalaVersion: String): Seq[File] = {
1766+
Seq(
1767+
genForAllSpecFile(targetDir(targetBaseDir, "forall")),
1768+
genForAtLeastSpecFile(targetDir(targetBaseDir, "foratleast")),
1769+
genForAtMostSpecFile(targetDir(targetBaseDir, "foratmost")),
1770+
genForExactlySpecFile(targetDir(targetBaseDir, "forexactly")),
1771+
genForNoSpecFile(targetDir(targetBaseDir, "forno")),
1772+
genForBetweenSpecFile(targetDir(targetBaseDir, "forbetween")),
1773+
genForEverySpecFile(targetDir(targetBaseDir, "forevery")),
1774+
genNestedInspectorsSpecFile(targetDir(targetBaseDir, "nested"))
1775+
)
17741776
}
17751777

17761778
def main(args: Array[String]) {

0 commit comments

Comments
 (0)