merge conflicts

MontiCore · Aug 21, 2023 · 669fa76 · 669fa76
1 parent 7e7d9b4
commit 669fa76
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/.../de/monticore/codegen/cd2java/_symboltable/scope/ArtifactScopeInterfaceDecoratorTest.java b/.../de/monticore/codegen/cd2java/_symboltable/scope/ArtifactScopeInterfaceDecoratorTest.java
@@ -28,6 +28,7 @@
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertDeepEquals;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertListOf;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertOptionalOf;
+import static de.monticore.codegen.cd2java.DecoratorAssert.assertVoid;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodBy;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodsBy;
 import static org.junit.Assert.*;

diff --git a/...va/de/monticore/codegen/cd2java/_symboltable/scope/GlobalScopeInterfaceDecoratorTest.java b/...va/de/monticore/codegen/cd2java/_symboltable/scope/GlobalScopeInterfaceDecoratorTest.java
@@ -21,6 +21,7 @@
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertBoolean;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertDeepEquals;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertListOf;
+import static de.monticore.codegen.cd2java.DecoratorAssert.assertVoid;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodBy;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodsBy;
 import static org.junit.Assert.assertEquals;

diff --git a/...rc/test/java/de/monticore/codegen/cd2java/_symboltable/scope/ScopeClassDecoratorTest.java b/...rc/test/java/de/monticore/codegen/cd2java/_symboltable/scope/ScopeClassDecoratorTest.java
@@ -6,7 +6,7 @@
 import com.github.javaparser.ParserConfiguration;
 import de.monticore.cd.codegen.CD2JavaTemplates;
 import de.monticore.cd.methodtemplates.CD4C;
-import de.monticore.cd4code.prettyprint.CD4CodeFullPrettyPrinter;
+import de.monticore.cd4code.CD4CodeMill;
 import de.monticore.cd4codebasis._ast.ASTCDConstructor;
 import de.monticore.cd4codebasis._ast.ASTCDMethod;
 import de.monticore.cdbasis._ast.ASTCDAttribute;
@@ -21,7 +21,6 @@
 import de.monticore.generating.GeneratorSetup;
 import de.se_rwth.commons.logging.Log;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.util.HashMap;
@@ -35,6 +34,7 @@
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertDeepEquals;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertListOf;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertOptionalOf;
+import static de.monticore.codegen.cd2java.DecoratorAssert.assertVoid;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getAttributeBy;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodBy;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodsBy;
@@ -387,9 +387,8 @@ public void testRemoveSymbolMethod() {
     List<ASTCDMethod> methodList = getMethodsBy("remove", scopeClass);
 
     Map<String, ASTCDMethod> methods = new HashMap<>();
-    CD4CodeFullPrettyPrinter p = new CD4CodeFullPrettyPrinter();
     methodList.forEach(l -> methods.put(
-        p.prettyprint(l.getCDParameter(0).getMCType()), l)
+            CD4CodeMill.prettyPrint(l.getCDParameter(0).getMCType(), false), l)
     );
 
     assertEquals(5, methodList.size());
@@ -431,9 +430,8 @@ public void testRemoveSymbolMethod() {
   public void testAddSymbolMethod() {
     List<ASTCDMethod> methodList = getMethodsBy("add", scopeClass);
     Map<String, ASTCDMethod> methods = new HashMap<>();
-    CD4CodeFullPrettyPrinter p = new CD4CodeFullPrettyPrinter();
     methodList.forEach(l -> methods.put(
-        p.prettyprint(l.getCDParameter(0).getMCType()), l)
+        CD4CodeMill.prettyPrint(l.getCDParameter(0).getMCType(), false), l)
     );
 
     assertEquals(5, methodList.size());

diff --git a/...est/java/de/monticore/codegen/cd2java/_symboltable/scope/ScopeInterfaceDecoratorTest.java b/...est/java/de/monticore/codegen/cd2java/_symboltable/scope/ScopeInterfaceDecoratorTest.java
@@ -28,6 +28,7 @@
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertDeepEquals;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertInt;
 import static de.monticore.codegen.cd2java.DecoratorAssert.assertListOf;
+import static de.monticore.codegen.cd2java.DecoratorAssert.assertVoid;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodBy;
 import static de.monticore.codegen.cd2java.DecoratorTestUtil.getMethodsBy;
 import static org.junit.Assert.assertEquals;