Skip to content

Fix trafo tests with optimized searchplan #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jra-se merged 5 commits into from
Jan 16, 2026
Merged

Fix trafo tests with optimized searchplan #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c521503
fix some trafo tests after searchplan optimization backport
jra-se Dec 16, 2025
f6176fc
make previously fixed assertions independent of pattern matching order
jra-se Dec 22, 2025
c4cb672
disable testTrafoOptionalInOrInList once again due to incorrect orders
jra-se Dec 23, 2025
6fb8e23
refactoring
jra-se Jan 15, 2026
4310423
Merge branch 'refs/heads/dev' into fix/trafo-test-orders
jra-se Jan 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 19 additions & 8 deletions trafo-library/src/test/java/de/monticore/cdlib/evaluationTests/TestCases.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
import de.monticore.prettyprint.IndentPrinter;
import de.se_rwth.commons.logging.Log;
import java.io.IOException;
import java.util.List;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -117,23 +119,32 @@ public void testCase1() throws IOException {
.getCDAttributeList().size());
assertEquals("attributeA", utility.getAst().getCDDefinition().getCDClassesList().get(2)
.getCDAttributeList().get(0).getName());
assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(2)
.printSuperclasses());

// allow all permutations of the three classes [ClassB, ClassC, ClassD]
// as the actual order depends on the pattern matching
List<String> allowedSuperClassNames = List.of("ClassBClassCClassD", "ClassBClassDClassC",
"ClassCClassBClassD", "ClassCClassDClassB", "ClassDClassBClassC", "ClassDClassCClassB");
String superclassName2 = utility.getAst().getCDDefinition().getCDClassesList().get(2)
.printSuperclasses();
assertTrue(allowedSuperClassNames.contains(superclassName2));

assertEquals("ClassC", utility.getAst().getCDDefinition().getCDClassesList().get(3).getName());
assertEquals(0, utility.getAst().getCDDefinition().getCDClassesList().get(3)
.getCDAttributeList().size());
assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(3)
.printSuperclasses());

String superclassName3 = utility.getAst().getCDDefinition().getCDClassesList().get(3)
.printSuperclasses();
assertTrue(allowedSuperClassNames.contains(superclassName3));

assertEquals("ClassD", utility.getAst().getCDDefinition().getCDClassesList().get(4).getName());
assertEquals(0, utility.getAst().getCDDefinition().getCDClassesList().get(4)
.getCDAttributeList().size());
assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(4)
.printSuperclasses());
String superclassName4 = utility.getAst().getCDDefinition().getCDClassesList().get(4)
.printSuperclasses();
assertTrue(allowedSuperClassNames.contains(superclassName4));

assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(5)
.getName());
String className5 = utility.getAst().getCDDefinition().getCDClassesList().get(5).getName();
assertTrue(allowedSuperClassNames.contains(className5));
assertEquals(1, utility.getAst().getCDDefinition().getCDClassesList().get(5)
.getCDAttributeList().size());
assertEquals("attributeB", utility.getAst().getCDDefinition().getCDClassesList().get(5)
Expand Down
26 changes: 18 additions & 8 deletions ...-library/src/test/java/de/monticore/cdlib/evaluationTests/TestCasesExtractSuperclass.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@
import de.monticore.generating.templateengine.reporting.reporter.TransformationReporter;
import de.se_rwth.commons.logging.Log;
import java.io.IOException;
import java.util.List;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -113,23 +115,31 @@ public void testCase1() throws IOException {
.getCDAttributeList().size());
assertEquals("attributeA", utility.getAst().getCDDefinition().getCDClassesList().get(2)
.getCDAttributeList().get(0).getName());
assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(2)
.printSuperclasses());

// allow all permutations of the three classes [ClassB, ClassC, ClassD]
// as the actual order depends on the pattern matching
List<String> allowedSuperClassNames = List.of("ClassBClassCClassD", "ClassBClassDClassC",
"ClassCClassBClassD", "ClassCClassDClassB", "ClassDClassBClassC", "ClassDClassCClassB");
String superclassName2 = utility.getAst().getCDDefinition().getCDClassesList().get(2)
.printSuperclasses();
assertTrue(allowedSuperClassNames.contains(superclassName2));

assertEquals("ClassC", utility.getAst().getCDDefinition().getCDClassesList().get(3).getName());
assertEquals(0, utility.getAst().getCDDefinition().getCDClassesList().get(3)
.getCDAttributeList().size());
assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(3)
.printSuperclasses());
String superclassName3 = utility.getAst().getCDDefinition().getCDClassesList().get(3)
.printSuperclasses();
assertTrue(allowedSuperClassNames.contains(superclassName3));

assertEquals("ClassD", utility.getAst().getCDDefinition().getCDClassesList().get(4).getName());
assertEquals(0, utility.getAst().getCDDefinition().getCDClassesList().get(4)
.getCDAttributeList().size());
assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(4)
.printSuperclasses());
String superclassName4 = utility.getAst().getCDDefinition().getCDClassesList().get(4)
.printSuperclasses();
assertTrue(allowedSuperClassNames.contains(superclassName4));

assertEquals("ClassBClassDClassC", utility.getAst().getCDDefinition().getCDClassesList().get(5)
.getName());
String className5 = utility.getAst().getCDDefinition().getCDClassesList().get(5).getName();
assertTrue(allowedSuperClassNames.contains(className5));
assertEquals(1, utility.getAst().getCDDefinition().getCDClassesList().get(5)
.getCDAttributeList().size());
assertEquals("attributeB", utility.getAst().getCDDefinition().getCDClassesList().get(5)
Expand Down
13 changes: 11 additions & 2 deletions ...brary/src/test/java/de/monticore/cdlib/refactoringTests/ExtractIntermediateClassTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@
import de.monticore.generating.templateengine.reporting.commons.ReportingRepository;
import de.monticore.generating.templateengine.reporting.reporter.TransformationReporter;
import de.se_rwth.commons.logging.Log;

import java.io.IOException;
import java.util.List;

import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;

Expand Down Expand Up @@ -109,8 +112,14 @@ public void testExtractSuperclasses3ClassesAutoName() throws IOException {
assertEquals("ClassB2", utility.getAst().getCDDefinition().getCDClassesList().get(5).getName());
assertEquals(0, utility.getAst().getCDDefinition().getCDClassesList().get(5)
.getCDAttributeList().size());
assertEquals("ClassA1ClassA3ClassA2", utility.getAst().getCDDefinition().getCDClassesList().get(
6).getName());

// allow all permutations of the three A-class names
// as the actual order depends on the pattern matching
List<String> allowedClassNames = List.of("ClassA1ClassA2ClassA3", "ClassA1ClassA3ClassA2",
"ClassA2ClassA1ClassA3", "ClassA2ClassA3ClassA1", "ClassA3ClassA1ClassA2",
"ClassA3ClassA2ClassA1");
String className6 = utility.getAst().getCDDefinition().getCDClassesList().get(6).getName();
assertTrue(allowedClassNames.contains(className6));
assertEquals(1, utility.getAst().getCDDefinition().getCDClassesList().get(6)
.getCDAttributeList().size());
assertEquals("attribute1", utility.getAst().getCDDefinition().getCDClassesList().get(6)
Expand Down
Loading