From 089117d85e13aebcfac14c15ab10534899da821e Mon Sep 17 00:00:00 2001
From: Malte Heithoff <h.malte.f@googlemail.com>
Date: Sun, 17 Jan 2021 01:03:20 +0100
Subject: [PATCH] Fix Tests

---
 .../ExpandedComponentInstanceTest.java            |  2 +-
 .../lang/embeddedmontiarc/SymtabTest.java         |  2 +-
 .../resources/testing/BasicResolutionInstance.ema | 15 ++++++++++-----
 .../testing/BasicResolutionInstanceInstance.ema   | 13 -------------
 src/test/resources/testing/VirtDF.ema             |  3 ++-
 src/test/resources/testing/VirtDFParent.ema       | 10 ++++++++++
 6 files changed, 24 insertions(+), 21 deletions(-)
 delete mode 100644 src/test/resources/testing/BasicResolutionInstanceInstance.ema
 create mode 100644 src/test/resources/testing/VirtDFParent.ema

diff --git a/src/test/java/de/monticore/lang/embeddedmontiarc/ExpandedComponentInstanceTest.java b/src/test/java/de/monticore/lang/embeddedmontiarc/ExpandedComponentInstanceTest.java
index 78defd5..e082b47 100644
--- a/src/test/java/de/monticore/lang/embeddedmontiarc/ExpandedComponentInstanceTest.java
+++ b/src/test/java/de/monticore/lang/embeddedmontiarc/ExpandedComponentInstanceTest.java
@@ -595,7 +595,7 @@ public class ExpandedComponentInstanceTest extends AbstractSymtabTest {
         Scope symTab = createSymTab("src/test/resources");
         Log.enableFailQuick(true);
         EMAComponentInstanceSymbol virtDF = symTab.<EMAComponentInstanceSymbol>resolve(
-                "testing.virtDF", EMAComponentInstanceSymbol.KIND).orElse(null);
+                "testing.virtDFParent.virtDF", EMAComponentInstanceSymbol.KIND).orElse(null);
         EMAComponentInstanceSymbol nonVirtNonDF = symTab.<EMAComponentInstanceSymbol>resolve(
                 "testing.nonVirtNonDF", EMAComponentInstanceSymbol.KIND).orElse(null);
 
diff --git a/src/test/java/de/monticore/lang/embeddedmontiarc/SymtabTest.java b/src/test/java/de/monticore/lang/embeddedmontiarc/SymtabTest.java
index 7042e4e..1b00a05 100644
--- a/src/test/java/de/monticore/lang/embeddedmontiarc/SymtabTest.java
+++ b/src/test/java/de/monticore/lang/embeddedmontiarc/SymtabTest.java
@@ -587,7 +587,7 @@ public class SymtabTest extends AbstractSymtabTest {
     @Test
     public void testTypeVariableGenericsInstanciation() {
         Scope symTab = createSymTab("src/test/resources");
-        EMAComponentInstanceSymbol cs = symTab.<EMAComponentInstanceSymbol>resolve("testing.basicResolutionInstanceInstance", EMAComponentInstanceSymbol.KIND).orElse(null);
+        EMAComponentInstanceSymbol cs = symTab.<EMAComponentInstanceSymbol>resolve("testing.basicResolutionInstance", EMAComponentInstanceSymbol.KIND).orElse(null);
         assertNotNull(cs);
         //EMAComponentInstantiationSymbol csInner = symTab.<EMAComponentInstantiationSymbol>resolve("testing.BasicResolutionInstance.br1", EMAComponentInstantiationSymbol.KIND).orElse(null);
         //assertNotNull(csInner);
diff --git a/src/test/resources/testing/BasicResolutionInstance.ema b/src/test/resources/testing/BasicResolutionInstance.ema
index 958438d..a72230d 100644
--- a/src/test/resources/testing/BasicResolutionInstance.ema
+++ b/src/test/resources/testing/BasicResolutionInstance.ema
@@ -1,13 +1,18 @@
 /* (c) https://github.com/MontiCore/monticore */
 package testing;
 
-component BasicResolutionInstance<N1 nn = 5, N1 kk = 3> {
+component BasicResolutionInstance {
 	port
-		in B a1[nn],
-		in B a2[kk],
+		in B a1[6],
+		in B a2[3],
 		out B out1;
 
-	instance BasicResolution<nn,kk> br1;
+	instance BasicResolution<6,3> br1;
 
-    connect a1[:]->br1.in1[:];
+    connect a1[1]->br1.in1[1];
+    connect a1[2]->br1.in1[2];
+    connect a1[3]->br1.in1[3];
+    connect a1[4]->br1.in1[4];
+    connect a1[5]->br1.in1[5];
+    connect a1[6]->br1.in1[6];
 }
diff --git a/src/test/resources/testing/BasicResolutionInstanceInstance.ema b/src/test/resources/testing/BasicResolutionInstanceInstance.ema
deleted file mode 100644
index 556d399..0000000
--- a/src/test/resources/testing/BasicResolutionInstanceInstance.ema
+++ /dev/null
@@ -1,13 +0,0 @@
-/* (c) https://github.com/MontiCore/monticore */
-package testing;
-
-component BasicResolutionInstanceInstance {
-    port
-        in B a1[6],
-        in B a2[3],
-        out B out1;
-
-    instance BasicResolutionInstance<6,3> br1;
-
-    connect a1[:]->br1.in1[:];
-}
\ No newline at end of file
diff --git a/src/test/resources/testing/VirtDF.ema b/src/test/resources/testing/VirtDF.ema
index 57e1868..1135ee6 100644
--- a/src/test/resources/testing/VirtDF.ema
+++ b/src/test/resources/testing/VirtDF.ema
@@ -1,7 +1,8 @@
 /* (c) https://github.com/MontiCore/monticore */
 package testing;
 
-component VirtDF {
+// when having no parent this is non-virtual
+virtual direct feedthrough component VirtDF {
     ports
         in Q in1,
         out Q out1;
diff --git a/src/test/resources/testing/VirtDFParent.ema b/src/test/resources/testing/VirtDFParent.ema
new file mode 100644
index 0000000..6249e9d
--- /dev/null
+++ b/src/test/resources/testing/VirtDFParent.ema
@@ -0,0 +1,10 @@
+/* (c) https://github.com/MontiCore/monticore */
+package testing;
+
+component VirtDFParent {
+    ports
+        in Q input,
+        out Q output;
+
+    instance VirtDF virtDF;
+}
\ No newline at end of file
-- 
GitLab