3 files changed, 63 insertions, 26 deletions

diff --git a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend
index 9b1bb698..7a6eec6a 100644
--- a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend
+++ b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemParsingTest.xtend
@@ -8,23 +8,55 @@ import org.eclipse.viatra.solver.language.model.problem.Problem
 import org.eclipse.xtext.testing.InjectWith
 import org.eclipse.xtext.testing.extensions.InjectionExtension
 import org.eclipse.xtext.testing.util.ParseHelper
-import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.^extension.ExtendWith
 
+import static org.hamcrest.MatcherAssert.assertThat
+import static org.hamcrest.Matchers.*
+
 @ExtendWith(InjectionExtension)
 @InjectWith(ProblemInjectorProvider)
 class ProblemParsingTest {
         @Inject
         ParseHelper<Problem> parseHelper
         
+        @Inject
+        extension ProblemTestUtil
+        
         @Test
-        def void loadModel() {
-                val result = parseHelper.parse('''
-                        Hello Xtext!
+        def void exampleTest() {
+                val it = parseHelper.parse('''
+                        class Family {
+                                contains Person[] members
+                        }
+                        
+                        class Person {
+                                Person[0..*] children opposite parent
+                                Person[0..1] parent opposite children
+                                int age
+                                TaxStatus taxStatus
+                        }
+                        
+                        enum TaxStatus {
+                                child, student, adult, retired
+                        }
+                        
+                        % A child cannot have any dependents.
+                        error invalidTaxStatus(Person p) :-
+                                taxStatus(p, child), children(p, _q).
+                        
+                        Family('family').
+                        members('family', anne): true.
+                        members('family', bob).
+                        members('family', ciri).
+                        children(anne, ciri).
+                        ?children(bob, ciri).
+                        taxStatus(anne, adult).
+                        age(anne, 35).
+                        bobAge: 27.
+                        age(bob, bobAge).
+                        !age(ciri, bobAge).
                 ''')
-                Assertions.assertNotNull(result)
-                val errors = result.eResource.errors
-                Assertions.assertTrue(errors.isEmpty, '''Unexpected errors: «errors.join(", ")»''')
+                assertThat(errors, empty)
         }
 }
diff --git a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemScopingTest.xtend b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemScopingTest.xtend
index 7872b0f7..7686e39e 100644
--- a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemScopingTest.xtend
+++ b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemScopingTest.xtend
@@ -27,7 +27,8 @@ class ProblemScopingTest {
         def void builtInArgumentTypeTest() {
                 val it = parseHelper.parse('''
                         pred predicate(node a, data b, int c).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(pred('predicate').param(0).parameterType, equalTo(builtin.findClass('node')))
                 assertThat(pred('predicate').param(1).parameterType, equalTo(builtin.findClass('data')))
                 assertThat(pred('predicate').param(2).parameterType, equalTo(builtin.findClass('int')))
@@ -37,7 +38,8 @@ class ProblemScopingTest {
         def void builtiQualifiedArgumentTypeTest() {
                 val it = parseHelper.parse('''
                         pred predicate(builtin::node a, builtin::data b, builtin::int c).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(pred('predicate').param(0).parameterType, equalTo(builtin.findClass('node')))
                 assertThat(pred('predicate').param(1).parameterType, equalTo(builtin.findClass('data')))
                 assertThat(pred('predicate').param(2).parameterType, equalTo(builtin.findClass('int')))
@@ -49,7 +51,8 @@ class ProblemScopingTest {
                         pred predicate(node a, node b).
                         predicate(a, a).
                         ?predicate(a, b).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodeNames, hasItems('a', 'b'))
                 assertThat(assertion(0).arg(0).node, equalTo(node('a')))
                 assertThat(assertion(0).arg(1).node, equalTo(node('a')))
@@ -63,7 +66,8 @@ class ProblemScopingTest {
                         pred predicate(node a, node b).
                         predicate('a', 'a').
                         ?predicate('a', 'b').
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodeNames, hasItems("'a'", "'b'"))
                 assertThat(assertion(0).arg(0).node, equalTo(node("'a'")))
                 assertThat(assertion(0).arg(1).node, equalTo(node("'a'")))
@@ -76,7 +80,8 @@ class ProblemScopingTest {
                 val it = parseHelper.parse('''
                         pred predicate(node a).
                         predicate(int::new).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodes, empty)
                 assertThat(assertion(0).arg(0).node, equalTo(builtin.findClass('int').newNode))
         }
@@ -86,7 +91,8 @@ class ProblemScopingTest {
                 val it = parseHelper.parse('''
                         pred predicate(node a).
                         predicate(builtin::int::new).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodes, empty)
                 assertThat(assertion(0).arg(0).node, equalTo(builtin.findClass('int').newNode))
         }
@@ -97,7 +103,8 @@ class ProblemScopingTest {
                         class Foo.
                         pred predicate(node a).
                         predicate(Foo::new).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodes, empty)
                 assertThat(assertion(0).arg(0).node, equalTo(findClass('Foo').newNode))
         }
@@ -110,7 +117,8 @@ class ProblemScopingTest {
                         class Foo.
                         pred predicate(node a).
                         predicate(test::Foo::new).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodes, empty)
                 assertThat(assertion(0).arg(0).node, equalTo(findClass('Foo').newNode))
         }
@@ -121,7 +129,8 @@ class ProblemScopingTest {
                         class Foo.
                         pred predicate(node a).
                         predicate(new).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodeNames, hasItem('new'))
                 assertThat(assertion(0).arg(0).node, not(equalTo(findClass('Foo').newNode)))
         }
@@ -131,7 +140,8 @@ class ProblemScopingTest {
                 val it = parseHelper.parse('''
                         pred predicate(node a) :- node(b).
                         predicate(b).
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodeNames, hasItem("b"))
                 assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(node("b")))
                 assertThat(assertion(0).arg(0).node, equalTo(node("b")))
@@ -141,7 +151,8 @@ class ProblemScopingTest {
         def void quotedNodeInPredicateTest() {
                 val it = parseHelper.parse('''
                         pred predicate(node a) :- node('b').
-                ''').assertNoErrors
+                ''')
+                assertThat(errors, empty)
                 assertThat(nodeNames, hasItem("'b'"))
                 assertThat(pred("predicate").conj(0).lit(0).arg(0).node, equalTo(node("'b'")))
         }
diff --git a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemTestUtil.xtend b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemTestUtil.xtend
index 98b53675..b16de2b5 100644
--- a/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemTestUtil.xtend
+++ b/language/src/test/java/org/eclipse/viatra/solver/language/tests/ProblemTestUtil.xtend
@@ -1,6 +1,5 @@
 package org.eclipse.viatra.solver.language.tests
 
-import org.eclipse.emf.ecore.util.EcoreUtil
 import org.eclipse.viatra.solver.language.ProblemUtil
 import org.eclipse.viatra.solver.language.model.problem.Argument
 import org.eclipse.viatra.solver.language.model.problem.Assertion
@@ -17,19 +16,14 @@ import org.eclipse.viatra.solver.language.model.problem.PredicateDefinition
 import org.eclipse.viatra.solver.language.model.problem.Problem
 import org.eclipse.viatra.solver.language.model.problem.Variable
 import org.eclipse.viatra.solver.language.model.problem.VariableOrNodeArgument
-import org.junit.jupiter.api.Assertions
 
 class ProblemTestUtil {
         def builtin(Problem it) {
                 ProblemUtil.getBuiltInLibrary(it).get
         }
         
-        def assertNoErrors(Problem it) {
-                Assertions.assertNotNull(it)
-                EcoreUtil.resolveAll(it)
-                val errors = eResource.errors
-                Assertions.assertTrue(errors.isEmpty, '''Unexpected errors: «errors.join(", ")»''')
-                it
+        def errors(Problem it) {
+                eResource.errors
         }
         
         def nodeNames(Problem it) {