Merge branch 'cheeseng-feature-gengen-must-matchers-tests-for-js-native' into 3.1.x

Author: bvenners

project/GenGen.scala

@@ -4230,4 +4230,19 @@ $okayAssertions$
     genGeneratorDrivenSuite(dir, false, true, generatorSuiteExpectTemplate, "expect", false)*/
 
   }
+
+  def genTestForNative(dir: File, version: String, scalaVersion: String): Seq[File] = {
+    genGeneratorDrivenSuite(dir, true, false, generatorSuiteAssertTemplate, "assert", false) ++
+    genGeneratorDrivenSuite(dir, false, false, generatorSuiteAssertTemplate, "assert", false) ++
+    genGeneratorDrivenSuite(dir, true, true, generatorSuiteAssertTemplate, "assert", false) ++
+    genGeneratorDrivenSuite(dir, false, true, generatorSuiteAssertTemplate, "assert", false) /*++
+    genGeneratorDrivenSuite(dir, true, false, generatorSuiteFutureAssertTemplate, "assert", true) ++
+    genGeneratorDrivenSuite(dir, false, false, generatorSuiteFutureAssertTemplate, "assert", true) ++
+    genGeneratorDrivenSuite(dir, true, true, generatorSuiteFutureAssertTemplate, "assert", true) ++
+    genGeneratorDrivenSuite(dir, false, true, generatorSuiteFutureAssertTemplate, "assert", true) ++
+    genGeneratorDrivenSuite(dir, true, false, generatorSuiteExpectTemplate, "expect", false) ++
+    genGeneratorDrivenSuite(dir, false, false, generatorSuiteExpectTemplate, "expect", false) ++
+    genGeneratorDrivenSuite(dir, true, true, generatorSuiteExpectTemplate, "expect", false) ++
+    genGeneratorDrivenSuite(dir, false, true, generatorSuiteExpectTemplate, "expect", false)*/
+  }
 }

project/GenMustMatchersTests.scala

@@ -120,7 +120,11 @@ trait GenMustMatchersTestsBase {
     genTestImpl(targetBaseDir, version, scalaVersion, false)
   }
 
-  def genTestForScalaJS(targetBaseDir: File, version: String, scalaVersion: String): Unit = {
+  def genTestForScalaJS(targetBaseDir: File, version: String, scalaVersion: String): Seq[File] = {
+    genTestImpl(targetBaseDir, version, scalaVersion, true)
+  }
+
+  def genTestForScalaNative(targetBaseDir: File, version: String, scalaVersion: String): Seq[File] = {
     genTestImpl(targetBaseDir, version, scalaVersion, true)
   }
 

project/scalatest.scala

@@ -1080,11 +1080,15 @@ object ScalatestBuild {
         Def.task {
           GenScalaTestJS.genTest((sourceManaged in Test).value, version.value, scalaVersion.value)
         }.taskValue
-      }/*,
-      sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest),
-      sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)*/
+      },
+      sourceGenerators in Test +=
+        Def.task {
+          GenGen.genTest((sourceManaged in Test).value, version.value, scalaVersion.value)
+        },
+      sourceGenerators in Test +=
+        Def.task {
+          GenMustMatchersTests.genTestForScalaJS((sourceManaged in Test).value, version.value, scalaVersion.value)
+        }
     ).dependsOn(scalatestJS % "test", commonTestJS % "test").enablePlugins(ScalaJSPlugin)
 
   lazy val scalatestNative = Project("scalatestNative", file("scalatest.native"))
@@ -1206,11 +1210,15 @@ object ScalatestBuild {
         Def.task {
           GenScalaTestNative.genTest((sourceManaged in Test).value / "scala", version.value, scalaVersion.value)
         }.taskValue
-      }/*,
-      sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("gengen", "GenGen.scala")(GenGen.genTest),
-      sourceGenerators in Test <+=
-        (baseDirectory, sourceManaged in Test, version, scalaVersion) map genFiles("genmatchers", "GenMustMatchersTests.scala")(GenMustMatchersTests.genTestForScalaJS)*/
+      }, 
+      sourceGenerators in Test +=
+        Def.task {
+          GenGen.genTestForNative((sourceManaged in Test).value, version.value, scalaVersion.value)
+        }/*,  // OOM even with 14gb heap size, will turn this one when 32gb machine is common or if newer scala-native use lesser memory.
+      sourceGenerators in Test +=
+        Def.task {
+          GenMustMatchersTests.genTestForScalaNative((sourceManaged in Test).value, version.value, scalaVersion.value)
+        }*/
     ).dependsOn(scalatestNative % "test", commonTestNative % "test").enablePlugins(ScalaNativePlugin)
 
   lazy val scalatestApp = Project("scalatestApp", file("."))
@@ -1727,13 +1735,6 @@ object ScalatestBuild {
     results
   }
 
-  /*def genFiles(generatorSource: File, generatedFile: File)(genFun: => Seq[File]): Seq[File] = {
-    if (generatedFile.exists || generatorSource.lastModified > generatedFile.lastModified)
-      genFun()
-    else
-      Seq.empty[File]
-  }*/
-
   def genJavaFiles(name: String, generatorSource: String)(gen: (File, String, String) => Unit)(basedir: File, outDir: File, theVersion: String, theScalaVersion: String): Seq[File] = {
     val tdir = outDir / "java" / name
     val genSource = basedir / "project" / generatorSource