Skip to content

Commit a1000fe

Browse files
MpsExecuteTaskTest: use MpsGenerate for generation
Using the deprecated `generate` extension causes problems because it cannot be properly configured to resolve MPS only once and it causes problems with the `fakeBuildNumber` task. Using `MpsGenerate` task avoids all those problems.
1 parent f74c02c commit a1000fe

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

src/test/kotlin/test/codeexecution/MpsExecuteTaskTest.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ class MpsExecuteTaskTest {
3737

3838
private fun buildScriptBoilerplate(mpsVersion: String) = """
3939
import de.itemis.mps.gradle.tasks.MpsExecute
40+
import de.itemis.mps.gradle.tasks.MpsGenerate
4041
4142
plugins {
4243
id("de.itemis.mps.gradle.common")
43-
id("generate-models")
4444
}
4545
4646
repositories {
@@ -59,24 +59,24 @@ class MpsExecuteTaskTest {
5959
into(layout.buildDirectory.dir("mps"))
6060
}
6161
62-
generate {
63-
projectLocation = file("${mpsTestProjectPath.canonicalPath}")
64-
mpsConfig = mps
65-
}
66-
67-
val generate by tasks.existing {
68-
dependsOn(resolveMps)
62+
val resolvedMpsHome = resolveMps.map { it.destinationDir }
63+
64+
val generate by tasks.registering(MpsGenerate::class) {
65+
mpsHome.set(layout.dir(resolvedMpsHome))
66+
projectLocation.set(file("${mpsTestProjectPath.canonicalPath}"))
67+
6968
doFirst {
70-
println(layout.buildDirectory.dir("mps").get().asFile.listFiles()?.toList())
69+
println(resolvedMpsHome.get().listFiles()?.toList())
7170
}
7271
}
7372
7473
val execute by tasks.registering(MpsExecute::class) {
7574
dependsOn(generate)
76-
mpsHome.set(layout.buildDirectory.dir("mps"))
75+
mpsHome.set(layout.dir(resolvedMpsHome))
7776
projectLocation.set(file("${mpsTestProjectPath.canonicalPath}"))
77+
7878
doFirst {
79-
println(resolveMps.map { it.destinationDir }.get())
79+
println(resolvedMpsHome.get())
8080
}
8181
}
8282
""".trimIndent() + "\n"

0 commit comments

Comments
 (0)