From cd4d5aecd2c1ceedc49657f315d3a543b48779c5 Mon Sep 17 00:00:00 2001 From: Kristóf Marussy Date: Sun, 18 Jun 2023 14:31:05 +0200 Subject: refactor: prefer Query.of over Dnf.of --- .../refinery/store/query/dnf/VariableDirectionTest.java | 16 ++++++++-------- .../store/query/literal/AggregationLiteralTest.java | 10 +++++----- 2 files changed, 13 insertions(+), 13 deletions(-) (limited to 'subprojects/store-query/src/test') diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java index 3608d09e..c52d26b2 100644 --- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java +++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/VariableDirectionTest.java @@ -38,7 +38,7 @@ class VariableDirectionTest { private static final Symbol age = Symbol.of("age", 1, Integer.class); private static final AnySymbolView personView = new KeyOnlyView<>(person); private static final AnySymbolView friendView = new KeyOnlyView<>(friend); - private static final AnySymbolView ageView = new FunctionView<>(age); + private static final FunctionView ageView = new FunctionView<>(age); private static final NodeVariable p = Variable.of("p"); private static final NodeVariable q = Variable.of("q"); private static final DataVariable x = Variable.of("x", Integer.class); @@ -149,10 +149,10 @@ class VariableDirectionTest { return Stream.of( Arguments.of(not(friendView.call(p, q))), Arguments.of(y.assign(friendView.count(p, q))), - Arguments.of(y.assign(ageView.aggregate(z, INT_SUM, p, z))), + Arguments.of(y.assign(ageView.aggregate(INT_SUM, p))), Arguments.of(not(dnfWithOutput.call(p, q))), Arguments.of(y.assign(dnfWithOutput.count(p, q))), - Arguments.of(y.assign(dnfWithOutputToAggregate.aggregate(z, INT_SUM, p, q, z))) + Arguments.of(y.assign(dnfWithOutputToAggregate.aggregateBy(z, INT_SUM, p, q, z))) ); } @@ -192,8 +192,8 @@ class VariableDirectionTest { Arguments.of(not(dnfWithInput.call(p, p))), Arguments.of(y.assign(dnfWithInput.count(p, q))), Arguments.of(y.assign(dnfWithInput.count(p, p))), - Arguments.of(y.assign(dnfWithInputToAggregate.aggregate(z, INT_SUM, p, q, z))), - Arguments.of(y.assign(dnfWithInputToAggregate.aggregate(z, INT_SUM, p, p, z))) + Arguments.of(y.assign(dnfWithInputToAggregate.aggregateBy(z, INT_SUM, p, q, z))), + Arguments.of(y.assign(dnfWithInputToAggregate.aggregateBy(z, INT_SUM, p, p, z))) ); } @@ -357,7 +357,7 @@ class VariableDirectionTest { Arguments.of(dnfWithInput.call(x, q)), Arguments.of(not(dnfWithInput.call(x, q))), Arguments.of(y.assign(dnfWithInput.count(x, q))), - Arguments.of(y.assign(dnfWithInputToAggregate.aggregate(z, INT_SUM, x, q, z))) + Arguments.of(y.assign(dnfWithInputToAggregate.aggregateBy(z, INT_SUM, x, q, z))) ); } @@ -415,10 +415,10 @@ class VariableDirectionTest { Arguments.of(x.assign(constant(24))), Arguments.of(ageView.call(q, x)), Arguments.of(x.assign(personView.count(q))), - Arguments.of(x.assign(ageView.aggregate(z, INT_SUM, q, z))), + Arguments.of(x.assign(ageView.aggregate(INT_SUM, q))), Arguments.of(dnfWithDataOutput.call(x, q)), Arguments.of(x.assign(dnfWithOutput.count(q))), - Arguments.of(x.assign(dnfWithOutputToAggregate.aggregate(z, INT_SUM, q, z))) + Arguments.of(x.assign(dnfWithOutputToAggregate.aggregateBy(z, INT_SUM, q, z))) ); } diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java index 5293b273..35910e08 100644 --- a/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java +++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/literal/AggregationLiteralTest.java @@ -44,7 +44,7 @@ class AggregationLiteralTest { @Test void parameterDirectionTest() { - var literal = x.assign(fakeConstraint.aggregate(y, INT_SUM, p, y)); + var literal = x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y)); assertAll( () -> assertThat(literal.getOutputVariables(), containsInAnyOrder(x)), () -> assertThat(literal.getInputVariables(Set.of()), empty()), @@ -56,13 +56,13 @@ class AggregationLiteralTest { @Test void missingAggregationVariableTest() { - var aggregation = fakeConstraint.aggregate(y, INT_SUM, p, z); + var aggregation = fakeConstraint.aggregateBy(y, INT_SUM, p, z); assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation)); } @Test void circularAggregationVariableTest() { - var aggregation = fakeConstraint.aggregate(x, INT_SUM, p, x); + var aggregation = fakeConstraint.aggregateBy(x, INT_SUM, p, x); assertThrows(IllegalArgumentException.class, () -> x.assign(aggregation)); } @@ -71,7 +71,7 @@ class AggregationLiteralTest { var builder = Dnf.builder() .clause( not(fakeConstraint.call(p, y)), - x.assign(fakeConstraint.aggregate(y, INT_SUM, p, y)) + x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y)) ); assertThrows(IllegalArgumentException.class, builder::build); } @@ -81,7 +81,7 @@ class AggregationLiteralTest { var builder = Dnf.builder() .clause( y.assign(constant(27)), - x.assign(fakeConstraint.aggregate(y, INT_SUM, p, y)) + x.assign(fakeConstraint.aggregateBy(y, INT_SUM, p, y)) ); assertThrows(IllegalArgumentException.class, builder::build); } -- cgit v1.2.3-54-g00ecf