Simplfy TestRunnerRA, change name to MembershipOracleWrapperRA, move into this class some functionality (add output placeholder) from TestRunnerRA

Author: pfg666

src/main/java/com/github/protocolfuzzing/protocolstatefuzzer/components/learner/oracles/MembershipOracleWrapper.java

@@ -0,0 +1,57 @@
+package com.github.protocolfuzzing.protocolstatefuzzer.components.learner.oracles;
+
+import de.learnlib.oracle.MembershipOracle;
+import de.learnlib.query.Query;
+import de.learnlib.ralib.sul.SULOracle;
+import de.learnlib.ralib.words.OutputSymbol;
+import de.learnlib.ralib.words.PSymbolInstance;
+import net.automatalib.word.Word;
+import net.automatalib.word.WordBuilder;
+
+import java.util.Collection;
+
+/**
+ * A wrapper that allows the RALib SULOracle to be used where
+ * a MembershipOracle is required, since SULOracle does not
+ * implement this interface.
+ */
+public class MembershipOracleWrapperRA implements MembershipOracle<PSymbolInstance, Word<PSymbolInstance>> {
+
+    /** The wrapped oracle */
+    private SULOracle wrappedOracle;
+
+    /**
+     * Constructs a wrapper around the provided instance
+     * @param wrappedOracle    The SULOracle to wrap
+     */
+    public MembershipOracleWrapperRA(SULOracle wrappedOracle) {
+        this.wrappedOracle = wrappedOracle;
+    }
+
+    @Override
+    public Word<PSymbolInstance> answerQuery(Word<PSymbolInstance> inputWord) {
+        PSymbolInstance placeholderElement = new PSymbolInstance(new OutputSymbol("PLACEHOLDER ELEMENT"));
+        WordBuilder<PSymbolInstance> ioTraceBuilder = new WordBuilder<PSymbolInstance>();
+        for (PSymbolInstance i: inputWord) {
+            ioTraceBuilder.add(i);
+            ioTraceBuilder.add(placeholderElement);
+        }
+
+        Word<PSymbolInstance> ioTrace = wrappedOracle.trace(ioTraceBuilder.toWord());
+        WordBuilder<PSymbolInstance> outputBuilder = new WordBuilder<PSymbolInstance>();
+        for (PSymbolInstance symInstance : ioTrace) {
+            if (symInstance.getBaseSymbol() instanceof OutputSymbol) {
+                outputBuilder.add(symInstance);
+            }
+        }
+
+        return outputBuilder.toWord();
+    }
+
+    @Override
+    public void processQueries(Collection<? extends Query<PSymbolInstance, Word<PSymbolInstance>>> queries) {
+        for (Query<PSymbolInstance, Word<PSymbolInstance>> query : queries) {
+            query.answer(answerQuery(query.getInput()));
+        }
+    }
+}

src/main/java/com/github/protocolfuzzing/protocolstatefuzzer/components/learner/oracles/MembershipOracleWrapperRA.java

@@ -2,7 +2,7 @@
 
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.AlphabetBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.alphabet.AlphabetBuilderTransformer;
-import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.oracles.MembershipOracleWrapper;
+import com.github.protocolfuzzing.protocolstatefuzzer.components.learner.oracles.MembershipOracleWrapperRA;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.AbstractSul;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulBuilder;
 import com.github.protocolfuzzing.protocolstatefuzzer.components.sul.core.SulWrapper;
@@ -28,9 +28,7 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Iterator;
 import java.util.List;
-import java.util.stream.Stream;
 /**
  * The standard implementation of the TestRunner Interface.
  *
@@ -203,31 +201,19 @@ protected List<TestRunnerResult<Word<PSymbolInstance>, Word<PSymbolInstance>>> r
             );
         }
 
-        // net.automatalib.word.WordCollector<I> exists but is not explicitly marked pulic.
+        // net.automatalib.word.WordCollector<I> exists but is not explicitly marked public.
         // This is most likely unintended since it is a wrapper around WordBuilder which is public.
         // Using that would allow us to skip using WordBuilder directly.
         // TODO: Open an issue or otherwise notify about this.
-        LOGGER.debug("Read mealy tests: {}", tests);
-        WordBuilder<PSymbolInstance> wordBuilder = new WordBuilder<>();
         List<Word<PSymbolInstance>> convertedTests = new ArrayList<>(tests.size());
-        PSymbolInstance placeholderElement = new PSymbolInstance(new OutputSymbol("PLACEHOLDER ELEMENT"));
-        Iterator<PSymbolInstance> placeholders = Stream.iterate(placeholderElement, i -> placeholderElement).iterator();
         for (Word<I> test : tests) {
-            List<PSymbolInstance> wordList = test.stream()
-                                                  .map(inputTransformer::toTransformedInput)
-                                                  .map(p -> new PSymbolInstance(p))
-                                                  .flatMap(x -> Stream.of(x, placeholders.next()))
-                                                  .toList();
-            Word<PSymbolInstance> pWord = wordBuilder.append(wordList).toWord();
-            convertedTests.add(pWord);
-            wordBuilder.clear();
+            WordBuilder<PSymbolInstance> wordBuilder = new WordBuilder<>();
+            for (I input : test) {
+                wordBuilder.append(new PSymbolInstance(inputTransformer.toTransformedInput(input)));
+            }
+            convertedTests.add(wordBuilder.toWord());
         }
-        LOGGER.debug("Converted tests: {}", convertedTests);
-
-
-        List<
-            TestRunnerResult<Word<PSymbolInstance>, Word<PSymbolInstance>>
-        > results = new ArrayList<>();
+        List<TestRunnerResult<Word<PSymbolInstance>, Word<PSymbolInstance>>> results = new ArrayList<>();
         for (Word<PSymbolInstance> test : convertedTests) {
             results.add(runTest(test));
         }
@@ -248,7 +234,7 @@ > runTest(Word<PSymbolInstance> test) {
             TestRunner.runTest(
                 test,
                 testRunnerEnabler.getTestRunnerConfig().getTimes(),
-                new MembershipOracleWrapper(sulOracle)
+                new MembershipOracleWrapperRA(sulOracle)
             );
         return result;
     }