Merge "Refactor GroupServletTest to use DB"

diff --combined datarouter-prov/src/test/resources/create.sql
index d2df249,ef55541..df7647f
--- 1/datarouter-prov/src/test/resources/create.sql
--- 2/datarouter-prov/src/test/resources/create.sql
+++ b/datarouter-prov/src/test/resources/create.sql
@@@ -138,7 -138,7 +138,7 @@@ INSERT INTO PARAMETERS VALUE
      ('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')
      ;
  
@@@ -147,15 -147,3 +147,15 @@@ VALUES (1, 'Basic dXNlcjE6cGFzc3dvcmQx'
  
  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);