X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FStatisticsServletTest.java;h=9512ff19af34e11c80c6984e50c4733718c58e2e;hb=HEAD;hp=0a9632eb62d8fa66beebca519d55bf5c5612d90c;hpb=1bb36e52875a835f57652ad64b3cfac0b93bc9a1;p=dmaap%2Fdatarouter.git

diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java
index 0a9632eb..9512ff19 100755
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/StatisticsServletTest.java
@@ -22,33 +22,30 @@
  ******************************************************************************/
 package org.onap.dmaap.datarouter.provisioning;
 
-import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.Matchers.anyInt;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.anyString;
-import static org.mockito.Matchers.argThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.doCallRealMethod;
-import static org.mockito.Mockito.doNothing;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.PrepareForTest;
+import org.powermock.core.classloader.annotations.PowerMockIgnore;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-
 @RunWith(PowerMockRunner.class)
-@PrepareForTest(StatisticsServlet.class)
-public class StatisticsServletTest extends DrServletTestBase {
+@PowerMockIgnore({"com.sun.org.apache.xerces.*", "javax.xml.*", "org.xml.*", "org.w3c.*"})
+public class StatisticsServletTest {
 
   private StatisticsServlet statisticsServlet;
 
@@ -58,9 +55,27 @@ public class StatisticsServletTest extends DrServletTestBase {
   @Mock
   private HttpServletResponse response;
 
+  private static EntityManagerFactory emf;
+  private static EntityManager em;
+
+  @BeforeClass
+  public static void init() {
+    emf = Persistence.createEntityManagerFactory("dr-unit-tests");
+    em = emf.createEntityManager();
+    System.setProperty(
+            "org.onap.dmaap.datarouter.provserver.properties",
+            "src/test/resources/h2Database.properties");
+  }
+
+  @AfterClass
+  public static void tearDownClass() {
+    em.clear();
+    em.close();
+    emf.close();
+  }
+
   @Before
   public void setUp() throws Exception {
-    super.setUp();
     statisticsServlet = new StatisticsServlet();
     buildRequestParameters();
   }
@@ -70,7 +85,7 @@ public class StatisticsServletTest extends DrServletTestBase {
       throws Exception {
     statisticsServlet.doDelete(request, response);
     verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED),
-        argThat(notNullValue(String.class)));
+        anyString());
   }
 
   @Test
@@ -78,7 +93,7 @@ public class StatisticsServletTest extends DrServletTestBase {
       throws Exception {
     statisticsServlet.doPut(request, response);
     verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED),
-        argThat(notNullValue(String.class)));
+        anyString());
   }
 
   @Test
@@ -86,7 +101,7 @@ public class StatisticsServletTest extends DrServletTestBase {
       throws Exception {
     statisticsServlet.doPost(request, response);
     verify(response).sendError(eq(HttpServletResponse.SC_METHOD_NOT_ALLOWED),
-        argThat(notNullValue(String.class)));
+        anyString());
   }
 
   @Test
@@ -95,7 +110,7 @@ public class StatisticsServletTest extends DrServletTestBase {
     when(request.getParameter("type")).thenReturn("get");
     statisticsServlet.doGet(request, response);
     verify(response)
-        .sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class)));
+        .sendError(eq(HttpServletResponse.SC_BAD_REQUEST), anyString());
   }
 
   @Test
@@ -103,29 +118,19 @@ public class StatisticsServletTest extends DrServletTestBase {
       throws Exception {
     ServletOutputStream outStream = mock(ServletOutputStream.class);
     when(response.getOutputStream()).thenReturn(outStream);
-    statisticsServlet = PowerMockito.mock(StatisticsServlet.class);
-    PowerMockito.doReturn(null).when(statisticsServlet, "getRecordsForSQL", anyString());
-    doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject());
-    doCallRealMethod().when(statisticsServlet).doGet(request, response);
-    when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1"));
     statisticsServlet.doGet(request, response);
-    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+    verify(response).setStatus(HttpServletResponse.SC_OK);
   }
 
   @Test
   public void Given_Request_Is_HTTP_GET_With_GroupId_And_FeedId_Parameters_Then_Request_Succeeds()
       throws Exception {
     when(request.getParameter("feedid")).thenReturn("1");
+    when(request.getParameter("statusCode")).thenReturn("500");
     ServletOutputStream outStream = mock(ServletOutputStream.class);
     when(response.getOutputStream()).thenReturn(outStream);
-    statisticsServlet = PowerMockito.mock(StatisticsServlet.class);
-    PowerMockito.doReturn(null).when(statisticsServlet, "getRecordsForSQL", anyString());
-    doNothing().when(statisticsServlet).rsToCSV(anyObject(), anyObject());
-    doCallRealMethod().when(statisticsServlet).doGet(request, response);
-    doCallRealMethod().when(statisticsServlet).queryGeneretor(anyObject());
-    when(statisticsServlet.getFeedIdsByGroupId(anyInt())).thenReturn(new StringBuffer("1"));
     statisticsServlet.doGet(request, response);
-    verify(response).setStatus(eq(HttpServletResponse.SC_OK));
+    verify(response).setStatus(HttpServletResponse.SC_OK);
   }
 
   private void buildRequestParameters() {