summaryrefslogtreecommitdiff
path: root/scalaplugin
diff options
context:
space:
mode:
authorLi Haoyi <haoyi.sg@gmail.com>2017-12-26 00:50:49 -0800
committerLi Haoyi <haoyi.sg@gmail.com>2017-12-26 00:50:49 -0800
commitaef9f96d670f7f7a0a40a85575c96319052f4707 (patch)
tree5e79e68e3938117b3bfe9c9985289522c6b46f66 /scalaplugin
parent2d7241efab9ad4589b1a7db8353607a417ab1567 (diff)
downloadmill-aef9f96d670f7f7a0a40a85575c96319052f4707.tar.gz
mill-aef9f96d670f7f7a0a40a85575c96319052f4707.tar.bz2
mill-aef9f96d670f7f7a0a40a85575c96319052f4707.zip
Fix `HelloWorldTests.scala`
Diffstat (limited to 'scalaplugin')
-rw-r--r--scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala11
1 files changed, 5 insertions, 6 deletions
diff --git a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala b/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala
index 2ada6463..a0b60e1e 100644
--- a/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala
+++ b/scalaplugin/src/test/scala/mill/scalaplugin/HelloWorldTests.scala
@@ -54,7 +54,6 @@ object HelloWorldTests extends TestSuite {
val srcPath = pwd / 'scalaplugin / 'src / 'test / 'resource / "hello-world"
val workspacePath = pwd / 'target / 'workspace / "hello-world"
- val outputPath = workspacePath / 'out
val mainObject = workspacePath / 'src / 'main / 'scala / "Main.scala"
def eval[T](t: Task[T], mapping: Discovered.Mapping[_]) = {
@@ -122,9 +121,9 @@ object HelloWorldTests extends TestSuite {
val analysisFile = result.analysisFile
val outputFiles = ls.rec(outPath)
val expectedClassfiles =
- compileClassfiles(outputPath / 'compile / 'classes)
+ compileClassfiles(workspacePath / 'compile / 'classes)
assert(
- outPath == outputPath / 'compile / 'classes,
+ outPath == workspacePath / 'compile / 'classes,
exists(analysisFile),
outputFiles.nonEmpty,
outputFiles.forall(expectedClassfiles.contains),
@@ -156,7 +155,7 @@ object HelloWorldTests extends TestSuite {
assert(err.isInstanceOf[CompileFailed])
val (compilePath, compileMetadataPath) =
- Evaluator.resolveDestPaths(outputPath, helloWorldMapping.value(HelloWorld.compile))
+ Evaluator.resolveDestPaths(workspacePath, helloWorldMapping.value(HelloWorld.compile))
assert(
ls.rec(compilePath / 'classes).isEmpty,
@@ -236,7 +235,7 @@ object HelloWorldTests extends TestSuite {
evalCount > 0
)
- val unJarPath = outputPath / 'unjar
+ val unJarPath = workspacePath / 'unjar
mkdir(unJarPath)
%("tar", "xf", result.path, "-C", unJarPath)
@@ -272,7 +271,7 @@ object HelloWorldTests extends TestSuite {
'logOutputToFile {
eval(HelloWorld.compile, helloWorldMapping)
- val logFile = outputPath / "compile.log"
+ val logFile = workspacePath / "compile.log"
assert(exists(logFile))
}
}