From: Ram Koya <rk541m@att.com>
Date: Fri, 7 Sep 2018 01:14:57 +0000 (+0000)
Subject: Merge "unit test for StastisticsServlet with db"
X-Git-Tag: 1.0.1~6
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=26311ae5220efa4460c03284d0a47b2def420ecb;hp=-c;p=dmaap%2Fdatarouter.git

Merge "unit test for StastisticsServlet with db"
---

26311ae5220efa4460c03284d0a47b2def420ecb
diff --combined datarouter-prov/src/test/resources/create.sql
index 9ae11cb6,fe0a0f88..2f9d3d9c
--- a/datarouter-prov/src/test/resources/create.sql
+++ b/datarouter-prov/src/test/resources/create.sql
@@@ -151,9 -151,6 +151,9 @@@ VALUES (1, 1, 'https://172.100.0.5:8080
  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 FEED_ENDPOINT_IDS(FEEDID, USERID, PASSWORD)
 +VALUES (1, 'USER', 'PASSWORD');
 +
  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');
  
@@@ -164,4 -161,13 +164,13 @@@ insert into INGRESS_ROUTES(SEQUENCE, FE
  VALUES (2,1,'user',null,2);
  
  insert into NODESETS(SETID, NODEID)
- VALUES (2,0);
+ VALUES (2,0);
+ 
+ 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');
+ 
+ CREATE ALIAS IF NOT EXISTS `SUBSTRING_INDEX` AS $$
+     String Function(String one, String two, String three){
+         return "url";
+     }
+ $$;