From 1dad111c2842531ff7cdffc2230b3a350ee1f3e8 Mon Sep 17 00:00:00 2001 From: Tobias Roeser Date: Wed, 28 Jun 2023 07:15:03 +0200 Subject: [PATCH] Use new idea module in tests, WIP --- .../feature/gen-idea/test/src/GenIdeaExtendedTests.scala | 7 +++---- integration/feature/gen-idea/test/src/GenIdeaTests.scala | 7 +++---- integration/feature/gen-idea/test/src/GenIdeaUtils.scala | 4 +++- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/integration/feature/gen-idea/test/src/GenIdeaExtendedTests.scala b/integration/feature/gen-idea/test/src/GenIdeaExtendedTests.scala index 824d90b18eb..7d37aabbacd 100644 --- a/integration/feature/gen-idea/test/src/GenIdeaExtendedTests.scala +++ b/integration/feature/gen-idea/test/src/GenIdeaExtendedTests.scala @@ -1,7 +1,6 @@ -package mill.integration -package local +package mill.integration.local -import os.Path +import mill.integration.IntegrationTestSuite import utest._ import scala.util.Try @@ -15,7 +14,7 @@ object GenIdeaExtendedTests extends IntegrationTestSuite { def tests: Tests = Tests { "genIdeaTests" - { val workspacePath = initWorkspace() - eval("mill.scalalib.GenIdea/idea") + eval("mill.idea.GenIdea/idea") val checks = Seq( os.sub / "mill_modules" / "helloworld.iml", diff --git a/integration/feature/gen-idea/test/src/GenIdeaTests.scala b/integration/feature/gen-idea/test/src/GenIdeaTests.scala index 9d019bec006..36c2dbc22ea 100644 --- a/integration/feature/gen-idea/test/src/GenIdeaTests.scala +++ b/integration/feature/gen-idea/test/src/GenIdeaTests.scala @@ -1,10 +1,9 @@ -package mill.integration -package local +package mill.integration.local -import os.Path import utest.{Tests, assert, _} import scala.util.Try +import mill.integration.IntegrationTestSuite import GenIdeaUtils._ object GenIdeaTests extends IntegrationTestSuite { @@ -54,7 +53,7 @@ object GenIdeaTests extends IntegrationTestSuite { test("genIdeaTests") { val workspacePath = initWorkspace() - eval("mill.scalalib.GenIdea/idea") + eval("mill.idea.GenIdea/idea") val checks = Seq( os.sub / "mill_modules" / "helloworld.iml", diff --git a/integration/feature/gen-idea/test/src/GenIdeaUtils.scala b/integration/feature/gen-idea/test/src/GenIdeaUtils.scala index 89afc9d502a..8aeddba9f46 100644 --- a/integration/feature/gen-idea/test/src/GenIdeaUtils.scala +++ b/integration/feature/gen-idea/test/src/GenIdeaUtils.scala @@ -1,7 +1,9 @@ -package mill.integration +package mill.integration.local + import java.util.regex.Pattern import scala.util.Try import utest.assert + object GenIdeaUtils { /**