diff options
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/model/runtime')
2 files changed, 23 insertions, 5 deletions
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 cb6ccc83..b4956c83 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 @@ -609,7 +609,7 @@ public class FormFieldTest { @Test public void getHtml10Test() throws Exception { List predefinedValues = new ArrayList<>(); - FormField formField = new FormField("test", "fieldDisplayName", "TEXTAREA", "TIMESTAMP_SEC", true, "", + FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_SEC", true, "", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", "selectrangeEndDateSQL", "multiSelectListSize"); formField.setHasPredefinedList(false); @@ -641,7 +641,7 @@ public class FormFieldTest { @Test public void getHtml11Test() throws Exception { List predefinedValues = new ArrayList<>(); - FormField formField = new FormField("test", "fieldDisplayName", "TEXTAREA", "TIMESTAMP_SEC", true, "Test", + FormField formField = new FormField("test", "fieldDisplayName", "TEXT", "TIMESTAMP_SEC", true, "Test", "helpText", predefinedValues, true, "dependsOn", null, null, "selectrangeStartDateSQL", "selectrangeEndDateSQL", "multiSelectListSize"); formField.setHasPredefinedList(false); 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 909fec8c..84ae2fda 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 @@ -39,7 +39,6 @@ package org.onap.portalsdk.analytics.model.runtime; import static org.junit.Assert.assertEquals; -import java.io.IOException; import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.StringWriter; @@ -84,6 +83,7 @@ import org.onap.portalsdk.analytics.system.Globals; import org.onap.portalsdk.analytics.system.fusion.web.RaptorControllerAsync; import org.onap.portalsdk.analytics.util.AppConstants; import org.onap.portalsdk.analytics.util.DataSet; +import org.onap.portalsdk.analytics.util.RemDbInfo; import org.onap.portalsdk.analytics.util.Utils; import org.onap.portalsdk.analytics.util.XSSFilter; import org.onap.portalsdk.analytics.view.ReportData; @@ -121,6 +121,9 @@ public class RaptorControllerAsyncTest { @Mock DataAccessService dataAccessService; + + @Mock + ReportParamValues reportParamValues; @Mock AppConstants appConstants; @@ -170,12 +173,27 @@ public class RaptorControllerAsyncTest { Matchers.any(ReportRuntime.class), Matchers.any(HttpServletRequest.class), Matchers.any(HttpServletResponse.class), Matchers.any(String.class), Matchers.anyInt()); reportRuntime = PowerMockito.mock(ReportRuntime.class); - Mockito.when(reportRuntime.getReportDataSQL("test12", 500, mockedRequest)).thenReturn("test"); - StringWriter sw = new StringWriter(); + Mockito.when(reportRuntime.getReportDataSQL("test12", 500, mockedRequest)).thenReturn("test"); + RemDbInfo remDbInfo = Mockito.mock(RemDbInfo.class); + PowerMockito.whenNew(RemDbInfo.class).withNoArguments().thenReturn(remDbInfo); + Mockito.when(remDbInfo.getDBType(Matchers.anyString())).thenReturn("DAYTONA"); + reportRuntime.setRemDbInfo(remDbInfo); + + CustomReportType customReportType = new CustomReportType(); + customReportType.setReportType("test"); + ReportWrapper reportWrapper = new ReportWrapper(customReportType, "-1", "test", "testId", "test", "test", "1", + "1", true); + + reportWrapper.setRemDbInfo(remDbInfo); + Mockito.when(reportRuntime.generateSubsetSQL(0, 0, "", mockedRequest, false, reportParamValues)).thenReturn(""); + + StringWriter sw = new StringWriter(); PrintWriter writer = new PrintWriter(sw); Mockito.when(mockedResponse.getWriter()).thenReturn(writer); Mockito.when(Globals.getGenerateSubsetSql()).thenReturn("test"); Mockito.when(Globals.getReportSqlOnlyFirstPart()).thenReturn("test"); + + raptorControllerAsync.RaptorSearch(mockedRequest, mockedResponse); } |