1.24.0: use model name with stereotype everywhere

CHANGELOG.md

@@ -5,6 +5,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
 to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 1.24.0
+
+- `modelcheck`: Include the model stereotype when matching (`--model` and `--exclude-model` parameters) and in the JUnit
+  XML report.
+
 ## 1.23.0
 
 - `modelcheck`: Dependency on Jackson XML removed, XML is now serialized using the DOM API. As a result, the format has

gradle.properties

@@ -1,6 +1,6 @@
 org.gradle.parallel=true
 
-version.backend=1.23.0
+version.backend=1.24.0
 version.project-loader=3.0.2
 
 # A comma-separated list of MPS releases or prereleases to test against.

modelcheck/src/main/kotlin/de/itemis/mps/gradle/modelcheck/ModelCheck.kt

@@ -105,7 +105,7 @@ fun printResult(item: IssueKindReportItem, project: Project, args: ModelCheckArg
         is IssueKindReportItem.PathObject.ModulePathObject ->
             print(item.severity, "${item.message} [${path.asModule(project)?.moduleName}]")
         is IssueKindReportItem.PathObject.ModelPathObject ->
-            print(item.severity, "${item.message} [${path.asModel(project)?.name?.longName}]")
+            print(item.severity, "${item.message} [${path.asModel(project)?.name?.value}]")
         is IssueKindReportItem.PathObject.NodePathObject ->
             print(item.severity, "${item.message} [${path.asNode(project)?.url}]")
         else -> print(item.severity, item.message)
@@ -205,8 +205,8 @@ private fun oneTestCasePerMessage(item: IssueKindReportItem, model: SModel, proj
     val testCaseName = item.message.replace(Regex("[:\\s]"), "_").substring(0, min(item.message.length, 120))
     return when (val path = item.path) {
         is IssueKindReportItem.PathObject.ModelPathObject -> {
-            val message = "${item.message} [${model.name.longName}]"
-            val className = model.name.longName
+            val message = "${item.message} [${model.name.value}]"
+            val className = model.name.value
             Testcase(
                 name = testCaseName,
                 classname = className,
@@ -238,7 +238,7 @@ private fun oneTestCasePerModel(models: Iterable<SModel>, errorsPerModel: Map<SM
                 when (val path = item.path) {
                     is IssueKindReportItem.PathObject.ModelPathObject -> {
                         val model = path.resolve(project.repository)!!
-                        appendLine(" ${item.message} [${model.name.longName}]")
+                        appendLine(" ${item.message} [${model.name.value}]")
                     }
                     is IssueKindReportItem.PathObject.NodePathObject -> {
                         val node = path.resolve(project.repository)
@@ -253,7 +253,7 @@ private fun oneTestCasePerModel(models: Iterable<SModel>, errorsPerModel: Map<SM
 
         Testcase(
             name = it.name.simpleName,
-            classname = it.name.longName,
+            classname = it.name.value,
             failure = if (errors.isEmpty()) null else failure,
             time = 0
         )

project-loader/src/main/kotlin/de/itemis/mps/gradle/project/loader/ModuleAndModelMatcher.kt

@@ -29,7 +29,7 @@ public class ModuleAndModelMatcher public constructor(
      * Whether the model should be included, according to include/exclude rules. Does NOT check module inclusion rules.
      */
     public fun isModelNameIncluded(modelName: SModelName): Boolean {
-        val name = modelName.longName
+        val name = modelName.value
         if (includeModelRegex != null && !includeModelRegex.matches(name)) {
             return false
         }