summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/epsdk-analytics/src/test/java
diff options
context:
space:
mode:
authormravula <mr257h@att.com>2020-05-20 05:14:48 -0400
committermravula <mr257h@att.com>2020-05-20 10:08:34 -0400
commit8c9c19f430ee91b72955b7cb48d9cf5c48da22ff (patch)
tree60c8075f0fc4ab50359f773fa430619d0d192046 /ecomp-sdk/epsdk-analytics/src/test/java
parentcce0f0aad94690b67024dab191988814ded1fb74 (diff)
enabled analytics test cases and resolved conflicts
Issue-ID: PORTAL-902 Change-Id: Ifff7f9329673ef464b3414e6945da57ba5d1b6bd Change-Id: If40c7e0b4ef4abbe5f1d6b3784a3b57abd20bd81 Signed-off-by: mravula<mr257h@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/test/java')
-rw-r--r--ecomp-sdk/epsdk-analytics/src/test/java/org/onap/portalsdk/analytics/xmlobj/ReportRuntimeTest.java8
1 files changed, 4 insertions, 4 deletions
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);