Raptor backend java API Code(Analytics), UI Code(Overlay) and pages

component in os project

Issue-ID: PORTAL-902
Change-Id: Id297d9493a77e6816ed0f2a82c15b2eaa1e57a72
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>

1 files changed, 12 insertions, 10 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportDefinitionTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportDefinitionTest.java
index aca3eb29..1a1bf0e6 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportDefinitionTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportDefinitionTest.java
@@ -37,13 +37,14 @@
  */
 package org.onap.portalsdk.analytics.xmlobj;
 
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 import java.sql.Connection;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Vector;
-import java.util.concurrent.Semaphore;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -53,12 +54,10 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Matchers;
-import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalsdk.analytics.controller.WizardSequence;
 import org.onap.portalsdk.analytics.error.RaptorException;
-import org.onap.portalsdk.analytics.error.ReportSQLException;
 import org.onap.portalsdk.analytics.error.UserAccessException;
 import org.onap.portalsdk.analytics.error.ValidationException;
 import org.onap.portalsdk.analytics.model.DataCache;
@@ -73,13 +72,8 @@ import org.onap.portalsdk.analytics.system.DbUtils;
 import org.onap.portalsdk.analytics.system.Globals;
 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.xmlobj.CustomReportType;
-import org.onap.portalsdk.analytics.xmlobj.DataColumnList;
-import org.onap.portalsdk.analytics.xmlobj.DataColumnType;
-import org.onap.portalsdk.analytics.xmlobj.DataSourceList;
-import org.onap.portalsdk.analytics.xmlobj.DataSourceType;
-import org.onap.portalsdk.analytics.xmlobj.FormFieldList;
 import org.powermock.api.mockito.PowerMockito;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
@@ -2139,12 +2133,20 @@ public class ReportDefinitionTest {
 	public void parseReportSQL2Test() throws Exception {
 		ReportDefinition reportDefinition = mockRdf();
 		reportDefinition.getCustomReport().setDbInfo("test");
+		RemDbInfo rdemo = Mockito.mock(RemDbInfo.class);
+		PowerMockito.whenNew(RemDbInfo.class).withNoArguments().thenReturn(rdemo);
+		Mockito.when(rdemo.getDBType(Matchers.anyString())).thenReturn("DAYTONA");
+		reportDefinition.setRemDbInfo(rdemo);
 		reportDefinition.parseReportSQL("select from distinct");
 	}
 
 	@Test
 	public void parseReportSQL3Test() throws Exception {
 		ReportDefinition reportDefinition = mockRdf();
+		RemDbInfo rdemo = Mockito.mock(RemDbInfo.class);
+		PowerMockito.whenNew(RemDbInfo.class).withNoArguments().thenReturn(rdemo);
+		Mockito.when(rdemo.getDBType(Matchers.anyString())).thenReturn("DAYTONA");
+		reportDefinition.setRemDbInfo(rdemo);
 		reportDefinition.getCustomReport().setDbInfo("test");
 		reportDefinition.parseReportSQL("select distinct roleID from");
 	}