From 3831009b8e7aff1848db3a64f7efd3a41f96f849 Mon Sep 17 00:00:00 2001 From: Anna Maria Schmitz Date: Fri, 30 Aug 2019 10:23:49 +0200 Subject: [PATCH] Update SomeIPGenerationTest.java --- .../middleware/SomeIPGenerationTest.java | 35 +++---------------- 1 file changed, 5 insertions(+), 30 deletions(-) diff --git a/src/test/java/de/monticore/lang/monticar/generator/middleware/SomeIPGenerationTest.java b/src/test/java/de/monticore/lang/monticar/generator/middleware/SomeIPGenerationTest.java index baf7d53..e92cdf4 100644 --- a/src/test/java/de/monticore/lang/monticar/generator/middleware/SomeIPGenerationTest.java +++ b/src/test/java/de/monticore/lang/monticar/generator/middleware/SomeIPGenerationTest.java @@ -2,11 +2,12 @@ package de.monticore.lang.monticar.generator.middleware; import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.cncModel.EMAPortSymbol; import de.monticore.lang.embeddedmontiarc.embeddedmontiarc._symboltable.instanceStructure.EMAComponentInstanceSymbol; -import de.monticore.lang.embeddedmontiarc.tagging.middleware.ros.RosToEmamTagSchema; +import de.monticore.lang.embeddedmontiarc.tagging.middleware.someip.SomeIPToEmamTagSchema; import de.monticore.lang.embeddedmontiarc.tagging.middleware.someip.SomeIPConnectionSymbol; import de.monticore.lang.monticar.generator.middleware.impls.CPPGenImpl; import de.monticore.lang.monticar.generator.someip.GeneratorSomeIP; import de.monticore.lang.monticar.generator.middleware.impls.SomeIPGenImpl; +import de.monticore.lang.monticar.generator.someip.helper.SomeIPTagHelper; import de.monticore.lang.tagging._symboltable.TagSymbol; import de.monticore.lang.tagging._symboltable.TaggingResolver; import org.junit.Test; @@ -28,37 +29,11 @@ public class SomeIPGenerationTest extends AbstractSymtabTest { public void testSomeIPGeneration() throws IOException { TaggingResolver taggingResolver = createSymTabAndTaggingResolver(TEST_PATH); EMAComponentInstanceSymbol componentInstanceSymbol = taggingResolver.resolve("tests.a.addComp", EMAComponentInstanceSymbol.KIND).orElse(null); - RosToEmamTagSchema.registerTagTypes(taggingResolver); + SomeIPToEmamTagSchema.registerTagTypes(taggingResolver); assertNotNull(componentInstanceSymbol); - - File directory = new File(OUT_BASE + "addComp/src/tests_a_addComp/someip"); - directory.mkdirs(); - - GeneratorSomeIP generatorSomeIP = new GeneratorSomeIP(); - generatorSomeIP.setGenerationTargetPath(OUT_BASE); - generatorSomeIP.generateSomeIPAdapter(componentInstanceSymbol); - - componentInstanceSymbol.getPortInstance("in1").orElse(null).setMiddlewareSymbol(new SomeIPConnectionSymbol(1,2,3)); - - - //Map someIPConnectionSymbols = new HashMap<>(); - //componentInstanceSymbol.getPortInstanceList().forEach(p -> { - // Collection tmpTags = taggingResolver.getTags(p, SomeIPConnectionSymbol.KIND); - // if (tmpTags.size() == 1) { - // someIPConnectionSymbols.put(p, (SomeIPConnectionSymbol) tmpTags.iterator().next()); - // } - //}); - - //EMAPortInstanceSymbol in1 = componentInstanceSymbol.getPortInstance("in1").orElse(null); - //assertNotNull(in1); - //EMAPortInstanceSymbol in2 = componentInstanceSymbol.getPortInstance("in2").orElse(null); - //assertNotNull(in2); - //EMAPortInstanceSymbol out1 = componentInstanceSymbol.getPortInstance("out1").orElse(null); - //assertNotNull(out1); - //in1.setMiddlewareSymbol(new SomeIPConnectionSymbol(1, 2, 3)); - //in2.setMiddlewareSymbol(new SomeIPConnectionSymbol(4, 5, 6)); - //out1.setMiddlewareSymbol(new SomeIPConnectionSymbol(7, 8, 9)); + + SomeIPTagHelper.resolveTags(taggingResolver, componentInstanceSymbol); DistributedTargetGenerator distributedTargetGenerator = new DistributedTargetGenerator(); distributedTargetGenerator.setGenerationTargetPath(OUT_BASE + "addComp/src"); -- GitLab