Changed GenIdeaTests to use ScriptTestSuite

8 files changed, 47 insertions, 54 deletions

diff --git a/scalalib/test/resources/gen-idea-hello-world/build.sc b/scalalib/test/resources/gen-idea-hello-world/build.sc
new file mode 100644
index 00000000..53cd26a9
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/build.sc
@@ -0,0 +1,11 @@
+import mill.scalalib
+import $ivy.`com.lihaoyi::mill-contrib-buildinfo:0.4.0`
+
+trait HelloWorldModule extends scalalib.ScalaModule {
+  def scalaVersion = "2.12.4"
+  object test extends super.Tests {
+    def testFrameworks = Seq("utest.runner.Framework")
+  }
+}
+
+object HelloWorld extends HelloWorldModule
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml b/scalalib/test/resources/gen-idea-hello-world/idea/libraries/scala-library-2.12.4.jar.xml
index 5f7c5056..5f7c5056 100644
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/libraries/scala-library-2.12.4.jar.xml
diff --git a/scalalib/test/resources/gen-idea/idea/misc.xml b/scalalib/test/resources/gen-idea-hello-world/idea/misc.xml
index 2726692f..2726692f 100644
--- a/scalalib/test/resources/gen-idea/idea/misc.xml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/misc.xml
diff --git a/scalalib/test/resources/gen-idea/idea/modules.xml b/scalalib/test/resources/gen-idea-hello-world/idea/modules.xml
index d6334ea3..193fa62d 100644
--- a/scalalib/test/resources/gen-idea/idea/modules.xml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/modules.xml
@@ -2,8 +2,8 @@
     <component name="ProjectModuleManager">
         <modules>
             <module fileurl="file://$PROJECT_DIR$/.idea_modules/mill-build.iml" filepath="$PROJECT_DIR$/.idea_modules/mill-build.iml"/>
-            <module fileurl="file://$PROJECT_DIR$/.idea_modules/.iml" filepath="$PROJECT_DIR$/.idea_modules/.iml"/>
-            <module fileurl="file://$PROJECT_DIR$/.idea_modules/test.iml" filepath="$PROJECT_DIR$/.idea_modules/test.iml"/>
+            <module fileurl="file://$PROJECT_DIR$/.idea_modules/helloworld.iml" filepath="$PROJECT_DIR$/.idea_modules/helloworld.iml"/>
+            <module fileurl="file://$PROJECT_DIR$/.idea_modules/helloworld.test.iml" filepath="$PROJECT_DIR$/.idea_modules/helloworld.test.iml"/>
         </modules>
     </component>
 </project>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.iml
index 13e8daf7..38ea17be 100644
--- a/scalalib/test/resources/gen-idea/idea_modules/iml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.iml
@@ -1,12 +1,12 @@
 <module type="JAVA_MODULE" version="4">
     <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/compile/dest/classes"/>
+        <output url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/compile/dest/classes"/>
         <exclude-output/>
-        <content url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/generatedSources/dest"/>
-        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea">
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/src" isTestSource="false"/>
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/resources" type="java-resource"/>
-            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/target"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/generatedSources/dest"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld">
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/src" isTestSource="false"/>
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/resources" type="java-resource"/>
+            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/target"/>
         </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/test.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml
index aecae2e3..bfe0ff3c 100644
--- a/scalalib/test/resources/gen-idea/idea_modules/test.iml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml
@@ -1,18 +1,18 @@
 <module type="JAVA_MODULE" version="4">
     <component name="NewModuleRootManager">
-        <output-test url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/compile/dest/classes"/>
+        <output-test url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/test/compile/dest/classes"/>
         <exclude-output/>
-        <content url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/test/generatedSources/dest"/>
-        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea/test">
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/src" isTestSource="true"/>
-            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/resources" type="java-test-resource"/>
-            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/test/target"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/out/HelloWorld/test/generatedSources/dest"/>
+        <content url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test">
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test/src" isTestSource="true"/>
+            <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test/resources" type="java-test-resource"/>
+            <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea-hello-world/HelloWorld/test/target"/>
         </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
         <orderEntry type="library" name="scala-sdk-2.12.4" level="application"/>
         <orderEntry type="library" name="scala-library-2.12.4-sources.jar" level="project"/>
         <orderEntry type="library" name="scala-library-2.12.4.jar" level="project"/>
