X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=datarouter-prov%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fdmaap%2Fdatarouter%2Fprovisioning%2FSubscriptionServletTest.java;h=aede69cf73a1256a163e7b7c7214043807d7c776;hb=58553dd3f01290e5b8acac7cfcb63016d7a037da;hp=fd1e68ef8c845b5e4e6f30efa5edf8f23b502e08;hpb=ee6fa61e2cd7df99891092709765235b6166a041;p=dmaap%2Fdatarouter.git diff --git a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java index fd1e68ef..aede69cf 100755 --- a/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java +++ b/datarouter-prov/src/test/java/org/onap/dmaap/datarouter/provisioning/SubscriptionServletTest.java @@ -22,7 +22,6 @@ ******************************************************************************/ package org.onap.dmaap.datarouter.provisioning; -import ch.qos.logback.classic.Logger; import ch.qos.logback.classic.spi.ILoggingEvent; import ch.qos.logback.core.read.ListAppender; import org.apache.commons.lang3.reflect.FieldUtils; @@ -39,7 +38,6 @@ import org.onap.dmaap.datarouter.provisioning.beans.Subscription; import org.onap.dmaap.datarouter.provisioning.beans.Updateable; import org.onap.dmaap.datarouter.provisioning.utils.DB; import org.powermock.modules.junit4.PowerMockRunner; -import org.slf4j.LoggerFactory; import javax.persistence.EntityManager; import javax.persistence.EntityManagerFactory; @@ -48,15 +46,12 @@ import javax.servlet.ServletInputStream; import javax.servlet.ServletOutputStream; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.File; import java.io.FileNotFoundException; -import java.io.PrintWriter; import java.sql.SQLException; import java.util.HashSet; import java.util.Set; import static org.hamcrest.Matchers.notNullValue; -import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.*; import static org.onap.dmaap.datarouter.provisioning.BaseServlet.BEHALF_HEADER; @@ -283,6 +278,8 @@ public class SubscriptionServletTest extends DrServletTestBase { jo.put("version", "2.0"); jo.put("metadataOnly", true); jo.put("suspend", true); + jo.put("privilegedSubscriber", true); + jo.put("decompress", true); jo.put("delivery", JSObject); jo.put("subscriber", "differentSubscriber"); jo.put("sync", true); @@ -305,7 +302,9 @@ public class SubscriptionServletTest extends DrServletTestBase { jo.put("version", "2.0"); jo.put("metadataOnly", true); jo.put("suspend", true); + jo.put("privilegedSubscriber", true); jo.put("delivery", JSObject); + jo.put("decompress", true); jo.put("sync", true); return jo; } @@ -333,6 +332,8 @@ public class SubscriptionServletTest extends DrServletTestBase { jo.put("version", "2.0"); jo.put("metadataOnly", true); jo.put("suspend", true); + jo.put("privilegedSubscriber", true); + jo.put("decompress", true); jo.put("delivery", JSObject); jo.put("sync", true); jo.put("changeowner", true); @@ -433,6 +434,8 @@ public class SubscriptionServletTest extends DrServletTestBase { jo.put("metadataOnly", true); jo.put("suspend", true); jo.put("delivery", JSObject); + jo.put("privilegedSubscriber", false); + jo.put("decompress", false); jo.put("failed", false); return jo; } @@ -505,6 +508,8 @@ public class SubscriptionServletTest extends DrServletTestBase { subscription.setGroupid(1); subscription.setMetadataOnly(false); subscription.setSuspended(false); + subscription.setPrivilegedSubscriber(false); + subscription.setDecompress(false); subscription.doInsert(db.getConnection()); } @@ -518,6 +523,8 @@ public class SubscriptionServletTest extends DrServletTestBase { subscription.setGroupid(1); subscription.setMetadataOnly(false); subscription.setSuspended(false); + subscription.setPrivilegedSubscriber(false); + subscription.setDecompress(false); subscription.changeOwnerShip(); subscription.doUpdate(db.getConnection()); }