From 8c9c19f430ee91b72955b7cb48d9cf5c48da22ff Mon Sep 17 00:00:00 2001 From: mravula Date: Wed, 20 May 2020 05:14:48 -0400 Subject: enabled analytics test cases and resolved conflicts Issue-ID: PORTAL-902 Change-Id: Ifff7f9329673ef464b3414e6945da57ba5d1b6bd Change-Id: If40c7e0b4ef4abbe5f1d6b3784a3b57abd20bd81 Signed-off-by: mravula --- .../org/onap/portalsdk/analytics/xmlobj/ReportRuntimeTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ecomp-sdk/epsdk-analytics/src/test/java') diff --git a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportRuntimeTest.java b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportRuntimeTest.java index 08b992e7..116c1bfa 100644 --- a/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportRuntimeTest.java +++ b/ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportRuntimeTest.java @@ -592,10 +592,10 @@ public class ReportRuntimeTest { Mockito.when(rw.getDBInfo()).thenReturn(""); -// ReportRuntime reportRuntime = new ReportRuntime(); -// ReportRuntime spy = PowerMockito.spy(reportRuntime); -// PowerMockito.doReturn(rd).when(spy, "loadLinearReportData",1,"",1,mockedRequest,false); -// Mockito.when(reportRuntime.generateSubsetSQL(0, 1, "", mockedRequest, true, null)).thenReturn("subsetSql"); + ReportRuntime reportRuntime = new ReportRuntime(); + ReportRuntime spy = PowerMockito.spy(reportRuntime); + PowerMockito.doReturn(rd).when(spy, "loadLinearReportData",1,"",1,mockedRequest,false); + Mockito.when(reportRuntime.generateSubsetSQL(0, 1, "", mockedRequest, true, null)).thenReturn("subsetSql"); rr.loadReportData(1, "userId", 1, mockedRequest, true); -- cgit 1.2.3-korg