Added test cases and addressed review comments

Author: vjystva

bundles/af-core/src/test/java/com/adobe/cq/forms/core/Utils.java

@@ -53,15 +53,15 @@
  */
 public class Utils {
 
-    public static InputStream getJson(Object model) {
+    public static InputStream getJson(Object model, Class<? extends Views.Publish> viewType) {
         Writer writer = new StringWriter();
         ObjectMapper mapper = new ObjectMapper();
         PageModuleProvider pageModuleProvider = new PageModuleProvider();
         mapper.registerModule(pageModuleProvider.getModule());
         DefaultMethodSkippingModuleProvider defaultMethodSkippingModuleProvider = new DefaultMethodSkippingModuleProvider();
         mapper.registerModule(defaultMethodSkippingModuleProvider.getModule());
         try {
-            mapper.writerWithView(Views.Publish.class).writeValue(writer, model);
+            mapper.writerWithView(viewType).writeValue(writer, model);
         } catch (IOException e) {
             fail(String.format("Unable to generate JSON export for model %s: %s", model.getClass().getName(),
                 e.getMessage()));
@@ -77,7 +77,7 @@ public static InputStream getCompleteJson(Object model) {
         DefaultMethodSkippingModuleProvider defaultMethodSkippingModuleProvider = new DefaultMethodSkippingModuleProvider();
         mapper.registerModule(defaultMethodSkippingModuleProvider.getModule());
         try {
-            mapper.writer().writeValue(writer, model);
+            mapper.writerWithView(Views.Author.class).writeValue(writer, model);
         } catch (IOException e) {
             fail(String.format("Unable to generate JSON export for model %s: %s", model.getClass().getName(),
                 e.getMessage()));
@@ -95,8 +95,8 @@ public static InputStream getCompleteJson(Object model) {
      * @param expectedJsonResource
      *            the class path resource providing the expected JSON object
      */
-    public static void testJSONExport(Object model, String expectedJsonResource) {
-        InputStream modeInputStream = getJson(model);
+    public static void testJSONExport(Object model, String expectedJsonResource, Class<? extends Views.Publish> viewType) {
+        InputStream modeInputStream = getJson(model, viewType);
         JsonReader outputReader = Json.createReader(modeInputStream);
         InputStream is = Utils.class.getResourceAsStream(expectedJsonResource);
         if (is != null) {
@@ -113,6 +113,20 @@ public static void testJSONExport(Object model, String expectedJsonResource) {
         }
     }
 
+        /**
+     * Provided a {@code model} object and an {@code expectedJsonResource} identifying a JSON file in the class path,
+     * this method will test the JSON export of the model and compare it to the JSON object provided by the
+     * {@code expectedJsonResource}.
+     *
+     * @param model
+     *            the Sling Model
+     * @param expectedJsonResource
+     *            the class path resource providing the expected JSON object
+     */
+    public static void testJSONExport(Object model, String expectedJsonResource) {
+        testJSONExport(model, expectedJsonResource, Views.Publish.class);
+    }
+
     /**
      * The given model is validated against adaptive form specification
      *

bundles/af-core/src/test/java/com/adobe/cq/forms/core/components/internal/models/v1/form/FragmentImplTest.java

@@ -38,6 +38,7 @@
 import com.adobe.cq.forms.core.components.models.form.FormClientLibManager;
 import com.adobe.cq.forms.core.components.models.form.Fragment;
 import com.adobe.cq.forms.core.components.models.form.TextInput;
+import com.adobe.cq.forms.core.components.views.Views;
 import com.adobe.cq.forms.core.context.FormsCoreComponentTestContext;
 import com.day.cq.wcm.api.NameConstants;
 import com.day.cq.wcm.msm.api.MSMNameConstants;
@@ -55,6 +56,7 @@ public class FragmentImplTest {
     private static final String PATH_FRAGMENT = CONTENT_ROOT + "/fragment";
     private static final String PATH_FRAGMENT_DAMPATH = CONTENT_ROOT + "/fragment-dampath";
     private static final String PATH_FRAGMENT_WITHOUT_FIELDTYPE = CONTENT_ROOT + "/fragment-without-fieldtype";
+    private static final String PATH_FRAGMENT_WITH_FRAGMENT_PATH = CONTENT_ROOT + "/fragment-with-fragment-path";
     private final AemContext context = FormsCoreComponentTestContext.newAemContext();
 
     @BeforeEach
@@ -133,6 +135,12 @@ void testJSONExportWithDamPath() throws Exception {
         Utils.testJSONExport(fragment, Utils.getTestExporterJSONPath(BASE, PATH_FRAGMENT_DAMPATH));
     }
 
+    @Test
+    void testJSONExportWithFragmentPath() throws Exception {
+        Fragment fragment = Utils.getComponentUnderTest(PATH_FRAGMENT_WITH_FRAGMENT_PATH, Fragment.class, context);
+        Utils.testJSONExport(fragment, Utils.getTestExporterJSONPath(BASE, PATH_FRAGMENT_WITH_FRAGMENT_PATH), Views.Author.class);
+    }
+
     @Test
     void testGetChildrenModels() {
         Fragment fragment = Utils.getComponentUnderTest(PATH_FRAGMENT, Fragment.class, context);

bundles/af-core/src/test/resources/form/formcontainer/test-content-auto-save.json

@@ -8,7 +8,6 @@
   "fd:enableAutoSave": "true",
   "fd:autoSaveInterval": "2",
   "fd:autoSaveStrategyType": "time",
-  "specVersion": "0.14.2",
   "textinput" : {
     "jcr:primaryType": "nt:unstructured",
     "sling:resourceType"    : "core/fd/components/form/textinput/v1/textinput",

bundles/af-core/src/test/resources/form/formcontainer/test-page-content.json

@@ -29,7 +29,6 @@
       "dorTemplateRef": "xyz",
       "clientLibRef": "abc",
       "customProp": "customPropValue",
-      "specVersion": "0.14.2",
       "textinput" : {
         "jcr:primaryType": "nt:unstructured",
         "sling:resourceType"    : "core/fd/components/form/textinput/v1/textinput",
@@ -123,7 +122,6 @@
       "thankYouOption": "page",
       "jcr:lastModifiedBy": "[email protected]",
       "fd:version": "2.1",
-      "specVersion": "0.14.2",
       "title": "uesprintdemo",
       "jcr:lastModified": "Sat Mar 08 2025 06:56:53 GMT+0000",
       "themeRef": "",
@@ -148,7 +146,6 @@
       "thankYouOption": "page",
       "jcr:lastModifiedBy": "[email protected]",
       "fd:version": "2.1",
-      "specVersion": "0.14.2",
       "title": "uesprintdemo",
       "jcr:lastModified": "Sat Mar 08 2025 06:56:53 GMT+0000",
       "themeRef": "",
@@ -172,7 +169,6 @@
       "thankYouOption": "page",
       "jcr:lastModifiedBy": "[email protected]",
       "fd:version": "2.1",
-      "specVersion": "0.14.2",
       "title": "uesprintdemo",
       "jcr:lastModified": "Sat Mar 08 2025 06:56:53 GMT+0000",
       "themeRef": "",
@@ -197,7 +193,6 @@
       "thankYouOption": "page",
       "jcr:lastModifiedBy": "[email protected]",
       "fd:version": "2.1",
-      "specVersion": "0.14.2",
       "title": "uesprintdemo",
       "jcr:lastModified": "Sat Mar 08 2025 06:56:53 GMT+0000",
       "themeRef": "",

bundles/af-core/src/test/resources/form/fragment/exporter-fragment-with-fragment-path.json

@@ -0,0 +1,56 @@
+{
+  "id": "fragment-c83f64bf1d",
+  "fieldType": "panel",
+  "name": "fragment-123",
+  "type": "object",
+  "repeatable": true,
+  "minOccur": 0,
+  "maxOccur": 4,
+  "fragmentPath": "/content/affragment",
+  "properties": {
+    "customProp": "customPropValue",
+    "fd:dor": {
+      "dorExclusion": false,
+      "dorExcludeTitle": false,
+      "dorExcludeDescription": false
+    },
+    "fd:path": "/content/fragment-with-fragment-path",
+    "fd:fragment": true,
+    "fd:viewType": "fragment"
+  },
+  "label": {
+    "value": "Fragment"
+  },
+  "events": {
+    "custom:setProperty": [
+      "$event.payload"
+    ]
+  },
+  ":itemsOrder": [
+    "textinput"
+  ],
+  ":items": {
+    "textinput": {
+      "id": "textinput-233cc688ba",
+      "fieldType": "text-input",
+      "name": "fragmenttextinput",
+      "type": "string",
+      "label": {
+        "value": "Text Input"
+      },
+      "properties": {
+        "fd:dor": {
+          "dorExclusion": false
+        },
+        "fd:path": "/content/affragment/jcr:content/guideContainer/textinput"
+      },
+      "events": {
+        "custom:setProperty": [
+          "$event.payload"
+        ]
+      },
+      ":type": "core/fd/components/form/textinput/v1/textinput"
+    }
+  },
+  ":type": "core/fd/components/form/fragment/v1/fragment"
+}

bundles/af-core/src/test/resources/form/fragment/test-content.json

@@ -41,6 +41,21 @@
     "sling:resourceType": "core/fd/components/form/fragment/v1/fragment",
     "fragmentPath": "/content/affragment"
   },
+  "fragment-with-fragment-path": {
+    "jcr:primaryType": "nt:unstructured",
+    "wrapData": true,
+    "jcr:title": "Fragment",
+    "minOccur": "0",
+    "jcr:lastModifiedBy": "admin",
+    "name": "fragment-123",
+    "maxOccur": "4",
+    "jcr:lastModified": "Fri Jun 02 2023 12:34:24 GMT+0530",
+    "repeatable": true,
+    "sling:resourceType": "core/fd/components/form/fragment/v1/fragment",
+    "fieldType": "panel",
+    "fragmentPath": "/content/affragment",
+    "customProp": "customPropValue"
+  },
   "affragment": {
     "jcr:primaryType": "nt:unstructured",
     "jcr:title": "AF Fragment (v2)",