updating RegressionTest generateAnswers for when two classes are used for test .dat & answer files

src/test/java/emissary/test/core/junit5/RegressionTest.java

@@ -301,7 +301,12 @@ protected void generateAnswerFiles(final String resource) throws Exception {
         tweakFinalLogEventsBeforeSerialisation(resource, finalLogEvents);
 
         // Generate the full XML (setup & answers from before & after)
-        RegressionTestUtil.writeAnswerXml(resource, initialIbdo, finalIbdo, finalResults, finalLogEvents, getEncoders());
+        if (super.answerFileClassRef == null) {
+            RegressionTestUtil.writeAnswerXml(resource, initialIbdo, finalIbdo, finalResults, finalLogEvents, getEncoders());
+        } else {
+            RegressionTestUtil.writeAnswerXml(resource, initialIbdo, finalIbdo, finalResults, finalLogEvents, getEncoders(),
+                    super.answerFileClassRef);
+        }
     }
 
     @Override

src/test/java/emissary/test/core/junit5/RegressionTestUtil.java

@@ -35,6 +35,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
 import javax.annotation.Nullable;
 
 import static emissary.core.constants.IbdoXmlElementNames.ANSWERS;
@@ -95,6 +96,8 @@ public final class RegressionTestUtil {
      */
     private static final Path TEST_RESX = getTestResx();
 
+    private static AtomicReference<Class<?>> answerFileClassRef = null;
+
     private RegressionTestUtil() {}
 
     /**
@@ -200,7 +203,14 @@ public static Path getXmlPath(final String resource) {
             return null;
         }
 
-        final String xmlPath = resource.substring(0, datPos) + ResourceReader.XML_SUFFIX;
+        String xmlPath;
+        if (answerFileClassRef == null) {
+            xmlPath = resource.substring(0, datPos) + ResourceReader.XML_SUFFIX;
+        } else {
+            String ansPath = answerFileClassRef.get().getName().replace(".", "/");
+            int testNamePos = resource.lastIndexOf("/");
+            xmlPath = ansPath + resource.substring(testNamePos, datPos) + ResourceReader.XML_SUFFIX;
+        }
         return TEST_RESX.resolve(xmlPath);
     }
 
@@ -240,6 +250,23 @@ public static void writeAnswerXml(final String resource, final IBaseDataObject i
         writeXml(resource, xmlContent);
     }
 
+    /**
+     * Generate the relevant XML and write to disk. Used when answer file class and data file class are not the same.
+     *
+     * @param resource referencing the DAT file
+     * @param initialIbdo for 'setup' section
+     * @param finalIbdo for 'answers' section
+     * @param encoders for encoding ibdo into XML
+     * @param results for 'answers' section
+     * @param answerFileClassRef test class for answer files
+     */
+    public static void writeAnswerXml(final String resource, final IBaseDataObject initialIbdo, final IBaseDataObject finalIbdo,
+            final List<IBaseDataObject> results, final List<SimplifiedLogEvent> logEvents, final ElementEncoders encoders,
+            final AtomicReference<Class<?>> answerFileClassRef) {
+        RegressionTestUtil.answerFileClassRef = answerFileClassRef;
+        writeAnswerXml(resource, initialIbdo, finalIbdo, results, logEvents, encoders);
+    }
+
     /**
      * Helper method to write XML for a given DAT file.
      * 

src/test/java/emissary/test/core/junit5/UnitTest.java

@@ -145,7 +145,7 @@ public static Stream<? extends Arguments> getMyTestParameterFiles(Class<?> clz)
 
     /**
      * Specifies a non-default source of test answer files
-     * 
+     *
      * @param ansClz Class that provides the test answer files.
      */
     protected synchronized void useAlternateAnswerFileSource(Class<?> ansClz) {