From 94fe9471dccc3d334957d4ce2bbb6172bf292e17 Mon Sep 17 00:00:00 2001
From: Alexander Rimer <rimer@itemis.de>
Date: Tue, 26 Nov 2024 14:02:40 +0100
Subject: [PATCH] interpreterTestExecutor: updated main

use model.roots() instead of modelroots
---
 ...org.iets3.core.InterpreterTestExecutor.mps | 158 +++++-------------
 1 file changed, 42 insertions(+), 116 deletions(-)

diff --git a/code/languages/org.iets3.opensource/solutions/org.iets3.core.InterpreterTestExecutor/models/org.iets3.core.InterpreterTestExecutor.mps b/code/languages/org.iets3.opensource/solutions/org.iets3.core.InterpreterTestExecutor/models/org.iets3.core.InterpreterTestExecutor.mps
index fe346821b..ecbfa0d5a 100644
--- a/code/languages/org.iets3.opensource/solutions/org.iets3.core.InterpreterTestExecutor/models/org.iets3.core.InterpreterTestExecutor.mps
+++ b/code/languages/org.iets3.opensource/solutions/org.iets3.core.InterpreterTestExecutor/models/org.iets3.core.InterpreterTestExecutor.mps
@@ -17,9 +17,6 @@
     <import index="d6jk" ref="r:52c49891-65a1-45a5-a86b-4a7aa1e6c12e(org.iets3.core.JunitInterpreterTest.plugin)" />
     <import index="4o98" ref="6ed54515-acc8-4d1e-a16c-9fd6cfe951ea/java:jetbrains.mps.core.platform(MPS.Core/)" />
     <import index="av4b" ref="r:ba7faab6-2b80-43d5-8b95-0c440665312c(org.iets3.core.expr.tests.structure)" />
-    <import index="dush" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.persistence(MPS.OpenAPI/)" />
-    <import index="82uw" ref="6354ebe7-c22a-4a0f-ac54-50b52ab9b065/java:java.util.function(JDK/)" />
-    <import index="mhbf" ref="8865b7a8-5271-43d3-884c-6fd1d9cfdd34/java:org.jetbrains.mps.openapi.model(MPS.OpenAPI/)" />
   </imports>
   <registry>
     <language id="f3061a53-9226-4cc5-a443-f952ceaf5816" name="jetbrains.mps.baseLanguage">
@@ -33,12 +30,6 @@
       <concept id="4836112446988635817" name="jetbrains.mps.baseLanguage.structure.UndefinedType" flags="in" index="2jxLKc" />
       <concept id="1202948039474" name="jetbrains.mps.baseLanguage.structure.InstanceMethodCallOperation" flags="nn" index="liA8E" />
       <concept id="1465982738277781862" name="jetbrains.mps.baseLanguage.structure.PlaceholderMember" flags="nn" index="2tJIrI" />
-      <concept id="1188207840427" name="jetbrains.mps.baseLanguage.structure.AnnotationInstance" flags="nn" index="2AHcQZ">
-        <reference id="1188208074048" name="annotation" index="2AI5Lk" />
-      </concept>
-      <concept id="1188208481402" name="jetbrains.mps.baseLanguage.structure.HasAnnotation" flags="ng" index="2AJDlI">
-        <child id="1188208488637" name="annotation" index="2AJF6D" />
-      </concept>
       <concept id="1154032098014" name="jetbrains.mps.baseLanguage.structure.AbstractLoopStatement" flags="nn" index="2LF5Ji">
         <child id="1154032183016" name="body" index="2LFqv$" />
       </concept>
@@ -52,9 +43,6 @@
       <concept id="1070475926800" name="jetbrains.mps.baseLanguage.structure.StringLiteral" flags="nn" index="Xl_RD">
         <property id="1070475926801" name="value" index="Xl_RC" />
       </concept>
