🎨 Trivial: Made Issue #15 tests more consistent with other tests

Also added some informational comments for future developers (or future
me).

Author: rmcdouga

rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/AemTargetType.java

@@ -14,7 +14,8 @@ public enum AemTargetType {
 	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)
 
-	private final Path samplesPath;		// Location where sample files are stored for this AEM target type.
+	private final Path samplesPath;		// Location where sample files are stored for this AEM target type.  
+										// Needs to be absolute path since (in some cases) it will be passed to AEM.
 
 	private AemTargetType(Path samplesPath) {
 		this.samplesPath = samplesPath;

rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/TestUtils.java

@@ -54,6 +54,7 @@ public class TestUtils {
 	private static final String SAMPLE_FORM_DATA_JSON_NAME = "SampleForm_data.json";
 	private static final String SAMPLE_FORM_DATA_DOCX_NAME = "SampleForm.docx";
 	private static final String SAMPLE_FORM_DDX_NAME = "SampleForm_DDX.xml";
+	private static final String SAMPLE_ARTWORK_PDF = "SampleArtworkPdf.pdf";
 
 	public static final Path REMOTE_SAMPLE_FORM_PDF = AEM_TARGET_TYPE.samplesPath(SAMPLE_FORM_PDF_NAME);
 	public static final Path REMOTE_SAMPLE_FORM_WITH_DATA_PDF = AEM_TARGET_TYPE.samplesPath(SAMPLE_FORM_WITH_DATA_PDF_NAME);
@@ -63,6 +64,7 @@ public class TestUtils {
 	public static final Path REMOTE_SAMPLE_FORM_DATA_JSON = AEM_TARGET_TYPE.samplesPath(SAMPLE_FORM_DATA_JSON_NAME);
 	public final static Path REMOTE_SAMPLE_FORM_DOCX =  AEM_TARGET_TYPE.samplesPath(SAMPLE_FORM_DATA_DOCX_NAME);
 	public static final Path REMOTE_SAMPLE_FORM_DDX = AEM_TARGET_TYPE.samplesPath(SAMPLE_FORM_DDX_NAME);
+	public static final Path REMOTE_SAMPLE_ARTWORK_PDF = AEM_TARGET_TYPE.samplesPath(SAMPLE_ARTWORK_PDF);
 
 	public static final Path LOCAL_SAMPLE_FORM_PDF = AemTargetType.LOCAL.samplesPath(SAMPLE_FORM_PDF_NAME);
 	public static final Path LOCAL_SAMPLE_FORM_WITH_DATA_PDF = AemTargetType.LOCAL.samplesPath(SAMPLE_FORM_WITH_DATA_PDF_NAME);
@@ -72,6 +74,8 @@ public class TestUtils {
 	public static final Path LOCAL_SAMPLE_FORM_DATA_JSON = AemTargetType.LOCAL.samplesPath(SAMPLE_FORM_DATA_JSON_NAME);
 	public final static Path LOCAL_SAMPLE_FORM_DOCX =  AemTargetType.LOCAL.samplesPath(SAMPLE_FORM_DATA_DOCX_NAME);
 	public static final Path LOCAL_SAMPLE_FORM_DDX = AemTargetType.LOCAL.samplesPath(SAMPLE_FORM_DDX_NAME);
+	public static final Path LOCAL_SAMPLE_ARTWORK_PDF = AemTargetType.LOCAL.samplesPath(SAMPLE_ARTWORK_PDF);
+
 
 	public static final Path RESOURCES_DIR = Paths.get("src", "test", "resources");
 	public static final Path ACTUAL_RESULTS_DIR = RESOURCES_DIR.resolve("actualResults");

rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/af/RenderAdaptiveFormTest.java

@@ -12,6 +12,7 @@
 import org.apache.commons.io.IOUtils;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Tag;
 import org.junit.jupiter.api.Test;
 
@@ -27,7 +28,7 @@
 class RenderAdaptiveFormTest {
 
 	private static final String SAMPLE_AF_NAME = "sample00002test";
-	private static final String SAMPLE_JSON_AF_NAME = "sample-json-adaptive-form--1";
+	private static final String SAMPLE_JSON_AF_NAME = "sample-json-adaptive-form--1";	// TODO: Locate this adaptive form (or generate one) and then enable testRenderAdaptiveFormStringJsonDocument().
 
 	private AdaptiveFormsService underTest;
 
@@ -146,6 +147,7 @@ void testRenderAdaptiveFormPathDocument() throws Exception {
 		assertThat(new String(resultBytes, StandardCharsets.UTF_8), allOf(containsString("Text Field1 Data"), containsString("Text Field2 Data")));
 	}
 
+	@Disabled("This test is disabled because the sample JSON Adaptive Form is not available in the test environment.  It can be enabled when the sample JSON Adaptive Form is available.")
 	@Test
 	void testRenderAdaptiveFormStringJsonDocument() throws Exception {
 		String template = SAMPLE_JSON_AF_NAME;

rest-services/it.tests/src/test/java/com/_4point/aem/docservices/rest_services/it_tests/client/output/GeneratePdfOutputTest.java

@@ -19,7 +19,6 @@
 import com._4point.aem.docservices.rest_services.client.jersey.JerseyRestClient;
 import com._4point.aem.docservices.rest_services.client.output.RestServicesOutputServiceAdapter;
 import com._4point.aem.docservices.rest_services.it_tests.AemInstance;
-import com._4point.aem.docservices.rest_services.it_tests.AemTargetType;
 import com._4point.aem.docservices.rest_services.it_tests.Pdf;
 import com._4point.aem.docservices.rest_services.it_tests.TestUtils;
 import com._4point.aem.fluentforms.api.Document;
@@ -110,7 +109,7 @@ void testGeneratePdfOutput_AllArgs() throws Exception {
 	@DisplayName("Test generatePdfOutput() Just Form Doc.  FluentFormsAPI Issue #15")
 	void testGeneratePdfOutput_JustFormDocIssue15() throws Exception {
 		Document pdfResult =  underTest.generatePDFOutput()
-									   .executeOn(SimpleDocumentFactoryImpl.getFactory().create(AemTargetType.LOCAL.samplesPath("SampleArtworkPdf.pdf")));
+									   .executeOn(SimpleDocumentFactoryImpl.getFactory().create(LOCAL_SAMPLE_ARTWORK_PDF));
 
 		TestUtils.validatePdfResult(pdfResult.getInlineData(), "GeneratePdfOutput_JustFormDocIssue15.pdf", false, false, false);
 	}
@@ -119,7 +118,7 @@ void testGeneratePdfOutput_JustFormDocIssue15() throws Exception {
 	@DisplayName("Test generatePdfOutput() Just Form.  FluentFormsAPI Issue #15")
 	void testGeneratePdfOutput_JustFormIssue15() throws Exception {
 		Document pdfResult =  underTest.generatePDFOutput()
-									   .executeOn(AEM_TARGET_TYPE.samplesPath("SampleArtworkPdf.pdf"));
+									   .executeOn(REMOTE_SAMPLE_ARTWORK_PDF);
 
 		TestUtils.validatePdfResult(pdfResult.getInlineData(), "GeneratePdfOutput_JustFormDocIssue15.pdf", false, false, false);
 	}