Merge pull request #74 from LionWeb-io/niko/enable-tests

enabled tests from cmdline
LionWeb-io · Nov 7, 2023 · b8e3541 · b8e3541
2 parents ecfd9e5 + f1d2abf
commit b8e3541
Show file tree

Hide file tree

Showing 32 changed files with 7,389 additions and 6,887 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -4,16 +4,37 @@ on: [push]
 
 jobs:
   build:
-
     runs-on: ubuntu-latest
-    name: Java 11 Build
+    name: Java 11 Build and Test
 
     steps:
     - uses: actions/checkout@v1
+
+    - name: Install dependencies
+      run: sudo apt-get install -y x11vnc xvfb
+
     - name: Setup java
       uses: actions/setup-java@v2
       with:
         distribution: 'adopt'
         java-version: 11
-    - name: Build languages
-      run: ./gradlew assembleMps
+
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+      with:
+        cache-disabled: false
+
+    - name: Test languages
+      run:  xvfb-run ./gradlew checkMps
+
+    - name: Publish Test Results
+      uses: EnricoMi/publish-unit-test-result-action@v2
+      if: always()
+      with:
+        files: |
+          TEST-*.xml
+        large_files: "true"
+        report_individual_runs: "true"
+        report_suite_logs: "any"
+        check_run_annotations: all tests, skipped tests
+        action_fail: "true"
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,6 +24,15 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
 
+      - name: Install dependencies
+        run: sudo apt-get install -y x11vnc xvfb
+
+      - name: Setup java
+        uses: actions/setup-java@v2
+        with:
+          distribution: 'adopt'
+          java-version: 11
+
       - name: Setup Gradle
         uses: gradle/gradle-build-action@v2
 
@@ -41,4 +50,16 @@ jobs:
           OSSRH_USERNAME: ${{ secrets.OSSRH_USERNAME }}
           OSSRH_PASSWORD: ${{ secrets.OSSRH_PASSWORD }}
           RELEASE_VERSION: ${{ inputs.release_version }}
-        run: ./gradlew release
+        run: xvfb-run ./gradlew release
+
+      - name: Publish Test Results
+        uses: EnricoMi/publish-unit-test-result-action@v2
+        if: always()
+        with:
+          files: |
+            TEST-*.xml
+          large_files: "true"
+          report_individual_runs: "true"
+          report_suite_logs: "any"
+          check_run_annotations: all tests, skipped tests
+          action_fail: "true"
diff --git a/.mps/modules.xml b/.mps/modules.xml
@@ -26,9 +26,12 @@
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.client.persistence/io.lionweb.mps.client.persistence.msd" folder="client" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.lang.runtime/io.lionweb.mps.converter.lang.runtime.msd" folder="lang.converter" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.disabled/io.lionweb.mps.converter.test.disabled.msd" folder="xx_broken" />
+      <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.mpsextensions/io.lionweb.mps.converter.test.mpsextensions.msd" folder="test" />
+      <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.support/io.lionweb.mps.converter.test.support.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test.usebroken/io.lionweb.mps.converter.test.usebroken.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter.test/io.lionweb.mps.converter.test.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.converter/io.lionweb.mps.converter.msd" folder="lang.converter" />
+      <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json.test.support/io.lionweb.mps.json.test.support.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json.test/io.lionweb.mps.json.test.msd" folder="test" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.json/io.lionweb.mps.json.msd" folder="lang.json" />
       <modulePath path="$PROJECT_DIR$/solutions/io.lionweb.mps.lang.test/io.lionweb.mps.lang.test.msd" folder="test" />

diff --git a/build-tests.xml b/build-tests.xml
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -130,7 +130,7 @@ configurations.getByName("libs") {
 
 tasks{
     checkMps {
-        buildScript.set(file("build-tests.xml"))
+//        buildScript.set(file("build-tests.xml"))
     }
 }
 

diff --git a/build.xml b/build.xml
diff --git a/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps b/languages/io.lionweb.mps.converter.lang/models/io.lionweb.mps.converter.lang.intentions.mps
@@ -1908,7 +1908,7 @@
                       <ref role="3cqZAo" node="1q44RFT0641" resolve="repository" />
                     </node>
                     <node concept="37vLTw" id="1q44RFT0cg2" role="37wK5m">
-                      <ref role="3cqZAo" node="1q44RFT0cfO" resolve="seq" />
+                      <ref role="3cqZAo" node="1q44RFT0cfO" resolve="input" />
                     </node>
                   </node>
                 </node>
@@ -1930,7 +1930,7 @@
                     <ref role="37wK5l" to="6peh:24j7TNH1Bia" resolve="convert" />
                     <node concept="Rm8GO" id="1q44RFT04hS" role="37wK5m">
                       <ref role="Rm8GQ" to="6peh:24j7TNH1AVV" resolve="listed" />
-                      <ref role="1Px2BO" to="6peh:24j7TNH1AVU" resolve="Scope" />
+                      <ref role="1Px2BO" to="6peh:24j7TNH1AVU" resolve="M2ToJson.Scope" />
                     </node>
                   </node>
                 </node>

diff --git a/solutions/io.lionweb.mps.build.tests/io.lionweb.mps.build.tests.msd b/solutions/io.lionweb.mps.build.tests/io.lionweb.mps.build.tests.msd
@@ -14,7 +14,6 @@
   <dependencies>
     <dependency reexport="false">bf3c8943-8801-4969-9ac2-7403444bbefa(io.lionweb.mps.build)</dependency>
     <dependency reexport="false">422c2909-59d6-41a9-b318-40e6256b250f(jetbrains.mps.ide.build)</dependency>
-    <dependency reexport="false">f1fb7b1c-ce0d-423c-9369-4a661d600029(de.itemis.mps.extensions.build)</dependency>
   </dependencies>
   <languageVersions>
     <language slang="l:798100da-4f0a-421a-b991-71f8c50ce5d2:jetbrains.mps.build" version="0" />
-Original file line number
+Diff line change
@@ Expand Up / @@ -130,7 +130,7 @@ configurations.getByName("libs") { @@
     tasks{
         checkMps {
-            buildScript.set(file("build-tests.xml"))
+    //        buildScript.set(file("build-tests.xml"))
         }
     }
@@ Expand Down @@