-      <concept id="1182160077978" name="jetbrains.mps.baseLanguage.structure.AnonymousClassCreator" flags="nn" index="YeOm9">
-        <child id="1182160096073" name="cls" index="YeSDq" />
-      </concept>
       <concept id="1081236700938" name="jetbrains.mps.baseLanguage.structure.StaticMethodDeclaration" flags="ig" index="2YIFZL" />
       <concept id="1081236700937" name="jetbrains.mps.baseLanguage.structure.StaticMethodCall" flags="nn" index="2YIFZM">
         <reference id="1144433194310" name="classConcept" index="1Pybhc" />
@@ -84,7 +72,6 @@
         <child id="1068580123134" name="parameter" index="3clF46" />
         <child id="1068580123135" name="body" index="3clF47" />
       </concept>
-      <concept id="1068580123165" name="jetbrains.mps.baseLanguage.structure.InstanceMethodDeclaration" flags="ig" index="3clFb_" />
       <concept id="1068580123152" name="jetbrains.mps.baseLanguage.structure.EqualsExpression" flags="nn" index="3clFbC" />
       <concept id="1068580123155" name="jetbrains.mps.baseLanguage.structure.ExpressionStatement" flags="nn" index="3clFbF">
         <child id="1068580123156" name="expression" index="3clFbG" />
@@ -118,7 +105,6 @@
       </concept>
       <concept id="1212685548494" name="jetbrains.mps.baseLanguage.structure.ClassCreator" flags="nn" index="1pGfFk" />
       <concept id="1107461130800" name="jetbrains.mps.baseLanguage.structure.Classifier" flags="ng" index="3pOWGL">
-        <property id="521412098689998745" name="nonStatic" index="2bfB8j" />
         <child id="5375687026011219971" name="member" index="jymVt" unordered="true" />
       </concept>
       <concept id="1107535904670" name="jetbrains.mps.baseLanguage.structure.ClassifierType" flags="in" index="3uibUv">
@@ -131,15 +117,17 @@
       <concept id="1178549954367" name="jetbrains.mps.baseLanguage.structure.IVisible" flags="ng" index="1B3ioH">
         <child id="1178549979242" name="visibility" index="1B3o_S" />
       </concept>
+      <concept id="1144226303539" name="jetbrains.mps.baseLanguage.structure.ForeachStatement" flags="nn" index="1DcWWT">
+        <child id="1144226360166" name="iterable" index="1DdaDG" />
+      </concept>
+      <concept id="1144230876926" name="jetbrains.mps.baseLanguage.structure.AbstractForStatement" flags="nn" index="1DupvO">
+        <child id="1144230900587" name="variable" index="1Duv9x" />
+      </concept>
       <concept id="1146644602865" name="jetbrains.mps.baseLanguage.structure.PublicVisibility" flags="nn" index="3Tm1VV" />
       <concept id="1146644623116" name="jetbrains.mps.baseLanguage.structure.PrivateVisibility" flags="nn" index="3Tm6S6" />
       <concept id="1116615150612" name="jetbrains.mps.baseLanguage.structure.ClassifierClassExpression" flags="nn" index="3VsKOn">
         <reference id="1116615189566" name="classifier" index="3VsUkX" />
       </concept>
-      <concept id="1170345865475" name="jetbrains.mps.baseLanguage.structure.AnonymousClass" flags="ig" index="1Y3b0j">
-        <reference id="1170346070688" name="classifier" index="1Y3XeK" />
-        <child id="1201186121363" name="typeParameter" index="2Ghqu4" />
-      </concept>
     </language>
     <language id="fd392034-7849-419d-9071-12563d152375" name="jetbrains.mps.baseLanguage.closures">
       <concept id="1199569711397" name="jetbrains.mps.baseLanguage.closures.structure.ClosureLiteral" flags="nn" index="1bVj0M">
@@ -151,15 +139,9 @@
       <concept id="1177026924588" name="jetbrains.mps.lang.smodel.structure.RefConcept_Reference" flags="nn" index="chp4Y">
         <reference id="1177026940964" name="conceptDeclaration" index="cht4Q" />
       </concept>