-        <orderEntry type="module" module-name="" exported=""/>
+        <orderEntry type="module" module-name="helloworld" exported=""/>
     </component>
 </module>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
index 46fd8c3b..46fd8c3b 100644
--- a/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
diff --git a/scalalib/test/src/GenIdeaTests.scala b/scalalib/test/src/GenIdeaTests.scala
index 60c9f9a8..efd6381c 100644
--- a/scalalib/test/src/GenIdeaTests.scala
+++ b/scalalib/test/src/GenIdeaTests.scala
@@ -1,50 +1,29 @@
 package mill.scalalib
 
-import mill._
-import mill.util.{TestEvaluator, TestUtil}
+import mill.util.ScriptTestSuite
+import os.Path
 import utest._
 
-object GenIdeaTests extends TestSuite {
-
-  val millSourcePath = os.pwd / 'target / 'workspace / "gen-idea"
-
-  trait HelloWorldModule extends scalalib.ScalaModule {
-    def scalaVersion = "2.12.4"
-    def millSourcePath = GenIdeaTests.millSourcePath
-    object test extends super.Tests {
-      def testFrameworks = Seq("utest.runner.Framework")
-    }
-  }
-
-  object HelloWorld extends TestUtil.BaseModule with HelloWorldModule
-
-  val helloWorldEvaluator = TestEvaluator.static(HelloWorld)
+object GenIdeaTests extends ScriptTestSuite(false) {
 
   def tests: Tests = Tests {
     'genIdeaTests - {
-      val pp = new scala.xml.PrettyPrinter(999, 4)
-
-      val layout = GenIdeaImpl.xmlFileLayout(
-        helloWorldEvaluator.evaluator,
-        HelloWorld,
-        ("JDK_1_8", "1.8 (1)"), None, fetchMillModules = false)
-      for((relPath, xml) <- layout){
-        os.write.over(millSourcePath/ "generated"/ relPath, pp.format(xml), createFolders = true)
-      }
+      initWorkspace()
+      eval("mill.scalalib.GenIdea/idea")
 
       Seq(
-        "gen-idea/idea_modules/iml" ->
-          millSourcePath / "generated" / ".idea_modules" /".iml",
-        "gen-idea/idea_modules/test.iml" ->
-          millSourcePath / "generated" / ".idea_modules" /"test.iml",
-        "gen-idea/idea_modules/mill-build.iml" ->
-          millSourcePath / "generated" / ".idea_modules" /"mill-build.iml",
-        "gen-idea/idea/libraries/scala-library-2.12.4.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "scala-library-2.12.4.jar.xml",
-        "gen-idea/idea/modules.xml" ->
-          millSourcePath / "generated" / ".idea" / "modules.xml",
-        "gen-idea/idea/misc.xml" ->
-          millSourcePath / "generated" / ".idea" / "misc.xml"
+        s"$workspaceSlug/idea_modules/helloworld.iml" ->
+          os.pwd / ".idea_modules" /"helloworld.iml",
+        s"$workspaceSlug/idea_modules/helloworld.test.iml" ->
+          os.pwd / ".idea_modules" /"helloworld.test.iml",
+//        s"$workspaceSlug/idea_modules/mill-build.iml" ->
+//          os.pwd / ".idea_modules" /"mill-build.iml",
+        s"$workspaceSlug/idea/libraries/scala-library-2.12.4.jar.xml" ->
+          os.pwd / ".idea" / "libraries" / "scala-library-2.12.4.jar.xml",
+        s"$workspaceSlug/idea/modules.xml" ->
+          os.pwd / ".idea" / "modules.xml",
+        s"$workspaceSlug/idea/misc.xml" ->
+          os.pwd / ".idea" / "misc.xml"
       ).foreach { case (resource, generated) =>
           val resourceString = scala.io.Source.fromResource(resource).getLines().mkString("\n")
           val generatedString = normaliseLibraryPaths(os.read(generated))
@@ -54,8 +33,11 @@ object GenIdeaTests extends TestSuite {
     }
   }
 
-
   private def normaliseLibraryPaths(in: String): String = {
     in.replaceAll(coursier.paths.CoursierPaths.cacheDirectory().toString, "COURSIER_HOME")
   }
+
+  override def workspaceSlug: String = "gen-idea-hello-world"
+
+  override def scriptSourcePath: Path = os.pwd / 'scalalib / 'test / 'resources / workspaceSlug
 }