refactor: separate primitive types from nodes

3 files changed, 8 insertions, 28 deletions

diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java
index b8b3a7de..840c1f74 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedAssertionArgument.java
@@ -1,7 +1,6 @@
 package tools.refinery.language.model.tests.utils;
 
 import tools.refinery.language.model.problem.AssertionArgument;
-import tools.refinery.language.model.problem.ConstantAssertionArgument;
 import tools.refinery.language.model.problem.Node;
 import tools.refinery.language.model.problem.NodeAssertionArgument;
 
@@ -13,8 +12,4 @@ public record WrappedAssertionArgument(AssertionArgument assertionArgument) {
         public Node node() {
                 return ((NodeAssertionArgument) assertionArgument).getNode();
         }
-
-        public Node constantNode() {
-                return ((ConstantAssertionArgument) assertionArgument).getNode();
-        }
 }
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java
index d8926c29..41b2ea62 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedClassDeclaration.java
@@ -1,14 +1,14 @@
 package tools.refinery.language.model.tests.utils;
 
 import tools.refinery.language.model.problem.ClassDeclaration;
-import tools.refinery.language.model.problem.ReferenceDeclaration;
+import tools.refinery.language.model.problem.FeatureDeclaration;
 
 public record WrappedClassDeclaration(ClassDeclaration classDeclaration) {
         public ClassDeclaration get() {
                 return classDeclaration;
         }
-        
-        public ReferenceDeclaration reference(String name) {
-                return ProblemNavigationUtil.named(classDeclaration.getReferenceDeclarations(), name);
+
+        public FeatureDeclaration feature(String name) {
+                return ProblemNavigationUtil.named(classDeclaration.getFeatureDeclarations(), name);
         }
 }
diff --git a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java
index aef96b5b..78ca95c7 100644
--- a/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java
+++ b/subprojects/language/src/testFixtures/java/tools/refinery/language/model/tests/utils/WrappedProblem.java
@@ -1,25 +1,14 @@
 package tools.refinery.language.model.tests.utils;
 
-import java.util.List;
-import java.util.stream.Stream;
-
 import org.eclipse.emf.ecore.resource.Resource.Diagnostic;
 import org.eclipse.emf.ecore.util.EcoreUtil;
-
-import tools.refinery.language.model.problem.Assertion;
-import tools.refinery.language.model.problem.ClassDeclaration;
-import tools.refinery.language.model.problem.EnumDeclaration;
-import tools.refinery.language.model.problem.IndividualDeclaration;
-import tools.refinery.language.model.problem.NamedElement;
-import tools.refinery.language.model.problem.Node;
-import tools.refinery.language.model.problem.NodeValueAssertion;
-import tools.refinery.language.model.problem.PredicateDefinition;
-import tools.refinery.language.model.problem.Problem;
-import tools.refinery.language.model.problem.RuleDefinition;
-import tools.refinery.language.model.problem.Statement;
+import tools.refinery.language.model.problem.*;
 import tools.refinery.language.utils.BuiltinSymbols;
 import tools.refinery.language.utils.ProblemDesugarer;
 
+import java.util.List;
+import java.util.stream.Stream;
+
 public record WrappedProblem(Problem problem) {
         public Problem get() {
                 return problem;
@@ -72,10 +61,6 @@ public record WrappedProblem(Problem problem) {
                 return ProblemNavigationUtil.named(uniqueNodes, name);
         }
 
-        public NodeValueAssertion nodeValueAssertion(int i) {
-                return nthStatementOfType(NodeValueAssertion.class, i);
-        }
-
         private <T extends Statement> Stream<T> statementsOfType(Class<? extends T> type) {
                 return problem.getStatements().stream().filter(type::isInstance).map(type::cast);
         }