3 files changed, 15 insertions, 12 deletions

diff --git a/gradle/junit.gradle b/gradle/junit.gradle
index b36b30b4..3f3970d9 100644
--- a/gradle/junit.gradle
+++ b/gradle/junit.gradle
@@ -1,3 +1,5 @@
+apply plugin: 'jacoco'
+
 dependencies {
         testCompile "org.junit.jupiter:junit-jupiter-api:${junitVersion}"
         testRuntime "org.junit.jupiter:junit-jupiter-engine:${junitVersion}"
@@ -14,3 +16,6 @@ test {
 task slowTest(type: Test) {
         useJUnitPlatform()
 }
+
+test.finalizedBy(jacocoTestReport)
+jacocoTestReport.dependsOn(test)
diff --git a/model-data/build.gradle b/model-data/build.gradle
index 2d0aef9a..95336602 100644
--- a/model-data/build.gradle
+++ b/model-data/build.gradle
@@ -4,5 +4,5 @@ apply from: "${rootDir}/gradle/jmh.gradle"
 
 dependencies {
         compile "org.eclipse.viatra:viatra-query-runtime:${viatraVersion}"
-        compile "org.eclipse.emf:org.eclipse.emf.ecore:2.24.0"
+        compile "org.eclipse.emf:org.eclipse.emf.ecore:${ecoreVersion}"
 }
diff --git a/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java b/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java
index 50fcf3f4..ca73b103 100644
--- a/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java
+++ b/model-data/src/test/java/org/eclipse/viatra/solver/data/query/test/QueryTest.java
@@ -40,17 +40,16 @@ class QueryTest {
                 RelationView<Boolean> persionView = new TupleRelationView(model, person);
 
                 RelationalScope scope = new RelationalScope(Set.of(persionView));
-                
+
                 GenericQuerySpecification<GenericPatternMatcher> personQuery = (new RelationalQuery("PersonQuery"))
-                        .addParameter("p",persionView)
-                        .addConstraint(persionView, "p").build();
-                
+                                .addParameter("p", persionView).addConstraint(persionView, "p").build();
+
                 ViatraQueryEngine engine = AdvancedViatraQueryEngine.on(scope);
                 GenericPatternMatcher personMatcher = engine.getMatcher(personQuery);
-                
+
                 assertEquals(2, personMatcher.countMatches());
         }
-        
+
         void modelBuildingTest() {
                 Relation<Boolean> person = new Relation<>("Person", 1, false);
                 Relation<Integer> age = new Relation<Integer>("age", 1, null);
@@ -78,15 +77,14 @@ class QueryTest {
                 RelationView<TruthValue> friendMayView = new FilteredRelationView<TruthValue>(model, friend, (k, v) -> v.may());
 
                 RelationalScope scope = new RelationalScope(Set.of(persionView, ageView, friendMustView, friendMayView));
-                
+
                 GenericQuerySpecification<GenericPatternMatcher> personQuery = (new RelationalQuery("PersonQuery"))
-                        .addParameter("p",persionView)
-                        .addConstraint(persionView, "p").build();
-                
+                                .addParameter("p", persionView).addConstraint(persionView, "p").build();
+
                 ViatraQueryEngine engine = AdvancedViatraQueryEngine.on(scope);
                 GenericPatternMatcher personMatcher = engine.getMatcher(personQuery);
                 Collection<GenericPatternMatch> personMatches = personMatcher.getAllMatches();
-                for(GenericPatternMatch personMatch : personMatches) {
+                for (GenericPatternMatch personMatch : personMatches) {
                         System.out.println(personMatch);
                 }
         }