From c2c64bbbc4034fdfbd9bc4da56f25fef3cd68f63 Mon Sep 17 00:00:00 2001
From: Andres Pipicello <andres.pipicello@olx.com>
Date: Tue, 11 Jun 2019 14:54:37 -0300
Subject: Changed GenIdeaTests to use ScriptTestSuite

---
 .../test/resources/gen-idea-hello-world/build.sc   | 11 ++++
 .../idea/libraries/scala-library-2.12.4.jar.xml    | 18 +++++++
 .../resources/gen-idea-hello-world/idea/misc.xml   |  5 ++
 .../gen-idea-hello-world/idea/modules.xml          |  9 ++++
 .../idea_modules/helloworld.iml                    | 17 ++++++
 .../idea_modules/helloworld.test.iml               | 18 +++++++
 .../idea_modules/mill-build.iml                    | 12 +++++
 .../idea/libraries/scala-library-2.12.4.jar.xml    | 18 -------
 scalalib/test/resources/gen-idea/idea/misc.xml     |  5 --
 scalalib/test/resources/gen-idea/idea/modules.xml  |  9 ----
 scalalib/test/resources/gen-idea/idea_modules/iml  | 17 ------
 .../resources/gen-idea/idea_modules/mill-build.iml | 12 -----
 .../test/resources/gen-idea/idea_modules/test.iml  | 18 -------
 scalalib/test/src/GenIdeaTests.scala               | 60 ++++++++--------------
 14 files changed, 111 insertions(+), 118 deletions(-)
 create mode 100644 scalalib/test/resources/gen-idea-hello-world/build.sc
 create mode 100644 scalalib/test/resources/gen-idea-hello-world/idea/libraries/scala-library-2.12.4.jar.xml
 create mode 100644 scalalib/test/resources/gen-idea-hello-world/idea/misc.xml
 create mode 100644 scalalib/test/resources/gen-idea-hello-world/idea/modules.xml
 create mode 100644 scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.iml
 create mode 100644 scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml
 create mode 100644 scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/misc.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/modules.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea_modules/iml
 delete mode 100644 scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
 delete mode 100644 scalalib/test/resources/gen-idea/idea_modules/test.iml

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-hello-world/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
new file mode 100644
index 00000000..5f7c5056
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/libraries/scala-library-2.12.4.jar.xml
@@ -0,0 +1,18 @@
+<component name="libraryTable">
+    <library name="scala-library-2.12.4.jar" type="Scala">
+        <properties>
+            <compiler-classpath>
+                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar"/>
+                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.4/scala-compiler-2.12.4.jar"/>
+                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar"/>
+                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.4/scala-reflect-2.12.4.jar"/>
+            </compiler-classpath>
+        </properties>
+        <CLASSES>
+            <root url="jar://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar!/"/>
+        </CLASSES>
+        <SOURCES>
+            <root url="jar://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar!/"/>
+        </SOURCES>
+    </library>
+</component>
diff --git a/scalalib/test/resources/gen-idea-hello-world/idea/misc.xml b/scalalib/test/resources/gen-idea-hello-world/idea/misc.xml
new file mode 100644
index 00000000..2726692f
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/misc.xml
@@ -0,0 +1,5 @@
+<project version="4">
+    <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
+        <output url="file://$PROJECT_DIR$/target/idea_output"/>
+    </component>
+</project>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea-hello-world/idea/modules.xml b/scalalib/test/resources/gen-idea-hello-world/idea/modules.xml
new file mode 100644
index 00000000..193fa62d
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/idea/modules.xml
@@ -0,0 +1,9 @@
+<project version="4">
+    <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/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-hello-world/idea_modules/helloworld.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.iml
new file mode 100644
index 00000000..38ea17be
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.iml
@@ -0,0 +1,17 @@
+<module type="JAVA_MODULE" version="4">
+    <component name="NewModuleRootManager">
+        <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/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"/>
+        <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"/>
+    </component>
+</module>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml
new file mode 100644
index 00000000..bfe0ff3c
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/helloworld.test.iml
@@ -0,0 +1,18 @@
+<module type="JAVA_MODULE" version="4">
+    <component name="NewModuleRootManager">
+        <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/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="helloworld" exported=""/>
+    </component>
+</module>
diff --git a/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
new file mode 100644
index 00000000..46fd8c3b
--- /dev/null
+++ b/scalalib/test/resources/gen-idea-hello-world/idea_modules/mill-build.iml
@@ -0,0 +1,12 @@
+<module type="JAVA_MODULE" version="4">
+    <component name="NewModuleRootManager">
+        <output url="file://$MODULE_DIR$/../out"/>
+        <content url="file://$MODULE_DIR$/..">
+            <excludeFolder url="file://$MODULE_DIR$/../project"/>
+            <excludeFolder url="file://$MODULE_DIR$/../target"/>
+        </content>
+        <exclude-output/>
+        <orderEntry type="inheritedJdk"/>
+        <orderEntry type="sourceFolder" forTests="false"/>
+    </component>
+</module>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
deleted file mode 100644
index 5f7c5056..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-library-2.12.4.jar" type="Scala">
-        <properties>
-            <compiler-classpath>
-                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar"/>
-                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.4/scala-compiler-2.12.4.jar"/>
-                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar"/>
-                <root url="file://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.4/scala-reflect-2.12.4.jar"/>
-            </compiler-classpath>
-        </properties>
-        <CLASSES>
-            <root url="jar://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar!/"/>
-        </CLASSES>
-        <SOURCES>
-            <root url="jar://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar!/"/>
-        </SOURCES>
-    </library>
-</component>
diff --git a/scalalib/test/resources/gen-idea/idea/misc.xml b/scalalib/test/resources/gen-idea/idea/misc.xml
deleted file mode 100644
index 2726692f..00000000
--- a/scalalib/test/resources/gen-idea/idea/misc.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<project version="4">
-    <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8 (1)" project-jdk-type="JavaSDK">
-        <output url="file://$PROJECT_DIR$/target/idea_output"/>
-    </component>
-</project>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/modules.xml b/scalalib/test/resources/gen-idea/idea/modules.xml
deleted file mode 100644
index d6334ea3..00000000
--- a/scalalib/test/resources/gen-idea/idea/modules.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<project version="4">
-    <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"/>
-        </modules>
-    </component>
-</project>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/iml b/scalalib/test/resources/gen-idea/idea_modules/iml
deleted file mode 100644
index 13e8daf7..00000000
--- a/scalalib/test/resources/gen-idea/idea_modules/iml
+++ /dev/null
@@ -1,17 +0,0 @@
-<module type="JAVA_MODULE" version="4">
-    <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/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>
-        <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"/>
-    </component>
-</module>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml b/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
deleted file mode 100644
index 46fd8c3b..00000000
--- a/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<module type="JAVA_MODULE" version="4">
-    <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../out"/>
-        <content url="file://$MODULE_DIR$/..">
-            <excludeFolder url="file://$MODULE_DIR$/../project"/>
-            <excludeFolder url="file://$MODULE_DIR$/../target"/>
-        </content>
-        <exclude-output/>
-        <orderEntry type="inheritedJdk"/>
-        <orderEntry type="sourceFolder" forTests="false"/>
-    </component>
-</module>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea_modules/test.iml b/scalalib/test/resources/gen-idea/idea_modules/test.iml
deleted file mode 100644
index aecae2e3..00000000
--- a/scalalib/test/resources/gen-idea/idea_modules/test.iml
+++ /dev/null
@@ -1,18 +0,0 @@
-<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"/>
-        <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>
-        <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=""/>
-    </component>
-</module>
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
 }
-- 
cgit v1.2.3