chore: remove builtin library xtext dependency

3 files changed, 4 insertions, 117 deletions

diff --git a/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
index 9bd728d6..99cf0a86 100644
--- a/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
+++ b/language/src/test/java/tools/refinery/language/tests/ProblemParsingTest.xtend
@@ -10,6 +10,7 @@ import org.eclipse.xtext.testing.util.ParseHelper
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.^extension.ExtendWith
 import tools.refinery.language.model.problem.Problem
+import tools.refinery.language.model.tests.ProblemTestUtil
 
 import static org.hamcrest.MatcherAssert.assertThat
 import static org.hamcrest.Matchers.*
@@ -19,10 +20,10 @@ import static org.hamcrest.Matchers.*
 class ProblemParsingTest {
         @Inject
         ParseHelper<Problem> parseHelper
-        
+
         @Inject
         extension ProblemTestUtil
-        
+
         @Test
         def void exampleTest() {
                 val it = parseHelper.parse('''
diff --git a/language/src/test/java/tools/refinery/language/tests/ProblemTestUtil.xtend b/language/src/test/java/tools/refinery/language/tests/ProblemTestUtil.xtend
deleted file mode 100644
index 46418892..00000000
--- a/language/src/test/java/tools/refinery/language/tests/ProblemTestUtil.xtend
+++ /dev/null
@@ -1,114 +0,0 @@
-package tools.refinery.language.tests
-
-import tools.refinery.language.ProblemUtil
-import tools.refinery.language.model.problem.Argument
-import tools.refinery.language.model.problem.Assertion
-import tools.refinery.language.model.problem.AssertionArgument
-import tools.refinery.language.model.problem.Atom
-import tools.refinery.language.model.problem.ClassDeclaration
-import tools.refinery.language.model.problem.Conjunction
-import tools.refinery.language.model.problem.EnumDeclaration
-import tools.refinery.language.model.problem.Literal
-import tools.refinery.language.model.problem.NegativeLiteral
-import tools.refinery.language.model.problem.Node
-import tools.refinery.language.model.problem.NodeAssertionArgument
-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.UniqueDeclaration
-import tools.refinery.language.model.problem.Variable
-import tools.refinery.language.model.problem.VariableOrNodeArgument
-
-class ProblemTestUtil {
-        def builtin(Problem it) {
-                ProblemUtil.getBuiltInLibrary(it).get
-        }
-        
-        def errors(Problem it) {
-                eResource.errors
-        }
-        
-        def nodeNames(Problem it) {
-                nodes.map[name]
-        }
-        
-        def pred(Problem it, String name) {
-                statements.filter(PredicateDefinition).findFirst[it.name == name]
-        }
-        
-        def param(PredicateDefinition it, int i) {
-                parameters.get(i)
-        } 
-
-        def conj(PredicateDefinition it, int i) {
-                bodies.get(i)
-        }
-
-        def lit(Conjunction it, int i) {
-                literals.get(i)
-        }
-
-        def negated(Literal it) {
-                (it as NegativeLiteral).atom
-        }
-
-        def relation(Literal it) {
-                (it as Atom).relation
-        }
-
-        def arg(Atom it, int i) {
-                it.arguments.get(i)
-        }
-
-        def arg(Literal it, int i) {
-                (it as Atom).arg(i)
-        }
-
-        def variable(Argument it) {
-                (it as VariableOrNodeArgument).variableOrNode as Variable
-        }
-
-        def node(Argument it) {
-                (it as VariableOrNodeArgument).variableOrNode as Node
-        }
-        
-        def assertion(Problem it, int i) {
-                statements.filter(Assertion).get(i)
-        }
-        
-        def nodeValueAssertion(Problem it, int i) {
-                statements.filter(NodeValueAssertion).get(i)
-        }
-        
-        def arg(Assertion it, int i) {
-                arguments.get(i)
-        }
-        
-        def node(AssertionArgument it) {
-                (it as NodeAssertionArgument).node
-        }
-        
-        def node(Problem it, String name) {
-                nodes.findFirst[it.name == name]
-        }
-        
-        def uniqueNode(Problem it, String name) {
-                statements.filter(UniqueDeclaration).flatMap[nodes].findFirst[it.name == name]
-        }
-        
-        def findClass(Problem it, String name) {
-                statements.filter(ClassDeclaration).findFirst[it.name == name]
-        }
-        
-        def reference(ClassDeclaration it, String name) {
-                it.referenceDeclarations.findFirst[it.name == name]
-        }
-        
-        def findEnum(Problem it, String name) {
-                statements.filter(EnumDeclaration).findFirst[it.name == name]
-        }
-        
-        def literal(EnumDeclaration it, String name) {
-                literals.findFirst[it.name == name]
-        }
-}
diff --git a/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
index ab3e325f..5ff7a2c9 100644
--- a/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
+++ b/language/src/test/java/tools/refinery/language/tests/scoping/NodeScopingTest.xtend
@@ -12,8 +12,8 @@ import org.junit.jupiter.params.provider.Arguments
 import org.junit.jupiter.params.provider.MethodSource
 import org.junit.jupiter.params.provider.ValueSource
 import tools.refinery.language.model.problem.Problem
+import tools.refinery.language.model.tests.ProblemTestUtil
 import tools.refinery.language.tests.ProblemInjectorProvider
-import tools.refinery.language.tests.ProblemTestUtil
 
 import static org.hamcrest.MatcherAssert.assertThat
 import static org.hamcrest.Matchers.*