diff options
Diffstat (limited to 'subprojects/store-query-interpreter/src/test')
9 files changed, 34 insertions, 34 deletions
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java index d8e06d82..209d7ac0 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/AggregatorBatchingTest.java | |||
@@ -9,10 +9,10 @@ import org.junit.jupiter.api.Test; | |||
9 | import tools.refinery.store.model.Model; | 9 | import tools.refinery.store.model.Model; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.ModelQueryAdapter; | 11 | import tools.refinery.store.query.ModelQueryAdapter; |
12 | import tools.refinery.store.query.dnf.Query; | 12 | import tools.refinery.logic.dnf.Query; |
13 | import tools.refinery.store.query.term.StatefulAggregate; | 13 | import tools.refinery.logic.term.StatefulAggregate; |
14 | import tools.refinery.store.query.term.StatefulAggregator; | 14 | import tools.refinery.logic.term.StatefulAggregator; |
15 | import tools.refinery.store.query.term.Variable; | 15 | import tools.refinery.logic.term.Variable; |
16 | import tools.refinery.store.query.view.AnySymbolView; | 16 | import tools.refinery.store.query.view.AnySymbolView; |
17 | import tools.refinery.store.query.view.FunctionView; | 17 | import tools.refinery.store.query.view.FunctionView; |
18 | import tools.refinery.store.query.view.KeyOnlyView; | 18 | import tools.refinery.store.query.view.KeyOnlyView; |
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java index 76de8679..eba7173b 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/DiagonalQueryTest.java | |||
@@ -8,8 +8,8 @@ package tools.refinery.store.query.interpreter; | |||
8 | import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint; | 8 | import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint; |
9 | import tools.refinery.store.model.ModelStore; | 9 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.query.ModelQueryAdapter; | 10 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.dnf.Dnf; | 11 | import tools.refinery.logic.dnf.Dnf; |
12 | import tools.refinery.store.query.dnf.Query; | 12 | import tools.refinery.logic.dnf.Query; |
13 | import tools.refinery.store.query.interpreter.tests.QueryEngineTest; | 13 | import tools.refinery.store.query.interpreter.tests.QueryEngineTest; |
14 | import tools.refinery.store.query.view.AnySymbolView; | 14 | import tools.refinery.store.query.view.AnySymbolView; |
15 | import tools.refinery.store.query.view.FunctionView; | 15 | import tools.refinery.store.query.view.FunctionView; |
@@ -21,8 +21,8 @@ import java.util.List; | |||
21 | import java.util.Map; | 21 | import java.util.Map; |
22 | import java.util.Optional; | 22 | import java.util.Optional; |
23 | 23 | ||
24 | import static tools.refinery.store.query.literal.Literals.not; | 24 | import static tools.refinery.logic.literal.Literals.not; |
25 | import static tools.refinery.store.query.term.int_.IntTerms.INT_SUM; | 25 | import static tools.refinery.logic.term.int_.IntTerms.INT_SUM; |
26 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults; | 26 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults; |
27 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults; | 27 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults; |
28 | 28 | ||
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java index ca1512d8..c845e5ff 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/FunctionalQueryTest.java | |||
@@ -9,15 +9,15 @@ import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint; | |||
9 | import tools.refinery.store.map.Cursor; | 9 | import tools.refinery.store.map.Cursor; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.ModelQueryAdapter; | 11 | import tools.refinery.store.query.ModelQueryAdapter; |
12 | import tools.refinery.store.query.dnf.Query; | 12 | import tools.refinery.logic.dnf.Query; |
13 | import tools.refinery.store.query.term.Variable; | 13 | import tools.refinery.logic.term.Variable; |
14 | import tools.refinery.store.query.interpreter.tests.QueryEngineTest; | 14 | import tools.refinery.store.query.interpreter.tests.QueryEngineTest; |
15 | import tools.refinery.store.query.view.AnySymbolView; | 15 | import tools.refinery.store.query.view.AnySymbolView; |
16 | import tools.refinery.store.query.view.FilteredView; | 16 | import tools.refinery.store.query.view.FilteredView; |
17 | import tools.refinery.store.query.view.FunctionView; | 17 | import tools.refinery.store.query.view.FunctionView; |
18 | import tools.refinery.store.query.view.KeyOnlyView; | 18 | import tools.refinery.store.query.view.KeyOnlyView; |
19 | import tools.refinery.store.representation.Symbol; | 19 | import tools.refinery.store.representation.Symbol; |
20 | import tools.refinery.store.representation.TruthValue; | 20 | import tools.refinery.logic.term.truthvalue.TruthValue; |
21 | import tools.refinery.store.tuple.Tuple; | 21 | import tools.refinery.store.tuple.Tuple; |
22 | 22 | ||
23 | import java.util.List; | 23 | import java.util.List; |
@@ -29,8 +29,8 @@ import static org.hamcrest.Matchers.is; | |||
29 | import static org.hamcrest.Matchers.nullValue; | 29 | import static org.hamcrest.Matchers.nullValue; |
30 | import static org.junit.jupiter.api.Assertions.assertAll; | 30 | import static org.junit.jupiter.api.Assertions.assertAll; |
31 | import static org.junit.jupiter.api.Assertions.assertThrows; | 31 | import static org.junit.jupiter.api.Assertions.assertThrows; |
32 | import static tools.refinery.store.query.literal.Literals.check; | 32 | import static tools.refinery.logic.literal.Literals.check; |
33 | import static tools.refinery.store.query.term.int_.IntTerms.*; | 33 | import static tools.refinery.logic.term.int_.IntTerms.*; |
34 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults; | 34 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertNullableResults; |
35 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults; | 35 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults; |
36 | 36 | ||
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java index 4c849e9d..6633b3b1 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/LeftJoinTest.java | |||
@@ -8,8 +8,8 @@ package tools.refinery.store.query.interpreter; | |||
8 | import org.junit.jupiter.api.Test; | 8 | import org.junit.jupiter.api.Test; |
9 | import tools.refinery.store.model.ModelStore; | 9 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.query.ModelQueryAdapter; | 10 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.dnf.Query; | 11 | import tools.refinery.logic.dnf.Query; |
12 | import tools.refinery.store.query.term.int_.IntTerms; | 12 | import tools.refinery.logic.term.int_.IntTerms; |
13 | import tools.refinery.store.query.view.AnySymbolView; | 13 | import tools.refinery.store.query.view.AnySymbolView; |
14 | import tools.refinery.store.query.view.FunctionView; | 14 | import tools.refinery.store.query.view.FunctionView; |
15 | import tools.refinery.store.query.view.KeyOnlyView; | 15 | import tools.refinery.store.query.view.KeyOnlyView; |
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java index 96d0f302..cc3ddc10 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/OrderedResultSetTest.java | |||
@@ -8,9 +8,9 @@ package tools.refinery.store.query.interpreter; | |||
8 | import org.junit.jupiter.api.Test; | 8 | import org.junit.jupiter.api.Test; |
9 | import tools.refinery.store.model.ModelStore; | 9 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.query.ModelQueryAdapter; | 10 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.dnf.Query; | 11 | import tools.refinery.logic.dnf.Query; |
12 | import tools.refinery.store.query.resultset.OrderedResultSet; | 12 | import tools.refinery.store.query.resultset.OrderedResultSet; |
13 | import tools.refinery.store.query.term.Variable; | 13 | import tools.refinery.logic.term.Variable; |
14 | import tools.refinery.store.query.view.AnySymbolView; | 14 | import tools.refinery.store.query.view.AnySymbolView; |
15 | import tools.refinery.store.query.view.KeyOnlyView; | 15 | import tools.refinery.store.query.view.KeyOnlyView; |
16 | import tools.refinery.store.representation.Symbol; | 16 | import tools.refinery.store.representation.Symbol; |
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java index 72728dcd..59f43147 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTest.java | |||
@@ -9,26 +9,26 @@ import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint; | |||
9 | import org.junit.jupiter.api.Test; | 9 | import org.junit.jupiter.api.Test; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.ModelQueryAdapter; | 11 | import tools.refinery.store.query.ModelQueryAdapter; |
12 | import tools.refinery.store.query.dnf.Dnf; | 12 | import tools.refinery.logic.dnf.Dnf; |
13 | import tools.refinery.store.query.dnf.Query; | 13 | import tools.refinery.logic.dnf.Query; |
14 | import tools.refinery.store.query.term.ParameterDirection; | 14 | import tools.refinery.logic.term.ParameterDirection; |
15 | import tools.refinery.store.query.term.Variable; | 15 | import tools.refinery.logic.term.Variable; |
16 | import tools.refinery.store.query.interpreter.tests.QueryEngineTest; | 16 | import tools.refinery.store.query.interpreter.tests.QueryEngineTest; |
17 | import tools.refinery.store.query.view.AnySymbolView; | 17 | import tools.refinery.store.query.view.AnySymbolView; |
18 | import tools.refinery.store.query.view.FilteredView; | 18 | import tools.refinery.store.query.view.FilteredView; |
19 | import tools.refinery.store.query.view.FunctionView; | 19 | import tools.refinery.store.query.view.FunctionView; |
20 | import tools.refinery.store.query.view.KeyOnlyView; | 20 | import tools.refinery.store.query.view.KeyOnlyView; |
21 | import tools.refinery.store.representation.Symbol; | 21 | import tools.refinery.store.representation.Symbol; |
22 | import tools.refinery.store.representation.TruthValue; | 22 | import tools.refinery.logic.term.truthvalue.TruthValue; |
23 | import tools.refinery.store.tuple.Tuple; | 23 | import tools.refinery.store.tuple.Tuple; |
24 | 24 | ||
25 | import java.util.List; | 25 | import java.util.List; |
26 | import java.util.Map; | 26 | import java.util.Map; |
27 | 27 | ||
28 | import static tools.refinery.store.query.literal.Literals.check; | 28 | import static tools.refinery.logic.literal.Literals.check; |
29 | import static tools.refinery.store.query.literal.Literals.not; | 29 | import static tools.refinery.logic.literal.Literals.not; |
30 | import static tools.refinery.store.query.term.int_.IntTerms.constant; | 30 | import static tools.refinery.logic.term.int_.IntTerms.constant; |
31 | import static tools.refinery.store.query.term.int_.IntTerms.greaterEq; | 31 | import static tools.refinery.logic.term.int_.IntTerms.greaterEq; |
32 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults; | 32 | import static tools.refinery.store.query.interpreter.tests.QueryAssertions.assertResults; |
33 | 33 | ||
34 | class QueryTest { | 34 | class QueryTest { |
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java index 1cd05d91..eb1ed68a 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/QueryTransactionTest.java | |||
@@ -9,8 +9,8 @@ import tools.refinery.interpreter.matchers.backend.QueryEvaluationHint; | |||
9 | import org.junit.jupiter.api.Test; | 9 | import org.junit.jupiter.api.Test; |
10 | import tools.refinery.store.model.ModelStore; | 10 | import tools.refinery.store.model.ModelStore; |
11 | import tools.refinery.store.query.ModelQueryAdapter; | 11 | import tools.refinery.store.query.ModelQueryAdapter; |
12 | import tools.refinery.store.query.dnf.Query; | 12 | import tools.refinery.logic.dnf.Query; |
13 | import tools.refinery.store.query.dnf.RelationalQuery; | 13 | import tools.refinery.logic.dnf.RelationalQuery; |
14 | import tools.refinery.store.query.view.AnySymbolView; | 14 | import tools.refinery.store.query.view.AnySymbolView; |
15 | import tools.refinery.store.query.view.FilteredView; | 15 | import tools.refinery.store.query.view.FilteredView; |
16 | import tools.refinery.store.query.view.FunctionView; | 16 | import tools.refinery.store.query.view.FunctionView; |
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java index edbd9aff..f8b12d19 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/StronglyConnectedComponentsTest.java | |||
@@ -6,11 +6,11 @@ | |||
6 | package tools.refinery.store.query.interpreter; | 6 | package tools.refinery.store.query.interpreter; |
7 | 7 | ||
8 | import org.junit.jupiter.api.Test; | 8 | import org.junit.jupiter.api.Test; |
9 | import tools.refinery.logic.dnf.Query; | ||
10 | import tools.refinery.logic.literal.Connectivity; | ||
11 | import tools.refinery.logic.literal.RepresentativeElectionLiteral; | ||
9 | import tools.refinery.store.model.ModelStore; | 12 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.query.ModelQueryAdapter; | 13 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.dnf.Query; | ||
12 | import tools.refinery.store.query.literal.Connectivity; | ||
13 | import tools.refinery.store.query.literal.RepresentativeElectionLiteral; | ||
14 | import tools.refinery.store.query.view.AnySymbolView; | 14 | import tools.refinery.store.query.view.AnySymbolView; |
15 | import tools.refinery.store.query.view.KeyOnlyView; | 15 | import tools.refinery.store.query.view.KeyOnlyView; |
16 | import tools.refinery.store.representation.Symbol; | 16 | import tools.refinery.store.representation.Symbol; |
diff --git a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java index 3fc85480..95b37f09 100644 --- a/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java +++ b/subprojects/store-query-interpreter/src/test/java/tools/refinery/store/query/interpreter/WeaklyConnectedComponentsTest.java | |||
@@ -6,11 +6,11 @@ | |||
6 | package tools.refinery.store.query.interpreter; | 6 | package tools.refinery.store.query.interpreter; |
7 | 7 | ||
8 | import org.junit.jupiter.api.Test; | 8 | import org.junit.jupiter.api.Test; |
9 | import tools.refinery.logic.dnf.Query; | ||
10 | import tools.refinery.logic.literal.Connectivity; | ||
11 | import tools.refinery.logic.literal.RepresentativeElectionLiteral; | ||
9 | import tools.refinery.store.model.ModelStore; | 12 | import tools.refinery.store.model.ModelStore; |
10 | import tools.refinery.store.query.ModelQueryAdapter; | 13 | import tools.refinery.store.query.ModelQueryAdapter; |
11 | import tools.refinery.store.query.dnf.Query; | ||
12 | import tools.refinery.store.query.literal.Connectivity; | ||
13 | import tools.refinery.store.query.literal.RepresentativeElectionLiteral; | ||
14 | import tools.refinery.store.query.view.AnySymbolView; | 14 | import tools.refinery.store.query.view.AnySymbolView; |
15 | import tools.refinery.store.query.view.KeyOnlyView; | 15 | import tools.refinery.store.query.view.KeyOnlyView; |
16 | import tools.refinery.store.representation.Symbol; | 16 | import tools.refinery.store.representation.Symbol; |