✅ Got the AemInstanceFluentFormsResources tests working.

Author: rmcdouga

spring/fluentforms-sample-webmvc-app/src/main/java/com/_4point/aem/fluentforms/sampleapp/resources/FluentFormsResources.java

@@ -55,7 +55,8 @@ public class FluentFormsResources {
 	protected static final String RESOURCE_PATH = "/FluentForms";
 
 	// TODO:  Move this to configuration value
-	String contentRoot = "crx:/content/dam/formsanddocuments";
+//	String contentRoot = "crx:/content/dam/formsanddocuments";
+	String contentRoot = "";
 
 	@Autowired
 	DocumentFactory documentFactory;

spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/AbstractFluentFormsResourcesTest.java

@@ -20,19 +20,26 @@
 public abstract class AbstractFluentFormsResourcesTest {
 	private static final String APPLICATION_PDF = "application/pdf";
 	private static final MediaType APPLICATION_PDF_TYPE = MediaType.valueOf(APPLICATION_PDF);
-	
+
 	private static final Path RESOURCES_DIR = Path.of("src", "test", "resources");
 	private static final Path SAMPLE_FILES_DIR = RESOURCES_DIR.resolve("SampleFiles");
+	protected static final Path SAMPLE_XDP_FILENAME_PATH = Path.of("SampleForm.xdp");
 
 	private static final RestClient REST_CLIENT = RestClient.create();
 
 	@LocalServerPort
 	private int port;
+	private final String sampleFormLocation;
+	
+	protected AbstractFluentFormsResourcesTest(String sampleFormLocation) {
+		this.sampleFormLocation = sampleFormLocation;
+	}
+
 	@Test
 	void testOutputServiceGeneratePdf_NoData() {
 		URI uri = UriComponentsBuilder.fromUri(getBaseUri(port))
 									  .path("/FluentForms/OutputServiceGeneratePdf")
-									  .queryParam("form", "sample_template.xdp")
+									  .queryParam("form", sampleFormLocation)
 									  .build()
 									  .toUri(); 
 
@@ -63,7 +70,7 @@ void testOutputServiceGeneratePdf_WithData() {
 
 		URI uri = UriComponentsBuilder.fromUri(getBaseUri(port))
 				  .path("/FluentForms/OutputServiceGeneratePdf")
-				  .queryParam("form", "sample_template.xdp")
+				  .queryParam("form", sampleFormLocation)
 				  .queryParam("dataKey", dataKeyValue)
 				  .build()
 				  .toUri(); 
@@ -80,7 +87,7 @@ void testOutputServiceGeneratePdf_WithData() {
 	void testOutputServiceGeneratePdf_WithPostedXmlData() {
 		URI uri = UriComponentsBuilder.fromUri(getBaseUri(port))
 				  .path("/FluentForms/OutputServiceGeneratePdf")
-				  .queryParam("form", "sample_template.xdp")
+				  .queryParam("form", sampleFormLocation)
 				  .build()
 				  .toUri(); 
 
@@ -97,7 +104,7 @@ void testOutputServiceGeneratePdf_WithPostedXmlData() {
 	void testOutputServiceGeneratePdf_WithPostedJsonData() {
 		URI uri = UriComponentsBuilder.fromUri(getBaseUri(port))
 				  .path("/FluentForms/OutputServiceGeneratePdf")
-				  .queryParam("form", "sample_template.xdp")
+				  .queryParam("form", sampleFormLocation)
 				  .build()
 				  .toUri(); 
 
@@ -162,7 +169,7 @@ void testAdaptiveFormsServiceRenderAdaptiveForm_WithData() {
 	void testHtml5FormsServiceRenderHtml5Form_NoData() {
 		URI uri = UriComponentsBuilder.fromUri(getBaseUri(port))
 				.path("/FluentForms/Html5FormsServiceRenderHtml5Form")
-				.queryParam("form", SAMPLE_FILES_DIR.resolve("SampleForm.xdp").toAbsolutePath())
+				.queryParam("form", sampleFormLocation)
 				.build()
 				.toUri(); 
 
@@ -193,7 +200,7 @@ void testHtml5FormsServiceRenderHtmlForm_WithData() {
 
 		URI uri = UriComponentsBuilder.fromUri(getBaseUri(port))
 				.path("/FluentForms/Html5FormsServiceRenderHtml5Form")
-				.queryParam("form", SAMPLE_FILES_DIR.resolve("SampleForm.xdp").toAbsolutePath())
+				.queryParam("form", sampleFormLocation)
 				.queryParam("dataKey", dataKeyValue)
 				.build()
 				.toUri(); 

spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/AemInstance.java

@@ -138,6 +138,14 @@ public boolean isLocal() {
 		return aemContainer == null && aemHost().equalsIgnoreCase(LOCALHOST);
 	}
 
+	public Path samplesPath(String filename) {
+		return targetType.samplesPath(filename);
+	}
+
+	public Path samplesPath(Path filename) {
+		return samplesPath(filename.toString());
+	}
+
 	private static boolean aemIsUp(HttpClient restClient, HttpRequest request) {
 		try {
 			HttpResponse<Void> result = restClient.send(request, BodyHandlers.discarding());
@@ -165,7 +173,7 @@ private static String encodeBasic(String username, String password) {
 	 * the tests.
 	 */
 	public enum AemTargetType {
-		LOCAL(Path.of("..", "test_containers", "ff_it_files").toAbsolutePath()),			// Running on local machine (assumes that the port is TEST_MACHINE_PORT)	
+		LOCAL(Path.of("src", "test", "resources", "SampleFiles").toAbsolutePath()),			// Running on local machine (assumes that the port is TEST_MACHINE_PORT)	
 		REMOTE_WINDOWS(Path.of("/Adobe", "ff_it_files")), // Running on remote Windows machine (assumes that machine name is TEST_MACHINE_NAME and port is TEST_MACHINE_PORT) 
 		REMOTE_LINUX(Path.of("/opt", "adobe", "ff_it_files")), 	// Running on remote Linux machine (assumes that machine name is TEST_MACHINE_NAME and port is TEST_MACHINE_PORT)
 		TESTCONTAINERS(Path.of("/opt", "adobe", "ff_it_files")); // Running on local testcontainers image (gets port from TestContainers)

spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/AemInstanceFluentFormsResourcesTest.java

@@ -8,13 +8,22 @@
 
 import com._4point.aem.fluentforms.sampleapp.FluentFormsSpringApplication;
 
+/**
+ * These AEM Instance tests run against a running AEM instance that have sample forms deployed to the same locations
+ * as the rest-serivices it.tests tests.  In practice, this means that (for example) the test containers docker image
+ * should be the it.tests docker image. 
+ */
 @EnabledIf("com._4point.aem.fluentforms.sampleapp.resources.TestConstants#runAemInstanceTests")
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT, 
 				classes = FluentFormsSpringApplication.class
 				)
 @ContextConfiguration(initializers = AemInstance.AemInstanceContextInitializer.class)
 public class AemInstanceFluentFormsResourcesTest extends AbstractFluentFormsResourcesTest {
 
+	protected AemInstanceFluentFormsResourcesTest() {
+		super(AemInstance.AEM_1.samplesPath(SAMPLE_XDP_FILENAME_PATH).toString());
+	}
+
 	@BeforeAll
 	static void setUpAll() throws Exception {
 		AemInstance.AEM_1.prepareForTests();

spring/fluentforms-sample-webmvc-app/src/test/java/com/_4point/aem/fluentforms/sampleapp/resources/WireMockFluentFormsResourcesTest.java

@@ -1,5 +1,6 @@
 package com._4point.aem.fluentforms.sampleapp.resources;
 
+import java.nio.file.Path;
 import java.util.List;
 
 import org.junit.jupiter.api.AfterEach;
@@ -30,7 +31,12 @@
 class WireMockFluentFormsResourcesTest extends AbstractFluentFormsResourcesTest {
 	private static final boolean WIREMOCK_RECORDING = false;
 
+	private static final Path RESOURCES_DIR = Path.of("src", "test", "resources");
+	private static final Path SAMPLE_FILES_DIR = RESOURCES_DIR.resolve("SampleFiles");
 
+	private WireMockFluentFormsResourcesTest() {
+		super(SAMPLE_FILES_DIR.resolve(SAMPLE_XDP_FILENAME_PATH).toAbsolutePath().toString());
+	}
 
 	@BeforeEach
 	void setUp(WireMockRuntimeInfo wmRuntimeInfo) throws Exception {

spring/fluentforms-sample-webmvc-app/src/test/resources/mappings/FluentFormsResourcesTest_testOutputServiceGeneratePdf_Success.json

@@ -5,7 +5,7 @@
     "url" : "/services/OutputService/GeneratePdfOutput",
     "method" : "POST",
     "bodyPatterns" : [ {
-      "contains" : "sample_template"
+      "contains" : "SampleForm.xdp"
     } ]
   },
   "response" : {