1 files changed, 86 insertions, 9 deletions

diff --git a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java
index 2d759c86..be675a80 100644
--- a/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java
+++ b/subprojects/language-semantics/src/test/java/tools/refinery/language/semantics/SolutionSerializerTest.java
@@ -6,19 +6,29 @@
 package tools.refinery.language.semantics;
 
 import com.google.inject.Inject;
+import com.google.inject.Provider;
 import org.eclipse.xtext.testing.InjectWith;
 import org.eclipse.xtext.testing.extensions.InjectionExtension;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
-import tools.refinery.generator.ModelGeneratorFactory;
-import tools.refinery.generator.ProblemLoader;
+import tools.refinery.language.model.tests.utils.ProblemParseHelper;
 import tools.refinery.language.tests.ProblemInjectorProvider;
+import tools.refinery.store.dse.propagation.PropagationAdapter;
+import tools.refinery.store.dse.strategy.BestFirstStoreManager;
+import tools.refinery.store.dse.transition.DesignSpaceExplorationAdapter;
+import tools.refinery.store.model.ModelStore;
+import tools.refinery.store.query.interpreter.QueryInterpreterAdapter;
+import tools.refinery.store.reasoning.ReasoningAdapter;
+import tools.refinery.store.reasoning.ReasoningStoreAdapter;
+import tools.refinery.store.reasoning.literal.Concreteness;
+import tools.refinery.store.statecoding.StateCoderAdapter;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Stream;
 
 import static org.hamcrest.MatcherAssert.assertThat;
@@ -28,21 +38,35 @@ import static org.hamcrest.Matchers.is;
 @InjectWith(ProblemInjectorProvider.class)
 class SolutionSerializerTest {
         @Inject
-        ProblemLoader loader;
+        private ProblemParseHelper parseHelper;
 
         @Inject
-        ModelGeneratorFactory generatorFactory;
+        private Provider<ModelInitializer> initializerProvider;
 
         @Inject
-        SolutionSerializer serializer;
+        private Provider<SolutionSerializer> serializerProvider;
 
         @ParameterizedTest
         @MethodSource
         void solutionSerializerTest(String prefix, String input, String expectedOutput) throws IOException {
-                var problem = loader.loadString(prefix + "\n" + input);
-                var generator = generatorFactory.createGenerator(problem);
-                generator.generate();
-                var solution = serializer.serializeSolution(generator.getProblemTrace(), generator.getModel());
+                var problem = parseHelper.parse(prefix + "\n" + input).problem();
+                var storeBuilder = ModelStore.builder()
+                                .with(QueryInterpreterAdapter.builder())
+                                .with(PropagationAdapter.builder())
+                                .with(StateCoderAdapter.builder())
+                                .with(DesignSpaceExplorationAdapter.builder())
+                                .with(ReasoningAdapter.builder()
+                                                .requiredInterpretations(Set.of(Concreteness.CANDIDATE)));
+                var initializer = initializerProvider.get();
+                var modelSeed = initializer.createModel(problem, storeBuilder);
+                var store = storeBuilder.build();
+                var model = store.getAdapter(ReasoningStoreAdapter.class).createInitialModel(modelSeed);
+                var initialVersion = model.commit();
+                var bestFirst = new BestFirstStoreManager(store, 1);
+                bestFirst.startExploration(initialVersion, 0);
+                model.restore(bestFirst.getSolutionStore().getSolutions().getFirst().version());
+                var serializer = serializerProvider.get();
+                var solution = serializer.serializeSolution(initializer.getProblemTrace(), model);
                 String actualOutput;
                 try (var outputStream = new ByteArrayOutputStream()) {
                         solution.eResource().save(outputStream, Map.of());
@@ -57,6 +81,7 @@ class SolutionSerializerTest {
                                 """, """
                                 scope Foo = 3.
                                 """, """
+                                declare foo1, foo2, foo3.
                                 !exists(Foo::new).
                                 Foo(foo1).
                                 Foo(foo2).
@@ -70,6 +95,7 @@ class SolutionSerializerTest {
                                 """, """
                                 scope Foo = 1.
                                 """, """
+                                declare foo1, bar1, bar2.
                                 !exists(Foo::new).
                                 !exists(Bar::new).
                                 Foo(foo1).
@@ -88,6 +114,7 @@ class SolutionSerializerTest {
                                 """, """
                                 scope Foo = 1, Bar = 2.
                                 """, """
+                                declare foo1, bar1, bar2.
                                 !exists(Foo::new).
                                 !exists(Bar::new).
                                 Foo(foo1).
@@ -107,6 +134,7 @@ class SolutionSerializerTest {
 
                                 scope Person += 0.
                                 """, """
+                                declare a, b, c.
                                 !exists(Person::new).
                                 Person(a).
                                 Person(b).
@@ -132,6 +160,7 @@ class SolutionSerializerTest {
 
                                 scope Foo += 0.
                                 """, """
+                                declare foo.
                                 !exists(Foo::new).
                                 Foo(foo).
                                 default !bar(*, *).
@@ -142,6 +171,7 @@ class SolutionSerializerTest {
                                 """, """
                                 scope Foo = 1, Bar = 0.
                                 """, """
+                                declare foo1.
                                 !exists(Foo::new).
                                 !exists(Bar::new).
                                 Foo(foo1).
@@ -156,9 +186,56 @@ class SolutionSerializerTest {
 
                                 scope Foo += 0.
                                 """, """
+                                declare a.
                                 !exists(Foo::new).
                                 Foo(a).
                                 default !ref(*, *).
+                                """), Arguments.of("""
+                                atom a.
+                                class Foo.
+                                """, """
+                                Foo(a).
+                                scope Foo += 0.
+                                """, """
+                                !exists(Foo::new).
+                                Foo(a).
+                                """), Arguments.of("""
+                                multi a.
+                                class Foo.
+                                """, """
+                                Foo(a).
+                                !exists(Foo::new).
+                                scope Foo = 2.
+                                """, """
+                                declare foo1, foo2.
+                                !exists(a).
+                                !exists(Foo::new).
+                                Foo(foo1).
+                                Foo(foo2).
+                                """), Arguments.of("""
+                                declare a.
+                                class Foo.
+                                """, """
+                                Foo(a).
+                                ?exists(a).
+                                scope Foo = 2, Foo += 1.
+                                """, """
+                                declare foo1.
+                                !exists(Foo::new).
+                                Foo(a).
+                                Foo(foo1).
+                                """), Arguments.of("""
+                                declare a.
+                                class Foo.
+                                """, """
+                                Foo(a).
+                                ?exists(a).
+                                scope Foo = 1, Foo += 1.
+                                """, """
+                                declare foo1.
+                                !exists(a).
+                                !exists(Foo::new).
+                                Foo(foo1).
                                 """));
         }
 }