-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: support for MPS 2024.1 and 2024.3
- Loading branch information
Showing
33 changed files
with
429 additions
and
392 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| import org.zeroturnaround.zip.ZipUtil | ||
|
|
||
| buildscript { | ||
| dependencies { | ||
| classpath("org.modelix.mps:build-tools-lib:1.8.1") | ||
| } | ||
| } | ||
|
|
||
| plugins { | ||
| id("org.jetbrains.kotlin.jvm") | ||
| } | ||
|
|
||
| dependencies { | ||
| implementation(coreLibs.kotlin.coroutines.test) | ||
| implementation(coreLibs.ktor.client.cio) | ||
| implementation(coreLibs.testcontainers) | ||
| } | ||
|
|
||
| tasks { | ||
| val unzipTestProject by registering { | ||
| ZipUtil.unpack(layout.projectDirectory.file("diff-test-project.zip").asFile, layout.buildDirectory.dir("diff-test-project").get().asFile) | ||
| } | ||
| test { | ||
| dependsOn(":mps-diff-plugin:prepareSandbox") | ||
| dependsOn(unzipTestProject) | ||
| } | ||
| } |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package org.modelix.mps.generator.web | ||
|
|
||
| import io.ktor.client.HttpClient | ||
| import io.ktor.client.engine.cio.CIO | ||
| import io.ktor.client.request.get | ||
| import io.ktor.client.statement.bodyAsBytes | ||
| import io.ktor.client.statement.bodyAsText | ||
| import junit.framework.TestCase.assertEquals | ||
| import kotlinx.coroutines.test.runTest | ||
| import org.junit.Test | ||
| import org.junit.runner.RunWith | ||
| import org.junit.runners.Parameterized | ||
| import org.testcontainers.containers.GenericContainer | ||
| import org.testcontainers.containers.wait.strategy.Wait | ||
| import org.testcontainers.utility.MountableFile | ||
| import java.io.File | ||
| import kotlin.time.Duration.Companion.minutes | ||
| import kotlin.time.toJavaDuration | ||
|
|
||
| @RunWith(Parameterized::class) | ||
| class DiffPluginTest(val mpsVersion: String) { | ||
|
|
||
| companion object { | ||
| val timeout = 5.minutes | ||
|
|
||
| @Parameterized.Parameters(name = "{0}") | ||
| @JvmStatic | ||
| fun mpsVersions() = listOf( | ||
| "2024.3", | ||
| "2024.1", | ||
| "2023.3", | ||
| "2023.2", | ||
| // "2022.3", | ||
| // "2022.2", | ||
| // "2021.3", | ||
| // "2021.2", | ||
| // "2021.1", | ||
| // "2020.3", | ||
| ) | ||
| } | ||
|
|
||
| private fun runWithMPS(body: suspend (port: Int) -> Unit) = runTest(timeout = timeout) { | ||
| println("MPS version: $mpsVersion") | ||
|
|
||
| val mps: GenericContainer<*> = GenericContainer("docker.io/modelix/mps-vnc-baseimage:0.9.4-mps$mpsVersion") | ||
| .withExposedPorts(33334) | ||
| .withCopy( | ||
| "../mps-diff-plugin/build/idea-sandbox/plugins/mps-diff-plugin", | ||
| "/mps/plugins/mps-diff-plugin", | ||
| ) | ||
| .withCopy( | ||
| "build/diff-test-project", | ||
| "/mps-projects/diff-test-project", | ||
| ) | ||
| // .withCreateContainerCmdModifier { | ||
| // it.withPlatform("linux/amd64") | ||
| // } | ||
| .waitingFor(Wait.forListeningPort().withStartupTimeout(timeout.toJavaDuration())) | ||
| .withLogConsumer { | ||
| println(it.utf8StringWithoutLineEnding) | ||
| } | ||
|
|
||
| mps.start() | ||
| try { | ||
| body(mps.firstMappedPort) | ||
| } finally { | ||
| mps.stop() | ||
| } | ||
| } | ||
|
|
||
| @Test | ||
| fun `diff images page`() = runWithMPS { port -> | ||
| val client = HttpClient(CIO) | ||
| val baseUrl = "http://localhost:$port" | ||
| val diffUrl = "$baseUrl/54ff8ce1442ac24e065d0ba99ae96b752a4427cf/38fd1c4668b8bb600a4193def54ae4281045c790/" | ||
| val diffPageHtml = client.get(diffUrl).bodyAsText() | ||
| println(diffPageHtml) | ||
| val folder = File("build/diff-images/$mpsVersion/") | ||
| folder.mkdirs() | ||
| folder.resolve("index.html").writeText(diffPageHtml) | ||
|
|
||
| val imageNames = Regex("""src="([^\"]+\.png)"""").findAll(diffPageHtml).map { it.groupValues[1] }.toList() | ||
| println(imageNames) | ||
| assertEquals(3, imageNames.size) | ||
|
|
||
| for (imageName in imageNames) { | ||
| val data = client.get("$diffUrl/$imageName").bodyAsBytes() | ||
| folder.resolve(imageName).writeBytes(data) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun <T : GenericContainer<T>> T.withCopy(from: String, to: String): T { | ||
| require(File(from).exists()) { "Doesn't exist: $from" } | ||
| return withCopyFileToContainer(MountableFile.forHostPath(from), to) | ||
| } |
Oops, something went wrong.