6 files changed, 145 insertions, 166 deletions

diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/GroupServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/GroupServletTest.java
index fa0caea6..d6f1e6dc 100755
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/GroupServletTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/GroupServletTest.java
@@ -24,20 +24,21 @@ package org.onap.dmaap.datarouter.provisioning;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
 import org.json.JSONObject;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
 import org.onap.dmaap.datarouter.authz.AuthorizationResponse;
 import org.onap.dmaap.datarouter.authz.Authorizer;
-import org.onap.dmaap.datarouter.provisioning.beans.Group;
 import org.onap.dmaap.datarouter.provisioning.beans.Insertable;
 import org.onap.dmaap.datarouter.provisioning.beans.Updateable;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.junit4.PowerMockRunner;
 
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 import javax.servlet.ServletInputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
@@ -46,16 +47,15 @@ import java.util.HashSet;
 import java.util.Set;
 
 import static org.hamcrest.Matchers.notNullValue;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.*;
 import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER;
 
 @RunWith(PowerMockRunner.class)
-@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.provisioning.beans.Group")
-public class GroupServletTest extends DrServletTestBase {
-
+public class GroupServletTest {
+    private static EntityManagerFactory emf;
+    private static EntityManager em;
     private GroupServlet groupServlet;
 
     @Mock
@@ -64,9 +64,24 @@ public class GroupServletTest extends DrServletTestBase {
     @Mock
     private HttpServletResponse response;
 
+    @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();
         groupServlet = new GroupServlet();
         setAuthoriserToReturnRequestIsAuthorized();
         setPokerToNotCreateTimers();
@@ -76,7 +91,6 @@ public class GroupServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_GET_And_Is_Not_Secure_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception {
         when(request.isSecure()).thenReturn(false);
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true);
         groupServlet.doGet(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
     }
@@ -106,7 +120,6 @@ public class GroupServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_PUT_And_Is_Not_Secure_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception {
         when(request.isSecure()).thenReturn(false);
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true);
         groupServlet.doPut(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
     }
@@ -127,7 +140,7 @@ public class GroupServletTest extends DrServletTestBase {
 
     @Test
     public void Given_Request_Is_HTTP_PUT_And_Group_Id_Is_Invalid_Then_Not_Found_Response_Is_Generated() throws Exception {
-        setGroupToReturnInvalidGroupIdSupplied();
+        when(request.getPathInfo()).thenReturn("/3");
         groupServlet.doPut(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
     }
@@ -157,15 +170,6 @@ public class GroupServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_HTTP_PUT_And_Group_Name_Matches_Group_In_Db_Then_Bad_Request_Response_Is_Generated() throws Exception {
-        when(request.getHeader("Content-Type")).thenReturn("application/vnd.att-dr.group; version=1.0");
-        GroupServlet groupServlet = overideGetJSONFromInputToReturnAValidGroup();
-        setGroupToReturnNonNullValueForGetGroupMatching();
-        groupServlet.doPut(request, response);
-        verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class)));
-    }
-
-    @Test
     public void Given_Request_Is_HTTP_PUT_And_PUT_Fails_Then_Internal_Server_Error_Response_Is_Generated() throws Exception {
         when(request.getHeader("Content-Type")).thenReturn("application/vnd.att-dr.group; version=1.0");
         GroupServlet groupServlet = overideGetJSONFromInputToReturnAValidGroupWithFail();
@@ -176,7 +180,7 @@ public class GroupServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_PUT_And_Request_Succeeds() throws Exception {
         when(request.getHeader("Content-Type")).thenReturn("application/vnd.att-dr.group; version=1.0");
-        GroupServlet groupServlet = overideGetJSONFromInputToReturnAValidGroup();
+        GroupServlet groupServlet = overideGetJSONFromInputToReturnGroupInDb();
         ServletOutputStream outStream = mock(ServletOutputStream.class);
         when(response.getOutputStream()).thenReturn(outStream);
         groupServlet.doPut(request, response);
@@ -186,7 +190,6 @@ public class GroupServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_POST_And_Is_Not_Secure_When_HTTPS_Is_Required_Then_Forbidden_Response_Is_Generated() throws Exception {
         when(request.isSecure()).thenReturn(false);
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true);
         groupServlet.doPost(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class)));
     }
@@ -223,6 +226,14 @@ public class GroupServletTest extends DrServletTestBase {
     }
 
     @Test
+    public void Given_Request_Is_HTTP_POST_And_Group_Name_Already_Exists_Then_Bad_Request_Response_Is_Generated() throws Exception {
+        when(request.getHeader("Content-Type")).thenReturn("application/vnd.att-dr.group; version=1.0");
+        GroupServlet groupServlet = overideGetJSONFromInputToReturnGroupInDb();
+        groupServlet.doPost(request, response);
+        verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class)));
+    }
+
+    @Test
     public void Given_Request_Is_HTTP_POST_And_POST_Fails_Then_Internal_Server_Error_Response_Is_Generated() throws Exception {
         when(request.getHeader("Content-Type")).thenReturn("application/vnd.att-dr.group; version=1.0");
         GroupServlet groupServlet = overideGetJSONFromInputToReturnAValidGroupWithFail();
@@ -233,7 +244,7 @@ public class GroupServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_POST_And_Request_Succeeds() throws Exception {
         when(request.getHeader("Content-Type")).thenReturn("application/vnd.att-dr.group; version=1.0");
-        GroupServlet groupServlet = overideGetJSONFromInputToReturnAValidGroup();
+        GroupServlet groupServlet = overideGetJSONFromInputToReturnNewGroupToInsert();
         ServletOutputStream outStream = mock(ServletOutputStream.class);
         when(response.getOutputStream()).thenReturn(outStream);
         groupServlet.doPost(request, response);
@@ -263,7 +274,6 @@ public class GroupServletTest extends DrServletTestBase {
         setUpValidSecurityOnHttpRequest();
         setBehalfHeader("Stub_Value");
         setValidPathInfoInHttpHeader();
-        setGroupToReturnValidGroupIdSupplied();
     }
 
     private void setUpValidSecurityOnHttpRequest() throws Exception {
@@ -279,19 +289,7 @@ public class GroupServletTest extends DrServletTestBase {
     }
 
     private void setValidPathInfoInHttpHeader() {
-        when(request.getPathInfo()).thenReturn("/123");
-    }
-
-    private void setGroupToReturnValidGroupIdSupplied() {
-        PowerMockito.mockStatic(Group.class);
-        Group group = mock(Group.class);
-        PowerMockito.when(Group.getGroupById(anyInt())).thenReturn(group);
-        when(group.asJSONObject()).thenReturn(mock(JSONObject.class));
-    }
-
-    private void setGroupToReturnInvalidGroupIdSupplied() {
-        PowerMockito.mockStatic(Group.class);
-        PowerMockito.when(Group.getGroupById(anyInt())).thenReturn(null);
+        when(request.getPathInfo()).thenReturn("/1");
     }
 
     private GroupServlet overideGetJSONFromInputToReturnAnInvalidGroup(Boolean invalidName) {
@@ -341,34 +339,35 @@ public class GroupServletTest extends DrServletTestBase {
         return groupServlet;
     }
 
-    private GroupServlet overideGetJSONFromInputToReturnAValidGroup() {
+    private GroupServlet overideGetJSONFromInputToReturnGroupInDb() {
         GroupServlet groupServlet = new GroupServlet() {
             protected JSONObject getJSONfromInput(HttpServletRequest req) {
                 JSONObject validGroup = new JSONObject();
-                validGroup.put("name", "groupName");
+                validGroup.put("name", "Group1");
                 validGroup.put("groupid", 2);
-                validGroup.put("description", "Group Description");
-                validGroup.put("authid", "User1");
-                validGroup.put("classification", "class");
-                validGroup.put("members", "stub_members");
+                validGroup.put("description", "Update to the Group");
+                validGroup.put("authid", "Basic dXNlcjE6cGFzc3dvcmQx");
+                validGroup.put("classification", "Class1");
+                validGroup.put("members", "Member1");
                 return validGroup;
             }
-
-            protected boolean doUpdate(Updateable bean) {
-                return true;
-            }
-
-            protected boolean doInsert(Insertable bean) {
-                return true;
-            }
         };
         return groupServlet;
     }
 
-    private void setGroupToReturnNonNullValueForGetGroupMatching() {
-        PowerMockito.mockStatic(Group.class);
-        Group group = mock(Group.class);
-        PowerMockito.when(Group.getGroupById(anyInt())).thenReturn(group);
-        PowerMockito.when(Group.getGroupMatching(Matchers.any(Group.class), anyInt())).thenReturn(group);
+    private GroupServlet overideGetJSONFromInputToReturnNewGroupToInsert() {
+        GroupServlet groupServlet = new GroupServlet() {
+            protected JSONObject getJSONfromInput(HttpServletRequest req) {
+                JSONObject validGroup = new JSONObject();
+                validGroup.put("name", "Group2");
+                validGroup.put("groupid", 2);
+                validGroup.put("description", "Second group to be added");
+                validGroup.put("authid", "Basic dXNlcjE6cGFzc3dvcmQx");
+                validGroup.put("classification", "Class2");
+                validGroup.put("members", "Member2");
+                return validGroup;
+            }
+        };
+        return groupServlet;
     }
 }
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java
index 9a550593..e411bdc0 100755
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/LogServletTest.java
@@ -24,30 +24,33 @@ package org.onap.dmaap.datarouter.provisioning;
 
 
 import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.AfterClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.onap.dmaap.datarouter.provisioning.beans.Subscription;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
 import org.powermock.modules.junit4.PowerMockRunner;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 
 import static org.hamcrest.CoreMatchers.notNullValue;
-import static org.mockito.Matchers.anyInt;
 import static org.mockito.Matchers.argThat;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.powermock.api.mockito.PowerMockito.when;
 
+
 @RunWith(PowerMockRunner.class)
-@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.provisioning.beans.Subscription"})
 public class LogServletTest extends DrServletTestBase {
 
+    private static EntityManagerFactory emf;
+    private static EntityManager em;
     private static LogServlet logServlet;
 
     @Mock
@@ -55,9 +58,24 @@ public class LogServletTest extends DrServletTestBase {
     @Mock
     private HttpServletResponse response;
 
+    @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();
         logServlet = new LogServlet(true);
         setUpValidParameterValuesForMap();
     }
@@ -78,7 +96,7 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_HTTP_GET_And_Has_Bad_Type()
+    public void Given_Request_Is_HTTP_GET_And_Has_Bad_Type_Then_Bad_Request_Response_Is_Generated()
             throws Exception {
         when(request.getParameter("type")).thenReturn("bad_type");
         logServlet.doGet(request, response);
@@ -86,7 +104,7 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_HTTP_GET_And_Has_Bad_PublishID()
+    public void Given_Request_Is_HTTP_GET_And_Has_Bad_PublishID_Then_Bad_Request_Response_Is_Generated()
             throws Exception {
         when(request.getParameter("publishId")).thenReturn("bad_PublishID'");
         logServlet.doGet(request, response);
@@ -94,7 +112,7 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_HTTP_GET_And_Has_Bad_StatusCode()
+    public void Given_Request_Is_HTTP_GET_And_Has_Bad_StatusCode_Then_Bad_Request_Response_Is_Generated()
             throws Exception {
         when(request.getParameter("statusCode")).thenReturn("1'");
         logServlet.doGet(request, response);
@@ -126,23 +144,13 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_HTTP_GET_And_Is_FeedLog()
+    public void Given_Request_Is_HTTP_GET_And_Is_FeedLog_A_STATUS_OK_Response_Is_Generated()
             throws Exception {
         logServlet.doGet(request, response);
         verify(response).setStatus(eq(HttpServletResponse.SC_OK));
     }
 
     @Test
-    public void Given_Request_Is_HTTP_GET_And_Is_Not_FeedLog()
-            throws Exception {
-        LogServlet logServletNotFeedlog = new LogServlet(false);
-        PowerMockito.mockStatic(Subscription.class);
-        PowerMockito.when(Subscription.getSubscriptionById(anyInt())).thenReturn(mock(Subscription.class));
-        logServletNotFeedlog.doGet(request, response);
-        verify(response).setStatus(eq(HttpServletResponse.SC_OK));
-    }
-
-    @Test
     public void Given_Request_Is_HTTP_PUT_And_Is_Not_Allowed_Then_Forbidden_Response_Is_Generated()
             throws Exception {
         logServlet.doPut(request, response);
@@ -157,7 +165,7 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_GetPublishRecordsForFeed_And_Type_Is_Publish()
+    public void Given_Request_Is_GetPublishRecordsForFeed_And_Type_Is_Publish_A_STATUS_OK_Response_Is_Generated()
             throws Exception {
         when(request.getParameter("type")).thenReturn("pub");
         when(request.getParameter("expiryReason")).thenReturn(null);
@@ -166,7 +174,7 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_getDeliveryRecordsForFeed_And_Type_Is_Delivery()
+    public void Given_Request_Is_getDeliveryRecordsForFeed_And_Type_Is_Delivery_A_STATUS_OK_Response_Is_Generated()
             throws Exception {
         when(request.getParameter("type")).thenReturn("del");
         when(request.getParameter("expiryReason")).thenReturn(null);
@@ -175,7 +183,7 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_getExpiryRecordsForFeed_And_Type_Is_Expire()
+    public void Given_Request_Is_getExpiryRecordsForFeed_And_Type_Is_Expire_A_STATUS_OK_Response_Is_Generated()
             throws Exception {
         when(request.getParameter("type")).thenReturn("exp");
         when(request.getParameter("statusCode")).thenReturn(null);
@@ -187,27 +195,23 @@ public class LogServletTest extends DrServletTestBase {
     }
 
     @Test
-    public void Given_Request_Is_getDeliveryRecordsForSubscription_And_Type_Is_Delivery()
+    public void Given_Request_Is_getDeliveryRecordsForSubscription_And_Type_Is_Delivery_A_STATUS_OK_Response_Is_Generated()
             throws Exception {
         LogServlet logServletNotFeedlog = new LogServlet(false);
         when(request.getParameter("type")).thenReturn("del");
         when(request.getParameter("statusCode")).thenReturn(null);
         when(request.getParameter("expiryReason")).thenReturn(null);
-        PowerMockito.mockStatic(Subscription.class);
-        PowerMockito.when(Subscription.getSubscriptionById(anyInt())).thenReturn(mock(Subscription.class));
         logServletNotFeedlog.doGet(request, response);
         verify(response).setStatus(eq(HttpServletResponse.SC_OK));
     }
 
     @Test
-    public void Given_Request_Is_getExpiryRecordsForSubscription_And_Type_Is_Expiry()
+    public void Given_Request_Is_getExpiryRecordsForSubscription_And_Type_Is_Expiry_A_STATUS_OK_Response_Is_Generated()
             throws Exception {
         LogServlet logServletNotFeedlog = new LogServlet(false);
         when(request.getParameter("type")).thenReturn("exp");
         when(request.getParameter("statusCode")).thenReturn(null);
         when(request.getParameter("expiryReason")).thenReturn(null);
-        PowerMockito.mockStatic(Subscription.class);
-        PowerMockito.when(Subscription.getSubscriptionById(anyInt())).thenReturn(mock(Subscription.class));
         logServletNotFeedlog.doGet(request, response);
         verify(response).setStatus(eq(HttpServletResponse.SC_OK));
     }
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java
index 92403ac8..cee09e5c 100755
--- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java
+++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/PublishServletTest.java
@@ -24,58 +24,66 @@
 package org.onap.dmaap.datarouter.provisioning;
 
 import org.apache.commons.lang3.reflect.FieldUtils;
-import org.json.JSONObject;
+import org.junit.AfterClass;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Matchers;
 import org.mockito.Mock;
-import org.onap.dmaap.datarouter.authz.AuthorizationResponse;
-import org.onap.dmaap.datarouter.authz.Authorizer;
-import org.onap.dmaap.datarouter.provisioning.beans.*;
-import org.powermock.api.mockito.PowerMockito;
-import org.powermock.core.classloader.annotations.SuppressStaticInitializationFor;
+import org.onap.dmaap.datarouter.provisioning.utils.DB;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
-import javax.servlet.ServletOutputStream;
+import javax.persistence.EntityManager;
+import javax.persistence.EntityManagerFactory;
+import javax.persistence.Persistence;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+
 
 import static org.hamcrest.Matchers.notNullValue;
 import static org.mockito.Matchers.*;
-import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER;
 
 /**
  * Created by ezcoxem on 21/08/2018.
  */
 
 @RunWith(PowerMockRunner.class)
-@SuppressStaticInitializationFor("org.onap.dmaap.datarouter.provisioning.beans.Feed")
-public class PublishServletTest extends DrServletTestBase {
+public class PublishServletTest {
     private PublishServlet publishServlet;
 
-    private static String START_JSON_STRING = "{";
-    private static String END_JSON_STRING = "}";
-    private static String START_JSON_ARRAY = "[";
-    private static String END_JSON_ARRAY = "]";
-    private static String COMMA = ",";
-
     @Mock
     private HttpServletRequest request;
 
     @Mock
     private HttpServletResponse response;
 
+    private static EntityManagerFactory emf;
+    private static EntityManager em;
+    private DB db;
+
+    @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();
         publishServlet = new PublishServlet();
+        db = new DB();
     }
 
     @Test
@@ -84,12 +92,12 @@ public class PublishServletTest extends DrServletTestBase {
         FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[0], true);
         publishServlet.doDelete(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_SERVICE_UNAVAILABLE), argThat(notNullValue(String.class)));
+        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true);
     }
 
     @Test
     public void Given_Request_Is_HTTP_DELETE_And_Path_Is_Null_Then_Not_Found_Error_Is_Returned()
             throws Exception {
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true);
         publishServlet.doDelete(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
     }
@@ -97,8 +105,8 @@ public class PublishServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_DELETE_And_Ix_Is_Null_Then_Not_Found_Error_Is_Returned()
             throws Exception {
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true);
-        when(request.getPathInfo()).thenReturn("/123/");
+
+        when(request.getPathInfo()).thenReturn("/1/");
         publishServlet.doDelete(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
     }
@@ -106,10 +114,7 @@ public class PublishServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_DELETE_And_Feed_Is_Not_Valid_Then_Not_Found_Error_Is_Returned()
             throws Exception {
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true);
-        when(request.getPathInfo()).thenReturn("/123/fileName.txt");
-        PowerMockito.mockStatic(Feed.class);
-        PowerMockito.when(Feed.isFeedValid(anyInt())).thenReturn(false);
+        when(request.getPathInfo()).thenReturn("/122/fileName.txt");
         publishServlet.doDelete(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
     }
@@ -117,10 +122,7 @@ public class PublishServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_DELETE_And_Feed_Is_Not_A_Number_Then_Not_Found_Error_Is_Returned()
             throws Exception {
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true);
         when(request.getPathInfo()).thenReturn("/abc/fileName.txt");
-        PowerMockito.mockStatic(Feed.class);
-        PowerMockito.when(Feed.isFeedValid(anyInt())).thenReturn(false);
         publishServlet.doDelete(request, response);
         verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class)));
     }
@@ -129,8 +131,8 @@ public class PublishServletTest extends DrServletTestBase {
     @Test
     public void Given_Request_Is_HTTP_DELETE_And_All_Ok_Then_Request_succeeds()
             throws Exception {
-        setConditionsForPositiveSuccessFlow();
         when(request.getHeader(anyString())).thenReturn("Basic dXNlcg==");
+        setConditionsForPositiveSuccessFlow();
         publishServlet.doDelete(request, response);
         verify(response).setStatus(eq(HttpServletResponse.SC_MOVED_PERMANENTLY));
     }
@@ -163,52 +165,10 @@ public class PublishServletTest extends DrServletTestBase {
     }
 
     private void setConditionsForPositiveSuccessFlow() throws Exception {
-        FieldUtils.writeDeclaredStaticField(BaseServlet.class, "nodes", new String[1], true);
-        FieldUtils.writeDeclaredField(publishServlet, "next_node", 0, true);
         FieldUtils.writeDeclaredField(publishServlet, "provstring", "", true);
-        FieldUtils.writeDeclaredField(publishServlet, "irt", new ArrayList<IngressRoute>(), true);
-        FieldUtils.writeDeclaredStaticField(NodeClass.class, "map", new HashMap<String,String>(), true);
-        when(request.getPathInfo()).thenReturn("/123/fileName.txt");
-        PowerMockito.mockStatic(Feed.class);
-        PowerMockito.when(Feed.isFeedValid(anyInt())).thenReturn(true);
-        setPokerToNotCreateTimersWhenDeleteFeedIsCalled();
+        when(request.getPathInfo()).thenReturn("/1/fileName.txt");
     }
 
-    private void setPokerToNotCreateTimersWhenDeleteFeedIsCalled() throws Exception {
-        Poker poker = mock(Poker.class);
-        FieldUtils.writeDeclaredStaticField(Poker.class, "poker", poker, true);
-        when(poker.getProvisioningString()).thenReturn(buildProvisioningString());
-    }
-
-
-    private String buildProvisioningString(){
-        StringBuffer provisionString = new StringBuffer();
-        provisionString.append(START_JSON_STRING);
-        provisionString.append("'ingress':");
-        provisionString.append(START_JSON_ARRAY);
-        provisionString.append(buildIngressRoute());
-        provisionString.append(END_JSON_ARRAY);
-        provisionString.append(END_JSON_STRING);
-        return provisionString.toString();
-    }
-
-    private StringBuffer buildIngressRoute(){
-        StringBuffer provisionString = new StringBuffer();
-        provisionString.append(START_JSON_STRING);
-        provisionString.append("'seq':1");
-        provisionString.append(COMMA);
-        provisionString.append("'feedid':123");
-        provisionString.append(COMMA);
-        provisionString.append("'user':'user'");
-        provisionString.append(COMMA);
-        provisionString.append("'subnet':'127.0.0.1'");
-        provisionString.append(COMMA);
-        provisionString.append("'nodelist':-1");
-        provisionString.append(COMMA);
-        provisionString.append("'node':['1','2']");
-        provisionString.append(END_JSON_STRING);
-        return provisionString;
-    }
 
 
 }
diff --git a/datarouter-prov/src/test/resources/META-INF/persistence.xml b/datarouter-prov/src/test/resources/META-INF/persistence.xml
index 6b42f8a9..83813e23 100755
--- a/datarouter-prov/src/test/resources/META-INF/persistence.xml
+++ b/datarouter-prov/src/test/resources/META-INF/persistence.xml
@@ -18,4 +18,4 @@
 
         </properties>
     </persistence-unit>
-</persistence>
\ No newline at end of file
+</persistence>
diff --git a/datarouter-prov/src/test/resources/create.sql b/datarouter-prov/src/test/resources/create.sql
index 6e6af1d4..df7647fa 100755
--- a/datarouter-prov/src/test/resources/create.sql
+++ b/datarouter-prov/src/test/resources/create.sql
@@ -138,9 +138,24 @@ INSERT INTO PARAMETERS VALUES
     ('PROV_MAXFEED_COUNT',  '10000'),
     ('PROV_MAXSUB_COUNT',   '100000'),
     ('PROV_REQUIRE_CERT', 'false'),
-    ('PROV_REQUIRE_SECURE', 'false'),
+    ('PROV_REQUIRE_SECURE', 'true'),
     ('_INT_VALUES', 'LOGROLL_INTERVAL|PROV_MAXFEED_COUNT|PROV_MAXSUB_COUNT|DELIVERY_INIT_RETRY_INTERVAL|DELIVERY_MAX_RETRY_INTERVAL|DELIVERY_RETRY_RATIO|DELIVERY_MAX_AGE')
     ;
 
 INSERT INTO GROUPS(GROUPID, AUTHID, NAME, DESCRIPTION, CLASSIFICATION, MEMBERS)
 VALUES (1, 'Basic dXNlcjE6cGFzc3dvcmQx', 'Group1', 'First Group for testing', 'Class1', 'Member1');
+
+INSERT INTO SUBSCRIPTIONS(SUBID, FEEDID, DELIVERY_URL, DELIVERY_USER, DELIVERY_PASSWORD, SUBSCRIBER, SELF_LINK, LOG_LINK)
+VALUES (23, 1, 'http://delivery_url', 'user1', 'somepassword', 'sub123', 'selflink', 'loglink');
+
+INSERT INTO FEEDS(FEEDID, GROUPID, NAME, VERSION, DESCRIPTION, BUSINESS_DESCRIPTION, AUTH_CLASS, PUBLISHER, SELF_LINK, PUBLISH_LINK, SUBSCRIBE_LINK, LOG_LINK)
+VALUES (1, 1,'Feed1','v0.1', 'First Feed for testing', 'First Feed for testing', 'auth_class', 'pub','self_link','publish_link','subscribe_link','log_link');
+
+insert into INGRESS_ROUTES(SEQUENCE, FEEDID , USERID, SUBNET, NODESET)
+VALUES (1,1,'user',null,2);
+
+insert into INGRESS_ROUTES(SEQUENCE, FEEDID , USERID, SUBNET, NODESET)
+VALUES (2,1,'user',null,2);
+
+insert into NODESETS(SETID, NODEID)
+VALUES (2,0);
\ No newline at end of file
diff --git a/datarouter-prov/src/test/resources/h2Database.properties b/datarouter-prov/src/test/resources/h2Database.properties
index 5bc20ed4..3b7f243a 100755
--- a/datarouter-prov/src/test/resources/h2Database.properties
+++ b/datarouter-prov/src/test/resources/h2Database.properties
@@ -22,5 +22,6 @@
 #-------------------------------------------------------------------------------
 
 # Database access
-org.onap.dmaap.datarouter.db.driver   = org.h2.Driver
-org.onap.dmaap.datarouter.db.url      = jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
+org.onap.dmaap.datarouter.db.driver                        = org.h2.Driver
+org.onap.dmaap.datarouter.db.url                           = jdbc:h2:mem:test;DB_CLOSE_DELAY=-1
+org.onap.dmaap.datarouter.provserver.isaddressauthenabled  = true
\ No newline at end of file