From 7f93b3d2a7444e412d0e2a1ff4a95f82941cdf27 Mon Sep 17 00:00:00 2001 From: econwar Date: Mon, 3 Sep 2018 09:24:00 +0000 Subject: Refactor SubServletTest to use DB Change-Id: Iad4e51a2b65c00722a3e39536fc789511c11ef8a Signed-off-by: Conor Ward Issue-ID: DMAAP-101 --- datarouter-prov/src/test/resources/create.sql | 3 +++ datarouter-prov/src/test/resources/h2Database.properties | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'datarouter-prov/src/test/resources') diff --git a/datarouter-prov/src/test/resources/create.sql b/datarouter-prov/src/test/resources/create.sql index df7647fa..c72c42a1 100755 --- a/datarouter-prov/src/test/resources/create.sql +++ b/datarouter-prov/src/test/resources/create.sql @@ -145,6 +145,9 @@ INSERT INTO PARAMETERS VALUES 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, DELIVERY_USE100, METADATA_ONLY, SUBSCRIBER, SUSPENDED, GROUPID) +VALUES (1, 1, 'https://172.100.0.5:8080', 'user1', 'password1', true, false, 'user1', false, 1); + 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'); diff --git a/datarouter-prov/src/test/resources/h2Database.properties b/datarouter-prov/src/test/resources/h2Database.properties index 3b7f243a..11f13810 100755 --- a/datarouter-prov/src/test/resources/h2Database.properties +++ b/datarouter-prov/src/test/resources/h2Database.properties @@ -24,4 +24,5 @@ # 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.provserver.isaddressauthenabled = true \ No newline at end of file +org.onap.dmaap.datarouter.provserver.isaddressauthenabled = true +org.onap.dmaap.datarouter.provserver.https.relaxation = false \ No newline at end of file -- cgit 1.2.3-korg