diff options
Diffstat (limited to 'datarouter-prov')
7 files changed, 227 insertions, 214 deletions
diff --git a/datarouter-prov/pom.xml b/datarouter-prov/pom.xml index 9ccbb55c..c9c0c2ff 100755 --- a/datarouter-prov/pom.xml +++ b/datarouter-prov/pom.xml @@ -43,6 +43,21 @@ </properties>
<dependencies>
<dependency>
+ <groupId>dom4j</groupId>
+ <artifactId>dom4j</artifactId>
+ <version>${dom4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-codec</groupId>
+ <artifactId>commons-codec</artifactId>
+ <version>${commons-codec.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>${google.guava.version}</version>
+ </dependency>
+ <dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${qos.logback.version}</version>
@@ -67,7 +82,7 @@ <dependency>
<groupId>javax.mail</groupId>
<artifactId>javax.mail-api</artifactId>
- <version>1.5.1</version>
+ <version>${javax.mail-api.version}</version>
</dependency>
<dependency>
<groupId>com.att.eelf</groupId>
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java index 1bbf4460..af8bd6d3 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/DRRouteCLI.java @@ -339,8 +339,11 @@ public class DRRouteCLI { sb.append("Egress Routing Table\n");
sb.append(String.format("%s Node\n", ext("SubID", cw1)));
for (int i = 0; i < subs.length; i++) {
- String node = ert.getString(subs[i]);
- sb.append(String.format("%s %s\n", ext(subs[i], cw1), node));
+ if(ert!=null&&ert.length()!=0) {
+ String node = ert.getString(subs[i]);
+ sb.append(String.format("%s %s\n", ext(subs[i], cw1), node));
+ }
+
}
}
if (tbl.startsWith("al") || tbl.startsWith("ne")) {
diff --git a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java index 8975f161..110c63de 100644 --- a/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java +++ b/datarouter-prov/src/main/java/org/onap/dmaap/datarouter/provisioning/utils/LogfileLoader.java @@ -188,6 +188,7 @@ public class LogfileLoader extends Thread { try {
Thread.sleep(1000L);
} catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
}
idle = false;
} else {
@@ -332,26 +333,25 @@ public class LogfileLoader extends Thread { Connection conn = null;
try {
conn = db.getConnection();
- Statement stmt = conn.createStatement();
- // Build a bitset of all records in the LOG_RECORDS table
- // We need to run this SELECT in stages, because otherwise we run out of memory!
RLEBitSet nbs = new RLEBitSet();
- final long stepsize = 6000000L;
- boolean go_again = true;
- for (long i = 0; go_again; i += stepsize) {
- String sql = String.format("select RECORD_ID from LOG_RECORDS LIMIT %d,%d", i, stepsize);
- try(ResultSet rs = stmt.executeQuery(sql)) {
- go_again = false;
- while (rs.next()) {
- long n = rs.getLong("RECORD_ID");
- nbs.set(n);
- go_again = true;
+ try(Statement stmt = conn.createStatement()) {
+ // Build a bitset of all records in the LOG_RECORDS table
+ // We need to run this SELECT in stages, because otherwise we run out of memory!
+ final long stepsize = 6000000L;
+ boolean go_again = true;
+ for (long i = 0; go_again; i += stepsize) {
+ String sql = String.format("select RECORD_ID from LOG_RECORDS LIMIT %d,%d", i, stepsize);
+ try (ResultSet rs = stmt.executeQuery(sql)) {
+ go_again = false;
+ while (rs.next()) {
+ long n = rs.getLong("RECORD_ID");
+ nbs.set(n);
+ go_again = true;
+ }
}
}
}
- stmt.close();
seq_set = nbs;
-
// Compare with the range for this server
// Determine the next ID for this set of record IDs
RLEBitSet tbs = (RLEBitSet) nbs.clone();
diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/RouteServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/RouteServletTest.java index f1082ba3..226dae04 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/RouteServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/RouteServletTest.java @@ -23,21 +23,21 @@ package org.onap.dmaap.datarouter.provisioning; -import org.apache.commons.lang3.reflect.FieldUtils; -import org.json.JSONObject; +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +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.onap.dmaap.datarouter.provisioning.beans.*; -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 java.util.SortedSet; -import java.util.TreeSet; + import static org.hamcrest.Matchers.notNullValue; import static org.mockito.Matchers.*; import static org.mockito.Mockito.mock; @@ -45,12 +45,10 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @RunWith(PowerMockRunner.class) -@SuppressStaticInitializationFor({"org.onap.dmaap.datarouter.provisioning.beans.IngressRoute", - "org.onap.dmaap.datarouter.provisioning.beans.EgressRoute", - "org.onap.dmaap.datarouter.provisioning.beans.NodeClass", - "org.onap.dmaap.datarouter.provisioning.beans.NetworkRoute"}) -public class RouteServletTest extends DrServletTestBase -{ +public class RouteServletTest { + + private static EntityManagerFactory emf; + private static EntityManager em; private RouteServlet routeServlet; @Mock @@ -59,53 +57,55 @@ public class RouteServletTest 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(); - setPokerToNotCreateTimersWhenDeleteFeedIsCalled(); - setRouteToReturnValid(); routeServlet = new RouteServlet(); } @Test - public void Given_Request_Is_HTTP_DELETE_And_Is_Not_Authorized() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); + public void Given_Request_Is_HTTP_DELETE_And_Is_Not_Authorized_Then_Forbidden_Response_Is_Generated() + throws Exception { + when(request.getRemoteAddr()).thenReturn("stub_addr"); routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @Test - public void Given_Request_Is_HTTP_DELETE_And_Ingress_Route_Does_Not_Exist_In_Path() throws Exception { + public void Given_Request_Is_HTTP_DELETE_And_Ingress_Route_Does_Not_Exist_In_Path_Then_Route_Does_Not_Exist_Is_Returned() + throws Exception { when(request.getPathInfo()).thenReturn("/ingress/3/internal/route/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @Test - public void Given_Request_Is_HTTP_DELETE_And_Ingress_Path_Contains_Invalid_FeedID() throws Exception { + public void Given_Request_Is_HTTP_DELETE_And_Ingress_Path_Contains_Invalid_FeedID_Then_Feed_Not_Found_Is_Returned() + throws Exception { when(request.getPathInfo()).thenReturn("/ingress/feedID/internal/route/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @Test - public void Given_Request_Is_HTTP_DELETE_And_Ingress_Path_Contains_Invalid_Sequence_Number() throws Exception { + public void Given_Request_Is_HTTP_DELETE_And_Ingress_Path_Contains_Invalid_Sequence_Number_Then_Invalid_Sequence_Is_Returned() + throws Exception { when(request.getPathInfo()).thenReturn("/ingress/feedID/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -113,11 +113,6 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_DELETE_And_Ingress_Path_Contains_Invalid_Number_Of_Arguments() throws Exception { when(request.getPathInfo()).thenReturn("/ingress/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -125,11 +120,6 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_DELETE_And_Egress_Route_Does_Not_Exist_In_Path() throws Exception { when(request.getPathInfo()).thenReturn("/egress/3"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -137,11 +127,6 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_DELETE_And_Egress_Path_Contains_Invalid_SubID() throws Exception { when(request.getPathInfo()).thenReturn("/egress/subID"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -149,11 +134,6 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_DELETE_And_Egress_Path_Contains_Invalid_Number_Of_Arguments() throws Exception { when(request.getPathInfo()).thenReturn("/egress/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -161,37 +141,20 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_DELETE_And_Network_Path_Contains_Invalid_Number_Of_Arguments() throws Exception { when(request.getPathInfo()).thenReturn("/network/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @Test - public void Given_Request_Is_HTTP_DELETE_And_Deletable_Is_Null() throws Exception { + public void Given_Request_Is_HTTP_DELETE_And_Deletable_Is_Null_Then_Bad_Url_Is_Returned() throws Exception { when(request.getPathInfo()).thenReturn("/route/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - - @Override - protected boolean doDelete(Deleteable bean) { - return true; - } - }; routeServlet.doDelete(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @Test public void Given_Request_Is_HTTP_DELETE_And_Fails() throws Exception { - when(request.getPathInfo()).thenReturn("/network/subID/route"); - PowerMockito.mockStatic(NodeClass.class); - PowerMockito.when(NodeClass.normalizeNodename(anyString())).thenReturn("stub_val"); + when(request.getPathInfo()).thenReturn("/network/node01/node02"); RouteServlet routeServlet = new RouteServlet() { protected boolean isAuthorizedForInternal(HttpServletRequest req) { return true; @@ -203,12 +166,13 @@ public class RouteServletTest extends DrServletTestBase } }; routeServlet.doDelete(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR), argThat(notNullValue(String.class))); + verify(response) + .sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR), argThat(notNullValue(String.class))); } @Test public void Given_Request_Is_HTTP_GET_And_Is_Not_Authorized() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); + when(request.getRemoteAddr()).thenReturn("stub_addr"); routeServlet.doGet(request, response); verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @@ -216,11 +180,6 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_GET_And_Path_Does_Not_Start_With_Valid_Route() throws Exception { when(request.getPathInfo()).thenReturn("/route/"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doGet(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -229,14 +188,8 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_GET_And_Path_Equals_Ingress_And_Get_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/ingress/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @@ -244,14 +197,8 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_GET_And_Path_Equals_Egress_And_Get_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/egress/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @@ -259,32 +206,21 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_GET_And_Ingress_Path_Equals_Network_And_Get_Succeeds() throws Exception { when(request.getPathInfo()).thenReturn("/network/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); ServletOutputStream outStream = mock(ServletOutputStream.class); when(response.getOutputStream()).thenReturn(outStream); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doGet(request, response); verify(response).setStatus(eq(HttpServletResponse.SC_OK)); } @Test public void Given_Request_Is_HTTP_PUT_And_Is_Not_Authorized() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); + when(request.getRemoteAddr()).thenReturn("stub_addr"); routeServlet.doPut(request, response); verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @Test public void Given_Request_Is_HTTP_PUT_And_Contains_Bad_URL() throws Exception { - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doPut(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -292,55 +228,38 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_POST_And_Is_Not_Authorized() throws Exception { - FieldUtils.writeDeclaredStaticField(BaseServlet.class, "isAddressAuthEnabled", "true", true); + when(request.getRemoteAddr()).thenReturn("stub_addr"); routeServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_FORBIDDEN), argThat(notNullValue(String.class))); } @Test - public void Given_Request_Is_HTTP_POST_And_Ingress_Path_Starts_With_Ingress_And_Contains_Invalid_Arguments() throws Exception { + public void Given_Request_Is_HTTP_POST_And_Ingress_Path_Starts_With_Ingress_And_Contains_Invalid_Arguments() + throws Exception { when(request.getPathInfo()).thenReturn("/ingress/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); when(request.getParameter("feed")).thenReturn("3"); when(request.getParameter("user")).thenReturn(null); when(request.getParameter("subnet")).thenReturn(null); when(request.getParameter("nodepatt")).thenReturn(null); when(request.getParameter("seq")).thenReturn(null); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); } @Test - public void Given_Request_Is_HTTP_POST_And_Path_Starts_With_Egress_And_EgressRoute_Already_Exists() throws Exception { + public void Given_Request_Is_HTTP_POST_And_Path_Starts_With_Egress_And_EgressRoute_Already_Exists() + throws Exception { when(request.getPathInfo()).thenReturn("/egress/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); - when(request.getParameter("sub")).thenReturn("3"); - EgressRoute e = mock(EgressRoute.class); - PowerMockito.when(EgressRoute.getEgressRoute(anyInt())).thenReturn(e); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; + when(request.getParameter("sub")).thenReturn("1"); routeServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); } @Test - public void Given_Request_Is_HTTP_POST_And_Path_Starts_With_Egress_And_Contains_Invalid_Arguments() throws Exception { + public void Given_Request_Is_HTTP_POST_And_Path_Starts_With_Egress_And_Contains_Invalid_Arguments() + throws Exception { when(request.getPathInfo()).thenReturn("/egress/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); when(request.getParameter("sub")).thenReturn("3"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); } @@ -348,12 +267,6 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_POST_And_Path_Starts_With_Network_And_Is_Missing_Arguments() throws Exception { when(request.getPathInfo()).thenReturn("/network/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); } @@ -361,20 +274,9 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_POST_And_Path_Starts_With_Network_And_Route_Already_Exists() throws Exception { when(request.getPathInfo()).thenReturn("/network/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); when(request.getParameter("from")).thenReturn("stub_from"); when(request.getParameter("to")).thenReturn("stub_to"); when(request.getParameter("via")).thenReturn("stub_via"); - PowerMockito.mockStatic(NodeClass.class); - PowerMockito.when(NodeClass.normalizeNodename(anyString())).thenReturn("stub_val"); - SortedSet<NetworkRoute> networkSet = new TreeSet(); - networkSet.add(mock(NetworkRoute.class)); - PowerMockito.when(NetworkRoute.getAllNetworkRoutes()).thenReturn(networkSet); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_BAD_REQUEST), argThat(notNullValue(String.class))); } @@ -382,17 +284,9 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_POST_And_Path_URL_Is_Null() throws Exception { when(request.getPathInfo()).thenReturn("/route/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); when(request.getParameter("from")).thenReturn("stub_from"); when(request.getParameter("to")).thenReturn("stub_to"); when(request.getParameter("via")).thenReturn("stub_via"); - PowerMockito.mockStatic(NodeClass.class); - PowerMockito.when(NodeClass.normalizeNodename(anyString())).thenReturn("stub_val"); - RouteServlet routeServlet = new RouteServlet() { - protected boolean isAuthorizedForInternal(HttpServletRequest req) { - return true; - } - }; routeServlet.doPost(request, response); verify(response).sendError(eq(HttpServletResponse.SC_NOT_FOUND), argThat(notNullValue(String.class))); } @@ -400,12 +294,9 @@ public class RouteServletTest extends DrServletTestBase @Test public void Given_Request_Is_HTTP_POST_And_Fails() throws Exception { when(request.getPathInfo()).thenReturn("/network/"); - when(request.getRemoteAddr()).thenReturn("stub_addr"); - when(request.getParameter("from")).thenReturn("stub_from"); - when(request.getParameter("to")).thenReturn("stub_to"); - when(request.getParameter("via")).thenReturn("stub_via"); - PowerMockito.mockStatic(NodeClass.class); - PowerMockito.when(NodeClass.normalizeNodename(anyString())).thenReturn("stub_val"); + when(request.getParameter("from")).thenReturn("node01"); + when(request.getParameter("to")).thenReturn("node02"); + when(request.getParameter("via")).thenReturn("node03"); RouteServlet routeServlet = new RouteServlet() { protected boolean isAuthorizedForInternal(HttpServletRequest req) { return true; @@ -416,39 +307,9 @@ public class RouteServletTest extends DrServletTestBase return false; } }; - routeServlet.doPost(request, response); - verify(response).sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR), argThat(notNullValue(String.class))); - } - private void setRouteToReturnValid() throws IllegalAccessException { - PowerMockito.mockStatic(IngressRoute.class); - PowerMockito.when(IngressRoute.getIngressRoute(anyInt(), anyString(), anyString())).thenReturn(null); - SortedSet<IngressRoute> ingressSet = new TreeSet(); - IngressRoute ingressRoute = mock(IngressRoute.class); - JSONObject joIngress = mock(JSONObject.class); - when(joIngress.toString()).thenReturn("{}"); - when(ingressRoute.asJSONObject()).thenReturn(joIngress); - ingressSet.add(ingressRoute); - PowerMockito.when(IngressRoute.getAllIngressRoutes()).thenReturn(ingressSet); - - PowerMockito.mockStatic(EgressRoute.class); - PowerMockito.when(EgressRoute.getEgressRoute(anyInt())).thenReturn(null); - SortedSet<EgressRoute> egressSet = new TreeSet(); - EgressRoute egressRoute = mock(EgressRoute.class); - JSONObject joEgress = mock(JSONObject.class); - when(joEgress.toString()).thenReturn("{}"); - when(egressRoute.asJSONObject()).thenReturn(joEgress); - egressSet.add(egressRoute); - PowerMockito.when(EgressRoute.getAllEgressRoutes()).thenReturn(egressSet); - - PowerMockito.mockStatic(NetworkRoute.class); - SortedSet<NetworkRoute> networkSet = new TreeSet(); - PowerMockito.when(NetworkRoute.getAllNetworkRoutes()).thenReturn(networkSet); - - } - - private void setPokerToNotCreateTimersWhenDeleteFeedIsCalled() throws Exception { - Poker poker = mock(Poker.class); - FieldUtils.writeDeclaredStaticField(Poker.class, "poker", poker, true); + routeServlet.doPost(request, response); + verify(response) + .sendError(eq(HttpServletResponse.SC_INTERNAL_SERVER_ERROR), argThat(notNullValue(String.class))); } } diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/beans/FeedTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/beans/FeedTest.java new file mode 100644 index 00000000..907aa93b --- /dev/null +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/beans/FeedTest.java @@ -0,0 +1,117 @@ +/******************************************************************************* + * ============LICENSE_START================================================== + * * org.onap.dmaap + * * =========================================================================== + * * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * * =========================================================================== + * * Licensed under the Apache License, Version 2.0 (the "License"); + * * you may not use this file except in compliance with the License. + * * You may obtain a copy of the License at + * * + * * http://www.apache.org/licenses/LICENSE-2.0 + * * + * * Unless required by applicable law or agreed to in writing, software + * * distributed under the License is distributed on an "AS IS" BASIS, + * * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * * See the License for the specific language governing permissions and + * * limitations under the License. + * * ============LICENSE_END==================================================== + * * + * * ECOMP is a trademark and service mark of AT&T Intellectual Property. + * * + ******************************************************************************/ +package org.onap.dmaap.datarouter.provisioning.beans; + +import org.json.JSONObject; +import org.junit.*; +import org.junit.runner.RunWith; +import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.powermock.modules.junit4.PowerMockRunner; + +import javax.persistence.EntityManager; +import javax.persistence.EntityManagerFactory; +import javax.persistence.Persistence; +import java.io.InvalidObjectException; +import java.sql.SQLException; +import java.util.List; + +@RunWith(PowerMockRunner.class) +public class FeedTest { + private static EntityManagerFactory emf; + private static EntityManager em; + private Feed feed; + 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 { + db = new DB(); + feed = new Feed("Feed1","v0.1", "First Feed for testing", "First Feed for testing"); + feed.setFeedid(1); + feed.setGroupid(1); + feed.setPublisher("pub"); + feed.setDeleted(false); + } + + @Test + public void Given_getFilteredFeedUrlList_With_Name_Then_Method_Returns_Self_Links() { + List<String> list= feed.getFilteredFeedUrlList("name","Feed1"); + Assert.assertEquals("self_link",list.get(0)); + } + + @Test + public void Given_getFilteredFeedUrlList_With_Publ_Then_Method_Returns_Self_Links() { + List<String> list= feed.getFilteredFeedUrlList("publ","pub"); + Assert.assertEquals("self_link",list.get(0)); + } + + @Test + public void Given_getFilteredFeedUrlList_With_Subs_Then_Method_Returns_Self_Links() { + List<String> list= feed.getFilteredFeedUrlList("subs","sub123"); + Assert.assertEquals("self_link",list.get(0)); + } + + @Test + public void Given_doDelete_Succeeds_Then_doInsert_To_Put_Feed_Back_And_Bool_Is_True() throws SQLException, InvalidObjectException { + Boolean bool = feed.doDelete(db.getConnection()); + Assert.assertEquals(true, bool); + JSONObject jo = new JSONObject(); + jo.put("self","self_link"); + jo.put("publish","publish_link"); + jo.put("subscribe","subscribe_link"); + jo.put("log","log_link"); + feed.setLinks(new FeedLinks(jo)); + bool = feed.doInsert(db.getConnection()); + Assert.assertEquals(true, bool); + } + + @Test + public void Validate_ChaneOwnerShip_Returns_True() + { + Boolean bool = feed.changeOwnerShip(); + Assert.assertEquals(true, bool); + } + + @Test + public void Given_Feeds_Are_Equal_Then_Equals_Returns_True() + { + Feed feed2 = feed; + Boolean bool = feed.equals(feed2); + Assert.assertEquals(true, bool); + } +}
\ No newline at end of file diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/beans/GroupTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/beans/GroupTest.java index 91d72af7..b785fdc2 100644 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/beans/GroupTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/beans/GroupTest.java @@ -23,7 +23,9 @@ package org.onap.dmaap.datarouter.provisioning.beans; import org.junit.*; +import org.junit.runner.RunWith; import org.onap.dmaap.datarouter.provisioning.utils.DB; +import org.powermock.modules.junit4.PowerMockRunner; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -32,6 +34,7 @@ import java.util.Collection; import java.util.Date; import java.util.List; +@RunWith(PowerMockRunner.class) public class GroupTest { private static EntityManagerFactory emf; private static EntityManager em; diff --git a/datarouter-prov/src/test/resources/create.sql b/datarouter-prov/src/test/resources/create.sql index 2f9d3d9c..cd87dde0 100755 --- a/datarouter-prov/src/test/resources/create.sql +++ b/datarouter-prov/src/test/resources/create.sql @@ -164,7 +164,7 @@ insert into INGRESS_ROUTES(SEQUENCE, FEEDID , USERID, SUBNET, NODESET) VALUES (2,1,'user',null,2); insert into NODESETS(SETID, NODEID) -VALUES (2,0); +VALUES (2,2); insert into LOG_RECORDS(RECORD_ID,TYPE,EVENT_TIME,PUBLISH_ID,FEEDID,REQURI,METHOD,CONTENT_TYPE,CONTENT_LENGTH,FEED_FILEID,REMOTE_ADDR,USER,STATUS,DELIVERY_SUBID,DELIVERY_FILEID,RESULT,ATTEMPTS,REASON) VALUES(1,'pub',2536159564422,'ID',1,'URL','GET','application/vnd.att-dr.log-list; version=1.0',100,1,'172.0.0.8','user',204,1,1,204,0,'other'); @@ -173,4 +173,18 @@ CREATE ALIAS IF NOT EXISTS `SUBSTRING_INDEX` AS $$ String Function(String one, String two, String three){ return "url"; } -$$;
\ No newline at end of file +$$; + +insert into NETWORK_ROUTES(FROMNODE, TONODE, VIANODE) +VALUES (1, 3, 2); + +insert into NODES(NODEID, NAME) values + (1, 'stub_from.'), + (2, 'stub_via.'), + (3, 'stub_to.'), + (4, 'node01.'), + (5, 'node02.'), + (6, 'node03.') +; +insert into EGRESS_ROUTES(SUBID, NODEID) values (1, 1); + |