-      <concept id="2396822768958367367" name="jetbrains.mps.lang.smodel.structure.AbstractTypeCastExpression" flags="nn" index="$5XWr">
-        <child id="6733348108486823193" name="leftExpression" index="1m5AlR" />
-        <child id="3906496115198199033" name="conceptArgument" index="3oSUPX" />
-      </concept>
-      <concept id="2644386474300074836" name="jetbrains.mps.lang.smodel.structure.ConceptIdRefExpression" flags="nn" index="35c_gC">
-        <reference id="2644386474300074837" name="conceptDeclaration" index="35c_gD" />
-      </concept>
-      <concept id="1140137987495" name="jetbrains.mps.lang.smodel.structure.SNodeTypeCastExpression" flags="nn" index="1PxgMI">
-        <property id="1238684351431" name="asCast" index="1BlNFB" />
+      <concept id="1143226024141" name="jetbrains.mps.lang.smodel.structure.SModelType" flags="in" index="H_c77" />
+      <concept id="1171315804604" name="jetbrains.mps.lang.smodel.structure.Model_RootsOperation" flags="nn" index="2RRcyG">
+        <child id="6750920497477046361" name="conceptArgument" index="3MHsoP" />
       </concept>
       <concept id="1138055754698" name="jetbrains.mps.lang.smodel.structure.SNodeType" flags="in" index="3Tqbb2">
         <reference id="1138405853777" name="concept" index="ehGHo" />
@@ -540,111 +522,55 @@
                       </node>
                     </node>
                     <node concept="3clFbS" id="wLSoj1gwVx" role="2LFqv$">
-                      <node concept="2Gpval" id="wLSoj1gwVy" role="3cqZAp">
-                        <node concept="2GrKxI" id="wLSoj1gwVz" role="2Gsz3X">
-                          <property role="TrG5h" value="root" />
-                        </node>
-                        <node concept="3clFbS" id="wLSoj1gwV$" role="2LFqv$">
-                          <node concept="3clFbF" id="wLSoj1gwV_" role="3cqZAp">
-                            <node concept="2OqwBi" id="wLSoj1gwVA" role="3clFbG">
-                              <node concept="2OqwBi" id="wLSoj1gwVB" role="2Oq$k0">
-                                <node concept="2GrUjf" id="wLSoj1gwVC" role="2Oq$k0">
-                                  <ref role="2Gs0qQ" node="wLSoj1gwVz" resolve="root" />
+                      <node concept="1DcWWT" id="5PQvhzyj94e" role="3cqZAp">
+                        <node concept="3clFbS" id="5PQvhzyj94g" role="2LFqv$">
+                          <node concept="3clFbF" id="5PQvhzyje$X" role="3cqZAp">
+                            <node concept="2OqwBi" id="5PQvhzyjiDM" role="3clFbG">
+                              <node concept="2OqwBi" id="5PQvhzyjf$X" role="2Oq$k0">
+                                <node concept="37vLTw" id="5PQvhzyje$V" role="2Oq$k0">
+                                  <ref role="3cqZAo" node="5PQvhzyj94h" resolve="mdl" />
                                 </node>
-                                <node concept="liA8E" id="wLSoj1gwVD" role="2OqNvi">
-                                  <ref role="37wK5l" to="dush:~ModelRoot.getModels()" resolve="getModels" />
+                                <node concept="2RRcyG" id="5PQvhzyjgcx" role="2OqNvi">
+                                  <node concept="chp4Y" id="5PQvhzyjgHE" role="3MHsoP">
+                                    <ref role="cht4Q" to="av4b:59WscmUTdO4" resolve="ITestItemContainer" />
+                                  </node>
                                 </node>
                               </node>
