refactor: simplified Dnf parameter directions

2 files changed, 15 insertions, 10 deletions

diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java
index 4edea401..687b06db 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfBuilderLiteralEliminationTest.java
@@ -10,6 +10,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 import tools.refinery.store.query.literal.BooleanLiteral;
 import tools.refinery.store.query.term.NodeVariable;
+import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.term.bool.BoolTerms;
 import tools.refinery.store.query.view.KeyOnlyView;
@@ -28,7 +29,7 @@ class DnfBuilderLiteralEliminationTest {
         private final SymbolView<Boolean> friendView = new KeyOnlyView<>(friend);
         private final NodeVariable p = Variable.of("p");
         private final NodeVariable q = Variable.of("q");
-        private final Dnf trueDnf = Dnf.builder().parameter(p).clause().build();
+        private final Dnf trueDnf = Dnf.builder().parameter(p, ParameterDirection.IN).clause().build();
         private final Dnf falseDnf = Dnf.builder().parameter(p).build();
 
         @Test
@@ -84,11 +85,11 @@ class DnfBuilderLiteralEliminationTest {
         @Test
         void alwaysTrueTest() {
                 var actual = Dnf.builder()
-                                .parameters(p, q)
+                                .parameters(List.of(p, q), ParameterDirection.IN)
                                 .clause(friendView.call(p, q))
                                 .clause(BooleanLiteral.TRUE)
                                 .build();
-                var expected = Dnf.builder().parameters(p, q).clause().build();
+                var expected = Dnf.builder().parameters(List.of(p, q), ParameterDirection.IN).clause().build();
 
                 assertThat(actual, structurallyEqualTo(expected));
         }
@@ -130,11 +131,11 @@ class DnfBuilderLiteralEliminationTest {
         @Test
         void alwaysTrueDnfTest() {
                 var actual = Dnf.builder()
-                                .parameters(p, q)
+                                .parameters(List.of(p, q), ParameterDirection.IN)
                                 .clause(friendView.call(p, q))
                                 .clause(trueDnf.call(q))
                                 .build();
-                var expected = Dnf.builder().parameters(p, q).clause().build();
+                var expected = Dnf.builder().parameters(List.of(p, q), ParameterDirection.IN).clause().build();
 
                 assertThat(actual, structurallyEqualTo(expected));
         }
@@ -176,11 +177,11 @@ class DnfBuilderLiteralEliminationTest {
         @Test
         void alwaysNotFalseDnfTest() {
                 var actual = Dnf.builder()
-                                .parameters(p, q)
+                                .parameters(List.of(p, q), ParameterDirection.IN)
                                 .clause(friendView.call(p, q))
                                 .clause(not(falseDnf.call(q)))
                                 .build();
-                var expected = Dnf.builder().parameters(p, q).clause().build();
+                var expected = Dnf.builder().parameters(List.of(p, q), ParameterDirection.IN).clause().build();
 
                 assertThat(actual, structurallyEqualTo(expected));
         }
diff --git a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
index 2e93d78a..63310a78 100644
--- a/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
+++ b/subprojects/store-query/src/test/java/tools/refinery/store/query/dnf/DnfToDefinitionStringTest.java
@@ -6,6 +6,7 @@
 package tools.refinery.store.query.dnf;
 
 import org.junit.jupiter.api.Test;
+import tools.refinery.store.query.term.ParameterDirection;
 import tools.refinery.store.query.term.Variable;
 import tools.refinery.store.query.view.KeyOnlyView;
 import tools.refinery.store.representation.Symbol;
@@ -39,7 +40,7 @@ class DnfToDefinitionStringTest {
         @Test
         void emptyClauseTest() {
                 var p = Variable.of("p");
-                var dnf = Dnf.builder("Example").parameter(p).clause().build();
+                var dnf = Dnf.builder("Example").parameter(p, ParameterDirection.IN).clause().build();
 
                 assertThat(dnf.toDefinitionString(), is("""
                                 pred Example(@In p) <->
@@ -67,10 +68,13 @@ class DnfToDefinitionStringTest {
                 var q = Variable.of("q");
                 var friend = new Symbol<>("friend", 2, Boolean.class, false);
                 var friendView = new KeyOnlyView<>(friend);
-                var dnf = Dnf.builder("Example").parameter(p).clause(not(friendView.call(p, q))).build();
+                var dnf = Dnf.builder("Example")
+                                .parameter(p, ParameterDirection.IN)
+                                .clause(not(friendView.call(p, q)))
+                                .build();
 
                 assertThat(dnf.toDefinitionString(), is("""
-                                pred Example(p) <->
+                                pred Example(@In p) <->
                                     !(@RelationView("key") friend(p, q)).
                                 """));
         }