From: Pamela Dragosh <pdragosh@research.att.com>
Date: Thu, 14 Sep 2017 21:38:02 +0000 (-0400)
Subject: Update to new location
X-Git-Tag: v1.1.0~74
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=policy%2Fengine.git;a=commitdiff_plain;h=bdbaad66f2a42d4ef9f58a9d7cf3747afb61407a

Update to new location

This is due to the change in policy/common where the value
was moved to a JUnit test for passwords. Please do not submit
until the policy/common commit is submitted:
dd1df5fdcc8fe69f7ae310d9ffb29c2116973bd0

Issue-ID: POLICY-237
Change-Id: I993c23da043c9253f3c3e8b6bc2948377a2fec00
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
---

diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java
index 6c91411c3..f913c181f 100644
--- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java
+++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/ia/DbAuditCompareEntriesTest.java
@@ -61,23 +61,26 @@ public class DbAuditCompareEntriesTest {
 	private String dbPwd;
 	private String siteName;
 	private String nodeType;
+	private static final String DEFAULT_DB_DRIVER = "org.h2.Driver";
+	private static final String DEFAULT_DB_USER = "sa";
+	private static final String DEFAULT_DB_PWD = "";
 	
 	@Before
 	public void setUp() throws Exception {
 		logger.info("setUp: Entering");
 
 		properties = new Properties();
-		properties.put(IntegrityAuditProperties.DB_DRIVER, IntegrityAuditProperties.DEFAULT_DB_DRIVER);
+		properties.put(IntegrityAuditProperties.DB_DRIVER, DbAuditCompareEntriesTest.DEFAULT_DB_DRIVER);
 		properties.put(IntegrityAuditProperties.DB_URL, "jdbc:h2:file:./sql/xacmlTest");
-		properties.put(IntegrityAuditProperties.DB_USER, IntegrityAuditProperties.DEFAULT_DB_USER);
-		properties.put(IntegrityAuditProperties.DB_PWD, IntegrityAuditProperties.DEFAULT_DB_PWD);
+		properties.put(IntegrityAuditProperties.DB_USER, DbAuditCompareEntriesTest.DEFAULT_DB_USER);
+		properties.put(IntegrityAuditProperties.DB_PWD, DbAuditCompareEntriesTest.DEFAULT_DB_PWD);
 		properties.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
 		properties.put(IntegrityAuditProperties.NODE_TYPE, "pap");
 
-		dbDriver = IntegrityAuditProperties.DEFAULT_DB_DRIVER;
+		dbDriver = DbAuditCompareEntriesTest.DEFAULT_DB_DRIVER;
 		dbUrl = "jdbc:h2:file:./sql/xacmlTest";
-		dbUser = IntegrityAuditProperties.DEFAULT_DB_USER;
-		dbPwd = IntegrityAuditProperties.DEFAULT_DB_PWD;
+		dbUser = DbAuditCompareEntriesTest.DEFAULT_DB_USER;
+		dbPwd = DbAuditCompareEntriesTest.DEFAULT_DB_PWD;
 		siteName = "SiteA";
 		nodeType = "pap";
 		persistenceUnit = "testPapPU";