1 files changed, 11 insertions, 4 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ChartJSONHelperTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ChartJSONHelperTest.java
index f69c5dae..8901e73b 100644
--- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ChartJSONHelperTest.java
+++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ChartJSONHelperTest.java
@@ -70,6 +70,7 @@ import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.MockitoAnnotations;
 import org.onap.portalsdk.analytics.error.RaptorException;
+import org.onap.portalsdk.analytics.model.ReportHandler;
 import org.onap.portalsdk.analytics.model.ReportLoader;
 import org.onap.portalsdk.analytics.model.base.ReportWrapper;
 import org.onap.portalsdk.analytics.model.runtime.ChartJSONHelper;
@@ -89,7 +90,7 @@ import org.powermock.modules.junit4.PowerMockRunner;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
 @RunWith(PowerMockRunner.class)
-@PrepareForTest({UserUtils.class,AppUtils.class, DbUtils.class, ReportRuntime.class, Globals.class, UserUtils.class,ReportLoader.class})
+@PrepareForTest({UserUtils.class,AppUtils.class, DbUtils.class, ReportRuntime.class, Globals.class, UserUtils.class,ReportLoader.class,ChartJSONHelper.class})
 public class ChartJSONHelperTest {
     
 	@InjectMocks
@@ -116,7 +117,7 @@ public class ChartJSONHelperTest {
 	HttpServletResponse mockedResponse = mockitoTestSuite.getMockedResponse();
 
 	
-	@Test(expected = java.lang.ClassCastException.class)
+	@Test(expected = java.lang.NullPointerException.class)
 	public void generateJSONTest() throws RaptorException, Exception
 	{
 		EcompRole role = new EcompRole();
@@ -142,6 +143,8 @@ public class ChartJSONHelperTest {
 		rr.setChartType("BarChart3D");
 		rr.setMultiSeries(true);
 		rr.setDashboardType(true);
+		rr.setLegendLabelAngle("standard");
+		rr.setWholeSQL("SELECT * FROM test");
 		Mockito.when(mockedRequest.getSession().getAttribute("report_runtime")).thenReturn(rr);
 		
 		PowerMockito.mockStatic(Globals.class);
@@ -165,7 +168,7 @@ public class ChartJSONHelperTest {
 		Mockito.when(rs.next()).thenReturn(true);
 		Mockito.when(clob.getAsciiStream()).thenReturn(in);
 		Mockito.when(in.read(Matchers.any())).thenReturn(1);
-//		 PowerMockito.mockStatic(ReportRuntime.class);
+		 PowerMockito.mockStatic(ReportRuntime.class);
 	      Mockito.when(ReportRuntime.unmarshal(str, "1", mockedRequest)).thenReturn(rr);
 			Mockito.when(AppUtils.getRequestNvlValue(mockedRequest, "pdfAttachmentKey")).thenReturn("test");
 			Mockito.when(AppUtils.nvl(rr.getLegendLabelAngle())).thenReturn("standard");
@@ -175,7 +178,10 @@ public class ChartJSONHelperTest {
 			Mockito.when(AppUtils.nvl("test")).thenReturn("test|");
 			Mockito.when(AppUtils.getRequestValue(mockedRequest, "c_dashboard")).thenReturn("1");
 			Mockito.when(ReportLoader.isDashboardType("-1")).thenReturn(false);
-		assertEquals(chartJSONHelper.generateJSON("1", mockedRequest, false).getClass(), String.class);
+			ReportHandler reportHandler = Mockito.mock(ReportHandler.class);
+			PowerMockito.whenNew(ReportHandler.class).withNoArguments().thenReturn(reportHandler);
+			Mockito.when(reportHandler.loadReportRuntime(Mockito.any(HttpServletRequest.class), Mockito.anyString(), Mockito.anyBoolean(), Mockito.anyInt())).thenReturn(rr);
+			assertEquals(chartJSONHelper.generateJSON("1", mockedRequest, true).getClass(), String.class);
 	}
 	
 	
@@ -368,6 +374,7 @@ public class ChartJSONHelperTest {
 		dataColumnType.setColId("1");
 		dataColumnType.setTableId("1");
 		dataColumnType.setColType("DATE");
+		dataColumnType.setColOnChart("LEGEND");
 		dataColumnTypeList.add(dataColumnType);
 		DataColumnList dataColumnList = new DataColumnList();
 		dataColumnList.dataColumn = dataColumnTypeList;