-                              <node concept="liA8E" id="wLSoj1gwVE" role="2OqNvi">
-                                <ref role="37wK5l" to="wyt6:~Iterable.forEach(java.util.function.Consumer)" resolve="forEach" />
-                                <node concept="2ShNRf" id="wLSoj1gwVF" role="37wK5m">
-                                  <node concept="YeOm9" id="wLSoj1gwVG" role="2ShVmc">
-                                    <node concept="1Y3b0j" id="wLSoj1gwVH" role="YeSDq">
-                                      <property role="2bfB8j" value="true" />
-                                      <property role="373rjd" value="true" />
-                                      <ref role="1Y3XeK" to="82uw:~Consumer" resolve="Consumer" />
-                                      <ref role="37wK5l" to="wyt6:~Object.&lt;init&gt;()" resolve="Object" />
-                                      <node concept="3Tm1VV" id="wLSoj1gwVI" role="1B3o_S" />
-                                      <node concept="3clFb_" id="wLSoj1gwVJ" role="jymVt">
-                                        <property role="TrG5h" value="accept" />
-                                        <node concept="3Tm1VV" id="wLSoj1gwVK" role="1B3o_S" />
-                                        <node concept="3cqZAl" id="wLSoj1gwVL" role="3clF45" />
-                                        <node concept="37vLTG" id="wLSoj1gwVM" role="3clF46">
-                                          <property role="TrG5h" value="p1" />
-                                          <node concept="3uibUv" id="wLSoj1gwVN" role="1tU5fm">
-                                            <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
-                                          </node>
+                              <node concept="2es0OD" id="5PQvhzyjkj_" role="2OqNvi">
+                                <node concept="1bVj0M" id="5PQvhzyjkjB" role="23t8la">
+                                  <node concept="3clFbS" id="5PQvhzyjkjC" role="1bW5cS">
+                                    <node concept="3clFbF" id="5PQvhzyjllF" role="3cqZAp">
+                                      <node concept="2OqwBi" id="5PQvhzyjnjp" role="3clFbG">
+                                        <node concept="37vLTw" id="5PQvhzyjllE" role="2Oq$k0">
+                                          <ref role="3cqZAo" node="wLSoj1gwVh" resolve="testItemContainers" />
                                         </node>
