feat: skeleton for language to store mapping

2 files changed, 21 insertions, 4 deletions

diff --git a/language/build.gradle b/language/build.gradle
index 494d9d08..e9db351f 100644
--- a/language/build.gradle
+++ b/language/build.gradle
@@ -1,22 +1,30 @@
 apply plugin: 'java-library'
+apply plugin: 'java-test-fixtures'
 apply from: "${rootDir}/gradle/xtext-common.gradle"
 apply from: "${rootDir}/gradle/junit.gradle"
 apply from: "${rootDir}/gradle/mwe2.gradle"
 apply from: "${rootDir}/gradle/xtend.gradle"
 
 dependencies {
+        api platform("org.eclipse.xtext:xtext-dev-bom:${xtextVersion}")
         api "org.eclipse.xtext:org.eclipse.xtext:${xtextVersion}"
         api "org.eclipse.xtext:org.eclipse.xtext.xbase:${xtextVersion}"
         api "org.eclipse.emf:org.eclipse.emf.ecore:${ecoreVersion}"
         api project(':refinery-language-model')
-        testImplementation "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}"
-        testImplementation "org.eclipse.xtext:org.eclipse.xtext.xbase.testing:${xtextVersion}"
+        testFixturesApi "org.eclipse.xtext:org.eclipse.xtext.testing:${xtextVersion}"
         mwe2 "org.eclipse.xtext:org.eclipse.xtext.common.types:${xtextVersion}"
         mwe2 "org.eclipse.xtext:org.eclipse.xtext.xtext.generator:${xtextVersion}"
         mwe2 "org.eclipse.xtext:xtext-antlr-generator:${xtextAntlrGeneratorVersion}"
         mwe2 project(':refinery-language-mwe2')
 }
 
+sourceSets {
+        testFixtures {
+                java.srcDirs += ['src/testFixtures/xtext-gen']
+                resources.srcDirs += ['src/testFixtures/xtext-gen']
+        }
+}
+
 tasks.named('jar') {
         from(sourceSets.main.allSource) {
                 include '**/*.xtext'
@@ -29,7 +37,7 @@ def generateXtextLanguage = tasks.register('generateXtextLanguage', JavaExec) {
         inputs.file 'src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2'
         inputs.file 'src/main/java/org/eclipse/viatra/solver/language/Problem.xtext'
         outputs.dir 'src/main/xtext-gen'
-        outputs.dir 'src/test/xtext-gen'
+        outputs.dir 'src/testFixtures/xtext-gen'
         outputs.dir '../language-ide/src/main/xtext-gen'
         outputs.dir '../language-web/src/main/xtext-gen'
         outputs.dir '../language-web/build/generated/sources/xtext'
@@ -53,8 +61,14 @@ tasks.named('processResources') {
 
 tasks.named('clean') {
         delete 'src/main/xtext-gen'
-        delete 'src/test/xtext-gen'
+        delete 'src/testFixtures/xtext-gen'
         delete '../language-ide/src/main/xtext-gen'
         delete '../language-web/src/main/xtext-gen'
         delete '../language-web/build/generated/sources/xtext'
 }
+
+sonarqube.properties {
+        properties['sonar.exclusions'] += [
+                'src/testFixtures/xtext-gen/**',
+        ]
+}
diff --git a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2 b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2
index b8bc5a44..4dfbb242 100644
--- a/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2
+++ b/language/src/main/java/org/eclipse/viatra/solver/language/GenerateProblem.mwe2
@@ -15,6 +15,7 @@ Workflow {
                                 rootPath = rootPath
                                 runtimeTest = {
                                         enabled = true
+                                        srcGen = 'src/testFixtures/xtext-gen'
                                 }
                                 genericIde = {
                                         name = "language-ide"
@@ -48,6 +49,8 @@ Workflow {
                                 generateStub = false
                         }
                         junitSupport = {
+                                generateStub = false
+                                skipXbaseTestingPackage = true
                                 junitVersion = "5"
                         }
                         webSupport = ProblemWebIntegrationFragment {