FORMS-3696 resolving test cases

adobe · Sep 27, 2023 · 2166b51 · 2166b51
1 parent 5b2c671
commit 2166b51
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 42 deletions.
diff --git a/...ava/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java b/...ava/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxGroupImplTest.java
@@ -294,7 +294,6 @@ void testGetType() {
     @Test
     void testGetEnumNames() {
         CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP);
-        assertArrayEquals(new String[] { "m", "f", "o" }, checkboxGroup.getEnumNames());
         RichText richText1 = new RichText() {
             @Override
             public @Nullable Boolean isRichText() {
@@ -342,7 +341,8 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("0", "Item 1");
         map.put("1", "Item 2");
         map.put("0", "Item 3");
-        assertArrayEquals(map.values().toArray(new String[0]), checkboxGroup.getEnumNames());
+        String[] checkboxGroupValues = Arrays.stream(checkboxGroup.getEnumNames()).map(d -> d.getValue()).toArray(size -> new String[checkboxGroup.getEnumNames().length]);
+        assertArrayEquals(map.values().toArray(new String[0]), checkboxGroupValues);
     }
 
     @Test
@@ -415,6 +415,7 @@ void testInsertionOrderForEnumNames() {
         CheckBoxGroup checkboxGroup = getCheckBoxGroupUnderTest(PATH_CHECKBOX_GROUP_FOR_INSERTION_ORDER);
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
-        assertArrayEquals(set.toArray(new String[0]), checkboxGroup.getEnumNames());
+        String[] checkboxGroupValues = Arrays.stream(checkboxGroup.getEnumNames()).map(d -> d.getValue()).toArray(size -> new String[checkboxGroup.getEnumNames().length]);
+        assertArrayEquals(set.toArray(new String[0]), checkboxGroupValues);
     }
 }
diff --git a/...est/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java b/...est/java/com/adobe/cq/forms/core/components/internal/models/v1/form/CheckBoxImplTest.java
@@ -307,35 +307,11 @@ void testGetEnum() {
     }
 
     @Test
-    void testGetEnumNames() {
+    void testGetNullEnumNames() {
         CheckBox checkbox = getCheckBoxUnderTest(PATH_CHECKBOX);
-        RichText richText1 = new RichText() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return false;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "yes";
-            }
-        };
-        RichText richText2 = new RichText() {
-            @Override
-            public @Nullable Boolean isRichText() {
-                return false;
-            }
-
-            @Override
-            public @Nullable String getValue() {
-                return "no";
-            }
-        };
-        RichText[] richText = new RichText[] { richText1, richText2 };
-        for (int i = 0; i < checkbox.getEnumNames().length; i++) {
-            assertEquals(richText[i].getValue(), checkbox.getEnumNames()[i].getValue());
-            assertEquals(richText[i].isRichText(), checkbox.getEnumNames()[i].isRichText());
-        }
+        assertNull(checkbox.getEnumNames());
+        CheckBox noEnumCheckbox = getCheckBoxUnderTest(PATH_CHECKBOX_NOENUM);
+        assertNull(noEnumCheckbox.getEnumNames());
     }
 
     @Test

diff --git a/...est/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java b/...est/java/com/adobe/cq/forms/core/components/internal/models/v1/form/DropDownImplTest.java
@@ -426,7 +426,8 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("0", "Item 1");
         map.put("1", "Item 2");
         map.put("0", "Item 3");
-        assertArrayEquals(map.values().toArray(new String[0]), dropdown.getEnumNames());
+        String[] dropdownValues = Arrays.stream(dropdown.getEnumNames()).map(d -> d.getValue()).toArray(size -> new String[dropdown.getEnumNames().length]);
+        assertArrayEquals(map.values().toArray(new String[0]), dropdownValues);
     }
 
     @Test
@@ -475,6 +476,7 @@ void testInsertionOrderForEnumNames() {
         DropDown dropdown = Utils.getComponentUnderTest(PATH_DROPDOWN_FOR_INSERTION_ORDER, DropDown.class, context);
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
-        assertArrayEquals(set.toArray(new String[0]), dropdown.getEnumNames());
+        String[] dropdownValues = Arrays.stream(dropdown.getEnumNames()).map(d -> d.getValue()).toArray(size -> new String[dropdown.getEnumNames().length]);
+        assertArrayEquals(set.toArray(new String[0]), dropdownValues);
     }
 }
diff --git a/.../java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java b/.../java/com/adobe/cq/forms/core/components/internal/models/v1/form/RadioButtonImplTest.java
@@ -347,7 +347,8 @@ void testGetEnumNamesWithDuplicateEnumValues() {
         map.put("0", "Item 1");
         map.put("1", "Item 2");
         map.put("0", "Item 3");
-        assertArrayEquals(map.values().toArray(new String[0]), radioButton.getEnumNames());
+        String[] radioButtonValues = Arrays.stream(radioButton.getEnumNames()).map(d -> d.getValue()).toArray(size -> new String[radioButton.getEnumNames().length]);
+        assertArrayEquals(map.values().toArray(new String[0]), radioButtonValues);
     }
 
     @Test
@@ -415,6 +416,7 @@ void testInsertionOrderForEnumNames() {
         RadioButton radioButton = getRadioButtonUnderTest(PATH_RADIOBUTTON_FOR_INSERTION_ORDER);
         Set<String> set = new LinkedHashSet<>(Arrays.asList("Zero", "One", "Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine",
             "Ten", "Eleven", "Twelve", "Thirteen", "Fourteen", "Fifteen", "Sixteen", "Seventeen", "Eighteen", "Nineteen", "Twenty"));
-        assertArrayEquals(set.toArray(new String[0]), radioButton.getEnumNames());
+        String[] radioButtonValues = Arrays.stream(radioButton.getEnumNames()).map(d -> d.getValue()).toArray(size -> new String[radioButton.getEnumNames().length]);
+        assertArrayEquals(set.toArray(new String[0]), radioButtonValues);
     }
 }
diff --git a/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json b/bundles/af-core/src/test/resources/form/checkboxgroup/exporter-checkboxgroup-datalayer.json
@@ -9,8 +9,14 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    "Cat Person",
-    "Dog Person"
+    {
+      "richText": false,
+      "value": "Cat Person"
+    },
+    {
+      "richText": false,
+      "value": "Dog Person"
+    }
   ],
   "label": {
     "value": "Personality"

diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown-datalayer.json
@@ -9,8 +9,14 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    "Owl",
-    "Wolf"
+    {
+      "richText": false,
+      "value": "Owl"
+    },
+    {
+      "richText": false,
+      "value": "Wolf"
+    }
   ],
   "label": {
     "value": "Favorite Animal"

diff --git a/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json b/bundles/af-core/src/test/resources/form/dropdown/exporter-dropdown.json
@@ -16,7 +16,7 @@
     {
       "richText": false,
       "value": "o"
-    }s
+    }
   ],
   "enum": ["0", "1", "2"],
   "label": {

diff --git a/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json b/bundles/af-core/src/test/resources/form/radiobutton/exporter-radiobutton-datalayer.json
@@ -9,8 +9,14 @@
   "readOnly": false,
   "enforceEnum": true,
   "enumNames": [
-    "Male",
-    "Female"
+    {
+      "richText": false,
+      "value": "Male"
+    },
+    {
+      "richText": false,
+      "value": "Female"
+    }
   ],
   "label": {
     "value": "Gender"