-                                        <node concept="3clFbS" id="wLSoj1gwVO" role="3clF47">
-                                          <node concept="2Gpval" id="wLSoj1gwVP" role="3cqZAp">
-                                            <node concept="2GrKxI" id="wLSoj1gwVQ" role="2Gsz3X">
-                                              <property role="TrG5h" value="rootNode" />
-                                            </node>
-                                            <node concept="3clFbS" id="wLSoj1gwVR" role="2LFqv$">
-                                              <node concept="3clFbJ" id="wLSoj1gwVS" role="3cqZAp">
-                                                <node concept="3clFbS" id="wLSoj1gwVT" role="3clFbx">
-                                                  <node concept="3clFbF" id="wLSoj1gwVU" role="3cqZAp">
-                                                    <node concept="2OqwBi" id="wLSoj1gwVV" role="3clFbG">
-                                                      <node concept="37vLTw" id="wLSoj1gwVW" role="2Oq$k0">
-                                                        <ref role="3cqZAo" node="wLSoj1gwVh" resolve="testItemContainers" />
-                                                      </node>
-                                                      <node concept="TSZUe" id="wLSoj1gwVX" role="2OqNvi">
-                                                        <node concept="1PxgMI" id="wLSoj1gwVY" role="25WWJ7">
-                                                          <property role="1BlNFB" value="true" />
-                                                          <node concept="chp4Y" id="wLSoj1gwVZ" role="3oSUPX">
-                                                            <ref role="cht4Q" to="av4b:59WscmUTdO4" resolve="ITestItemContainer" />
-                                                          </node>
-                                                          <node concept="2GrUjf" id="wLSoj1gwW0" role="1m5AlR">
-                                                            <ref role="2Gs0qQ" node="wLSoj1gwVQ" resolve="rootNode" />
-                                                          </node>
-                                                        </node>
-                                                      </node>
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                                <node concept="2OqwBi" id="wLSoj1gwW1" role="3clFbw">
-                                                  <node concept="2GrUjf" id="wLSoj1gwW2" role="2Oq$k0">
-                                                    <ref role="2Gs0qQ" node="wLSoj1gwVQ" resolve="rootNode" />
-                                                  </node>
-                                                  <node concept="liA8E" id="wLSoj1gwW3" role="2OqNvi">
-                                                    <ref role="37wK5l" to="mhbf:~SNode.isInstanceOfConcept(org.jetbrains.mps.openapi.language.SAbstractConcept)" resolve="isInstanceOfConcept" />
-                                                    <node concept="35c_gC" id="wLSoj1gwW4" role="37wK5m">
-                                                      <ref role="35c_gD" to="av4b:59WscmUTdO4" resolve="ITestItemContainer" />
-                                                    </node>
-                                                  </node>
-                                                </node>
-                                              </node>
-                                            </node>
-                                            <node concept="2OqwBi" id="wLSoj1gwW5" role="2GsD0m">
-                                              <node concept="37vLTw" id="wLSoj1gwW6" role="2Oq$k0">
-                                                <ref role="3cqZAo" node="wLSoj1gwVM" resolve="p1" />
-                                              </node>
-                                              <node concept="liA8E" id="wLSoj1gwW7" role="2OqNvi">
-                                                <ref role="37wK5l" to="mhbf:~SModel.getRootNodes()" resolve="getRootNodes" />
-                                              </node>
-                                            </node>
+                                        <node concept="TSZUe" id="5PQvhzyjp1A" role="2OqNvi">
+                                          <node concept="37vLTw" id="5PQvhzyjqhD" role="25WWJ7">
+                                            <ref role="3cqZAo" node="5PQvhzyjkjD" resolve="it" />
                                           </node>
                                         </node>
-                                        <node concept="2AHcQZ" id="wLSoj1gwW8" role="2AJF6D">
-                                          <ref role="2AI5Lk" to="wyt6:~Override" resolve="Override" />
-                                        </node>
-                                      </node>
-                                      <node concept="3uibUv" id="wLSoj1gwW9" role="2Ghqu4">
-                                        <ref role="3uigEE" to="mhbf:~SModel" resolve="SModel" />
                                       </node>
                                     </node>
                                   </node>
+                                  <node concept="Rh6nW" id="5PQvhzyjkjD" role="1bW2Oz">
+                                    <property role="TrG5h" value="it" />
+                                    <node concept="2jxLKc" id="5PQvhzyjkjE" role="1tU5fm" />
+                                  </node>
                                 </node>
                               </node>
                             </node>
                           </node>
                         </node>
-                        <node concept="2OqwBi" id="wLSoj1gwWa" role="2GsD0m">
-                          <node concept="2GrUjf" id="wLSoj1gwWb" role="2Oq$k0">
+                        <node concept="3cpWsn" id="5PQvhzyj94h" role="1Duv9x">
+                          <property role="TrG5h" value="mdl" />
+                          <node concept="H_c77" id="5PQvhzyjadV" role="1tU5fm" />
+                        </node>
+                        <node concept="2OqwBi" id="5PQvhzyjcS5" role="1DdaDG">
+                          <node concept="2GrUjf" id="5PQvhzyjbUw" role="2Oq$k0">
                             <ref role="2Gs0qQ" node="wLSoj1gwVt" resolve="existingModule" />
                           </node>
-                          <node concept="liA8E" id="wLSoj1gwWc" role="2OqNvi">
-                            <ref role="37wK5l" to="lui2:~SModule.getModelRoots()" resolve="getModelRoots" />
+                          <node concept="liA8E" id="5PQvhzyjdE3" role="2OqNvi">
+                            <ref role="37wK5l" to="lui2:~SModule.getModels()" resolve="getModels" />
                           </node>
                         </node>
                       </node>