From 25a077b3c68beb42f40e5a98d5c970435f48cf69 Mon Sep 17 00:00:00 2001
From: OszkarSemerath <semerath@mit.bme.hu>
Date: Tue, 17 Aug 2021 02:41:47 +0200
Subject: changed querytest to highlight query independence from model

---
 .../viatra/solver/data/query/test/QueryTest.java   | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

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 1e0c1d5c..7fa0708f 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
@@ -31,18 +31,17 @@ class QueryTest {
 	void minimalTest() {
 		Relation<Boolean> person = new Relation<>("Person", 1, false);
 
+		RelationView<Boolean> persionView = new TupleRelationView(person);
+		GenericQuerySpecification<GenericPatternMatcher> personQuery = (new RelationalQuery("PersonQuery"))
+				.addParameter("p", persionView).addConstraint(persionView, "p").build();
+
 		ModelStore store = new ModelStoreImpl(Set.of(person));
 		Model model = store.createModel();
 
 		model.put(person, Tuple.of(0), true);
 		model.put(person, Tuple.of(1), true);
 
-		RelationView<Boolean> persionView = new TupleRelationView(model, person);
-
-		RelationalScope scope = new RelationalScope(model,Set.of(persionView));
-
-		GenericQuerySpecification<GenericPatternMatcher> personQuery = (new RelationalQuery("PersonQuery"))
-				.addParameter("p", persionView).addConstraint(persionView, "p").build();
+		RelationalScope scope = new RelationalScope(model, Set.of(persionView));
 
 		ViatraQueryEngine engine = AdvancedViatraQueryEngine.on(scope);
 		GenericPatternMatcher personMatcher = engine.getMatcher(personQuery);
@@ -70,13 +69,12 @@ class QueryTest {
 		assertTrue(model.get(person, Tuple.of(1)));
 		assertFalse(model.get(person, Tuple.of(2)));
 
-		RelationView<Boolean> persionView = new TupleRelationView(model, person);
-		RelationView<Integer> ageView = new FunctionalRelationView<>(model, age);
-		RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(model, friend,
-				(k, v) -> v.must());
-		RelationView<TruthValue> friendMayView = new FilteredRelationView<TruthValue>(model, friend, (k, v) -> v.may());
+		RelationView<Boolean> persionView = new TupleRelationView(person);
+		RelationView<Integer> ageView = new FunctionalRelationView<>(age);
+		RelationView<TruthValue> friendMustView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.must());
+		RelationView<TruthValue> friendMayView = new FilteredRelationView<TruthValue>(friend, (k, v) -> v.may());
 
-		RelationalScope scope = new RelationalScope(model,Set.of(persionView, ageView, friendMustView, friendMayView));
+		RelationalScope scope = new RelationalScope(model, Set.of(persionView, ageView, friendMustView, friendMayView));
 
 		GenericQuerySpecification<GenericPatternMatcher> personQuery = (new RelationalQuery("PersonQuery"))
 				.addParameter("p", persionView).addConstraint(persionView, "p").build();
-- 
cgit v1.2.3-70-g09d2