Commit 089117d8 authored by Malte Heithoff's avatar Malte Heithoff

Fix Tests

parent 4fb1dac7
Pipeline #392212 failed with stage
in 31 seconds
...@@ -595,7 +595,7 @@ public class ExpandedComponentInstanceTest extends AbstractSymtabTest { ...@@ -595,7 +595,7 @@ public class ExpandedComponentInstanceTest extends AbstractSymtabTest {
Scope symTab = createSymTab("src/test/resources"); Scope symTab = createSymTab("src/test/resources");
Log.enableFailQuick(true); Log.enableFailQuick(true);
EMAComponentInstanceSymbol virtDF = symTab.<EMAComponentInstanceSymbol>resolve( EMAComponentInstanceSymbol virtDF = symTab.<EMAComponentInstanceSymbol>resolve(
"testing.virtDF", EMAComponentInstanceSymbol.KIND).orElse(null); "testing.virtDFParent.virtDF", EMAComponentInstanceSymbol.KIND).orElse(null);
EMAComponentInstanceSymbol nonVirtNonDF = symTab.<EMAComponentInstanceSymbol>resolve( EMAComponentInstanceSymbol nonVirtNonDF = symTab.<EMAComponentInstanceSymbol>resolve(
"testing.nonVirtNonDF", EMAComponentInstanceSymbol.KIND).orElse(null); "testing.nonVirtNonDF", EMAComponentInstanceSymbol.KIND).orElse(null);
......
...@@ -587,7 +587,7 @@ public class SymtabTest extends AbstractSymtabTest { ...@@ -587,7 +587,7 @@ public class SymtabTest extends AbstractSymtabTest {
@Test @Test
public void testTypeVariableGenericsInstanciation() { public void testTypeVariableGenericsInstanciation() {
Scope symTab = createSymTab("src/test/resources"); 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); assertNotNull(cs);
//EMAComponentInstantiationSymbol csInner = symTab.<EMAComponentInstantiationSymbol>resolve("testing.BasicResolutionInstance.br1", EMAComponentInstantiationSymbol.KIND).orElse(null); //EMAComponentInstantiationSymbol csInner = symTab.<EMAComponentInstantiationSymbol>resolve("testing.BasicResolutionInstance.br1", EMAComponentInstantiationSymbol.KIND).orElse(null);
//assertNotNull(csInner); //assertNotNull(csInner);
......
/* (c) https://github.com/MontiCore/monticore */ /* (c) https://github.com/MontiCore/monticore */
package testing; package testing;
component BasicResolutionInstance<N1 nn = 5, N1 kk = 3> { component BasicResolutionInstance {
port port
in B a1[nn], in B a1[6],
in B a2[kk], in B a2[3],
out B out1; 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];
} }
/* (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
/* (c) https://github.com/MontiCore/monticore */ /* (c) https://github.com/MontiCore/monticore */
package testing; package testing;
component VirtDF { // when having no parent this is non-virtual
virtual direct feedthrough component VirtDF {
ports ports
in Q in1, in Q in1,
out Q out1; out Q out1;
......
/* (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
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment