From fbd2f59a86d8dbd54dae50ca3c3e27d0642d5806 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Thu, 10 Nov 2022 17:25:24 +0100 Subject: feat(store): DataRepresentation reflective type --- .../store/query/viatra/tests/QueryTest.java | 48 +++++++++++----------- .../query/viatra/tests/QueryTransactionTest.java | 4 +- 2 files changed, 26 insertions(+), 26 deletions(-) (limited to 'subprojects/store-query-viatra/src/test/java/tools') diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java index ea92b223..a7e09023 100644 --- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java +++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTest.java @@ -20,8 +20,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class QueryTest { @Test void typeConstraintTest() { - Relation person = new Relation<>("Person", 1, false); - Relation asset = new Relation<>("Asset", 1, false); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation asset = new Relation<>("Asset", 1, Boolean.class, false); RelationView personView = new KeyOnlyRelationView(person); var p1 = new Variable("p1"); @@ -46,8 +46,8 @@ class QueryTest { @Test void relationConstraintTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -85,8 +85,8 @@ class QueryTest { @Test void andTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -133,8 +133,8 @@ class QueryTest { @Test void existTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -172,9 +172,9 @@ class QueryTest { @Test void orTest() { - Relation person = new Relation<>("Person", 1, false); - Relation animal = new Relation<>("Animal", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation animal = new Relation<>("Animal", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView animalView = new KeyOnlyRelationView(animal); RelationView friendMustView = new FilteredRelationView<>(friend, "must", @@ -216,7 +216,7 @@ class QueryTest { @Test void equalityTest() { - Relation person = new Relation<>("Person", 1, false); + Relation person = new Relation<>("Person", 1, Boolean.class, false); RelationView personView = new KeyOnlyRelationView(person); Variable p1 = new Variable("p1"); @@ -244,8 +244,8 @@ class QueryTest { @Test void inequalityTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -281,8 +281,8 @@ class QueryTest { @Test void patternCallTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -327,8 +327,8 @@ class QueryTest { @Test void negativePatternCallTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -372,8 +372,8 @@ class QueryTest { @Test void negativeWithQuantificationTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -414,8 +414,8 @@ class QueryTest { @Test void transitivePatternCallTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); @@ -458,8 +458,8 @@ class QueryTest { @Test void countMatchTest() { - Relation person = new Relation<>("Person", 1, false); - Relation friend = new Relation<>("friend", 2, TruthValue.FALSE); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation friend = new Relation<>("friend", 2, TruthValue.class, TruthValue.FALSE); RelationView personView = new KeyOnlyRelationView(person); RelationView friendMustView = new FilteredRelationView<>(friend, "must", TruthValue::must); diff --git a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTransactionTest.java b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTransactionTest.java index a555f024..117edd3e 100644 --- a/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTransactionTest.java +++ b/subprojects/store-query-viatra/src/test/java/tools/refinery/store/query/viatra/tests/QueryTransactionTest.java @@ -19,8 +19,8 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class QueryTransactionTest { @Test void flushTest() { - Relation person = new Relation<>("Person", 1, false); - Relation asset = new Relation<>("Asset", 1, false); + Relation person = new Relation<>("Person", 1, Boolean.class, false); + Relation asset = new Relation<>("Asset", 1, Boolean.class, false); RelationView personView = new KeyOnlyRelationView(person); var p1 = new Variable("p1"); -- cgit v1.2.3-54-g00ecf