Reporting Enhancements

Issue-ID: PORTAL-314
Remote DB logic is added to enhance RAPTOR to pull content from different DB as well as Different DB TYPE

Change-Id: I5cb343cd9daa912d78e7a8e409d28c8845d9afb4
Signed-off-by: RAMALINGAM, SUNDAR (sr7234) <sr7234@us.att.com>

1 files changed, 8 insertions, 8 deletions

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 c5010c1a..909fec8c 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
@@ -353,7 +353,7 @@ public class RaptorControllerAsyncTest {
 		Mockito.when(rsmd.getColumnCount()).thenReturn(1);
 		Mockito.when(rs.getMetaData()).thenReturn(rsmd);
 		DataSet datset = PowerMockito.mock(DataSet.class);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		Mockito.when(Globals.getNewScheduleData()).thenReturn("test");
 		CustomReportType customReportType = new CustomReportType();
@@ -400,7 +400,7 @@ public class RaptorControllerAsyncTest {
 		Mockito.when(rs.getMetaData()).thenReturn(rsmd);
 		DataSet datset = PowerMockito.mock(DataSet.class);
 		// datset = new DataSet(rs);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		Mockito.when(Globals.getNewScheduleData()).thenReturn("test");
 		CustomReportType customReportType = new CustomReportType();
@@ -448,7 +448,7 @@ public class RaptorControllerAsyncTest {
 		Mockito.when(rs.getMetaData()).thenReturn(rsmd);
 		DataSet datset = PowerMockito.mock(DataSet.class);
 		// datset = new DataSet(rs);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		Mockito.when(Globals.getNewScheduleData()).thenReturn("test");
 		CustomReportType customReportType = new CustomReportType();
@@ -480,7 +480,7 @@ public class RaptorControllerAsyncTest {
 		Mockito.when(rs.getMetaData()).thenReturn(rsmd);
 		DataSet datset = PowerMockito.mock(DataSet.class);
 		// datset = new DataSet(rs);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		Mockito.when(Globals.getNewScheduleData()).thenReturn("test");
 		CustomReportType customReportType = new CustomReportType();
@@ -515,7 +515,7 @@ public class RaptorControllerAsyncTest {
 		Mockito.when(rs.getMetaData()).thenReturn(rsmd);
 		DataSet datset = PowerMockito.mock(DataSet.class);
 		// datset = new DataSet(rs);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		Mockito.when(Globals.getNewScheduleData()).thenReturn("test");
 		CustomReportType customReportType = new CustomReportType();
@@ -546,7 +546,7 @@ public class RaptorControllerAsyncTest {
 		Mockito.when(rsmd.getColumnCount()).thenReturn(1);
 		Mockito.when(rs.getMetaData()).thenReturn(rsmd);
 		DataSet datset = PowerMockito.mock(DataSet.class);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		Mockito.when(Globals.getNewScheduleData()).thenReturn("test");
 		CustomReportType customReportType = new CustomReportType();
@@ -577,7 +577,7 @@ public class RaptorControllerAsyncTest {
 		Mockito.when(rsmd.getColumnCount()).thenReturn(1);
 		Mockito.when(rs.getMetaData()).thenReturn(rsmd);
 		DataSet datset = PowerMockito.mock(DataSet.class);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		Mockito.when(Globals.getNewScheduleData()).thenReturn("test");
 		CustomReportType customReportType = new CustomReportType();
@@ -685,7 +685,7 @@ public class RaptorControllerAsyncTest {
 		PowerMockito.mockStatic(DbUtils.class);
 		Mockito.when(Globals.getReportUserAccess()).thenReturn("test");
 		DataSet datset = PowerMockito.mock(DataSet.class);
-		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyInt())).thenReturn(null);
+		Mockito.when(datset.getString(Matchers.anyInt(), Matchers.anyString())).thenReturn(null);
 		Mockito.when(DbUtils.executeQuery(Matchers.anyString())).thenReturn(datset);
 		CustomReportType customReportType = new CustomReportType();
 		customReportType.setReportType("test");