diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model')
3 files changed, 132 insertions, 62 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntimeTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntimeTest.java index 2dce46c0..ad0cdcb6 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntimeTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/ChartWebRuntimeTest.java @@ -97,13 +97,13 @@ public class ChartWebRuntimeTest { ReportFormFields reportFormFields = new ReportFormFields(rw, mockedRequest); FormField formField = new FormField("test", "fieldDisplayName", "TEXTAREA", "validationType", false, "defaultValue", "helpText", new ArrayList(), true, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); FormField formField1 = new FormField("test", "fieldDisplayName", "TEXTAREA", "validationType", false, "defaultValue", "helpText", new ArrayList(), false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); FormField formField2 = new FormField("test", "fieldDisplayName", "TEXTAREA", "validationType", false, "defaultValue", "helpText", new ArrayList(), false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); reportFormFields.add(formField); reportFormFields.add(formField1); diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/FormFieldTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/FormFieldTest.java index b4956c83..15bb0c66 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/FormFieldTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/FormFieldTest.java @@ -69,7 +69,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "COMBO_BOX", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); HashMap formValues = new HashMap<>(); ReportRuntime rr = PowerMockito.mock(ReportRuntime.class); @@ -82,7 +82,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "COMBO_BOX", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -99,7 +99,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "COMBO_BOX", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -117,7 +117,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "COMBO_BOX", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -136,7 +136,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -155,7 +155,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -174,7 +174,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -193,7 +193,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -213,7 +213,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "TIMESTAMPTEST:test:test1", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); Mockito.when(lookupList.getBaseSQL()).thenReturn("baseSQL"); @@ -247,7 +247,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "HIDDEN", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -268,7 +268,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", "rangeEndDateSQL", - "multiSelectListSize"); + "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -289,7 +289,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "TEXTAREA", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -310,7 +310,7 @@ public class FormFieldTest { FormField formField = new FormField("test", "fieldDisplayName", "LIST_BOX", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -331,7 +331,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -350,7 +350,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "validationType", true, "defaultValue", "helpText", predefinedValues, true, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -372,7 +372,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "validationType", true, "defaultValue", "helpText", predefinedValues, true, "dependsOn", null, null, "rangeStartDateSQL", "rangeEndDateSQL", - "multiSelectListSize"); + "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -396,7 +396,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMPTEST:test", true, "defaultValue", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); IdNameList lookupList = PowerMockito.mock(IdNameList.class); IdNameSql idNameSql = PowerMockito.mock(IdNameSql.class); @@ -424,7 +424,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMPTEST:test:test1", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -455,7 +455,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "DATE", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", "selectrangeEndDateSQL", - "multiSelectListSize"); + "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -486,7 +486,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_HR", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", "selectrangeEndDateSQL", - "multiSelectListSize"); + "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -517,7 +517,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_MIN", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", "selectrangeEndDateSQL", - "multiSelectListSize"); + "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -548,7 +548,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_SEC", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", "selectrangeEndDateSQL", - "multiSelectListSize"); + "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -579,7 +579,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_SEC", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", "selectrangeEndDateSQL", - "multiSelectListSize"); + "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -611,7 +611,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_SEC", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -643,7 +643,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -675,7 +675,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "COMBO_BOX", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -707,7 +707,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "COMBO_BOX", "TIMESTAMP_SEC", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -739,7 +739,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_BOX", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -771,7 +771,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_BOX", "TIMESTAMP_SEC", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -803,7 +803,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "HIDDEN", "TIMESTAMP_SEC", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -835,7 +835,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "RADIO_BTN", "TIMESTAMP_SEC", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -867,7 +867,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "RADIO_BTN", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -899,7 +899,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "CHECK_BOX", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -934,7 +934,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "CHECK_BOX", "TIMESTAMP_SEC", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -969,7 +969,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "TIMESTAMP_SEC", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -1004,7 +1004,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -1039,7 +1039,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "BLANK", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); IdNameList lookupList = PowerMockito.mock(IdNameList.class); @@ -1073,7 +1073,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); PowerMockito.mockStatic(Globals.class); Mockito.when(Globals.getCalendarOutputDateFormat()).thenReturn("test"); @@ -1085,7 +1085,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "INTEGER", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1094,7 +1094,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "POSITIVE_INTEGER", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1103,7 +1103,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "NON_NEGATIVE_INTEGER", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1112,7 +1112,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "FLOAT", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.setHasPredefinedList(false); formField.setFieldDefaultSQL("test"); formField.getValidateJavaScript(); @@ -1123,7 +1123,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "POSITIVE_FLOAT", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1132,7 +1132,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT_WITH_POPUP", "NON_NEGATIVE_FLOAT", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1141,7 +1141,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "NON_NEGATIVE_FLOAT", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1150,7 +1150,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "TEXTAREA", "NON_NEGATIVE_FLOAT", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1159,7 +1159,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "CHECK_BOX", "NON_NEGATIVE_FLOAT", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1168,7 +1168,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "CHECK_BOX", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1177,7 +1177,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1186,7 +1186,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); formField.getValidateJavaScript(); } @@ -1195,7 +1195,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); ReportRuntime rr = PowerMockito.mock(ReportRuntime.class); JavascriptList list = new JavascriptList(); List<JavascriptItemType> javalist = new ArrayList<>(); @@ -1213,7 +1213,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); ReportRuntime rr = PowerMockito.mock(ReportRuntime.class); JavascriptList list = new JavascriptList(); List<JavascriptItemType> javalist = new ArrayList<>(); @@ -1231,7 +1231,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); ReportRuntime rr = PowerMockito.mock(ReportRuntime.class); JavascriptList list = new JavascriptList(); List<JavascriptItemType> javalist = new ArrayList<>(); @@ -1249,7 +1249,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); ReportRuntime rr = PowerMockito.mock(ReportRuntime.class); JavascriptList list = new JavascriptList(); List<JavascriptItemType> javalist = new ArrayList<>(); @@ -1267,7 +1267,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); ReportRuntime rr = PowerMockito.mock(ReportRuntime.class); JavascriptList list = new JavascriptList(); List<JavascriptItemType> javalist = new ArrayList<>(); @@ -1285,7 +1285,7 @@ public class FormFieldTest { List predefinedValues = new ArrayList<>(); FormField formField = new FormField("test", "fieldDisplayName", "LIST_MULTI_SELECT", "NON_NEGATIVE_FLOAT", false, "Test", "helpText", predefinedValues, false, "dependsOn", null, null, "selectrangeStartDateSQL", - "selectrangeEndDateSQL", "multiSelectListSize"); + "selectrangeEndDateSQL", "multiSelectListSize",1); ReportRuntime rr = PowerMockito.mock(ReportRuntime.class); JavascriptList list = new JavascriptList(); List<JavascriptItemType> javalist = new ArrayList<>(); diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java index 35f21026..872df5d3 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime/RaptorControllerAsyncTest.java @@ -351,6 +351,7 @@ public class RaptorControllerAsyncTest { Mockito.when(reportDefinition.getAllColumns()).thenReturn(reportColumnList); Mockito.when(mockedRequest.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION)) .thenReturn(reportDefinition); + Mockito.when(reportDefinition.getReportType()).thenReturn("linear");; ArrayList<ColumnJSON> listJSON = new ArrayList<ColumnJSON>(); ColumnJSON columnJSON = new ColumnJSON(); columnJSON.setId("test"); @@ -361,6 +362,75 @@ public class RaptorControllerAsyncTest { } @Test + public void listColumnsTest1() throws Exception { + List<DataColumnType> reportColumnList = new ArrayList<>(); + DataColumnType dataColumnType = new DataColumnType(); + dataColumnType.setColId("test"); + dataColumnType.setColName("testname"); + dataColumnType.setCrossTabValue("Row headings"); + reportColumnList.add(dataColumnType); + ReportDefinition reportDefinition = PowerMockito.mock(ReportDefinition.class); + reportDefinition.setReportName("test"); + Mockito.when(reportDefinition.getAllColumns()).thenReturn(reportColumnList); + Mockito.when(mockedRequest.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION)) + .thenReturn(reportDefinition); + Mockito.when(reportDefinition.getReportType()).thenReturn("Cross-Tab");; + ArrayList<ColumnJSON> listJSON = new ArrayList<ColumnJSON>(); + ColumnJSON columnJSON = new ColumnJSON(); + columnJSON.setId("test"); + columnJSON.setName("testname"); + listJSON.add(columnJSON); + assertEquals(listJSON.get(0).getId(), + raptorControllerAsync.listColumns(mockedRequest, mockedResponse).get(0).getId()); + } + + @Test + public void listColumnsTest2() throws Exception { + List<DataColumnType> reportColumnList = new ArrayList<>(); + DataColumnType dataColumnType = new DataColumnType(); + dataColumnType.setColId("test"); + dataColumnType.setColName("testname"); + dataColumnType.setCrossTabValue("Column headings"); + reportColumnList.add(dataColumnType); + ReportDefinition reportDefinition = PowerMockito.mock(ReportDefinition.class); + reportDefinition.setReportName("test"); + Mockito.when(reportDefinition.getAllColumns()).thenReturn(reportColumnList); + Mockito.when(mockedRequest.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION)) + .thenReturn(reportDefinition); + Mockito.when(reportDefinition.getReportType()).thenReturn("Cross-Tab");; + ArrayList<ColumnJSON> listJSON = new ArrayList<ColumnJSON>(); + ColumnJSON columnJSON = new ColumnJSON(); + columnJSON.setId("test"); + columnJSON.setName("testname"); + listJSON.add(columnJSON); + assertEquals(listJSON.get(0).getId(), + raptorControllerAsync.listColumns(mockedRequest, mockedResponse).get(0).getId()); + } + + @Test + public void listColumnsTest3() throws Exception { + List<DataColumnType> reportColumnList = new ArrayList<>(); + DataColumnType dataColumnType = new DataColumnType(); + dataColumnType.setColId("test"); + dataColumnType.setColName("testname"); + dataColumnType.setCrossTabValue("Report values"); + reportColumnList.add(dataColumnType); + ReportDefinition reportDefinition = PowerMockito.mock(ReportDefinition.class); + reportDefinition.setReportName("test"); + Mockito.when(reportDefinition.getAllColumns()).thenReturn(reportColumnList); + Mockito.when(mockedRequest.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION)) + .thenReturn(reportDefinition); + Mockito.when(reportDefinition.getReportType()).thenReturn("Cross-Tab");; + ArrayList<ColumnJSON> listJSON = new ArrayList<ColumnJSON>(); + ColumnJSON columnJSON = new ColumnJSON(); + columnJSON.setId("test"); + columnJSON.setName("testname"); + listJSON.add(columnJSON); + assertEquals(listJSON.get(0).getId(), + raptorControllerAsync.listColumns(mockedRequest, mockedResponse).get(0).getId()); + } + + @Test public void list_drilldown_reports() throws Exception { PowerMockito.mockStatic(Globals.class); PowerMockito.mockStatic(DbUtils.class); @@ -663,13 +733,13 @@ public class RaptorControllerAsyncTest { ReportFormFields reportFormFields = new ReportFormFields(rw, mockedRequest); FormField formField = new FormField("test", "fieldDisplayName", "TEXTAREA", "validationType", false, "defaultValue", "helpText", predefinedValues, true, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); FormField formField1 = new FormField("test", "fieldDisplayName", "TEXTAREA", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); FormField formField2 = new FormField("test", "fieldDisplayName", "TEXTAREA", "validationType", false, "defaultValue", "helpText", predefinedValues, false, "dependsOn", null, null, "rangeStartDateSQL", - "rangeEndDateSQL", "multiSelectListSize"); + "rangeEndDateSQL", "multiSelectListSize",1); reportFormFields.add(formField); reportFormFields.add(formField1); |