Fix sonar critical for password

Focused on hard coded passwords. I believe they are only
used for JUnit tests so I moved them into a file for use.
If they still show up on sonar then I will move into a properties
file and/or mark as not going to fix.

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

1 files changed, 20 insertions, 20 deletions

diff --git a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java
index 54b50b0d..68ab42d9 100644
--- a/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java
+++ b/integrity-audit/src/test/java/org/onap/policy/common/ia/test/AuditPeriodTest.java
@@ -80,10 +80,10 @@ public class AuditPeriodTest {
 		IntegrityAudit.setUnitTesting(true);
 		
 		properties = new Properties();
-		properties.put(IntegrityAuditProperties.DB_DRIVER, IntegrityAuditProperties.DEFAULT_DB_DRIVER);
-		properties.put(IntegrityAuditProperties.DB_URL, IntegrityAuditProperties.DEFAULT_DB_URL);
-		properties.put(IntegrityAuditProperties.DB_USER, IntegrityAuditProperties.DEFAULT_DB_USER);
-		properties.put(IntegrityAuditProperties.DB_PWD, IntegrityAuditProperties.DEFAULT_DB_PWD);
+		properties.put(IntegrityAuditProperties.DB_DRIVER, TestUtils.DEFAULT_DB_DRIVER);
+		properties.put(IntegrityAuditProperties.DB_URL, TestUtils.DEFAULT_DB_URL);
+		properties.put(IntegrityAuditProperties.DB_USER, TestUtils.DEFAULT_DB_USER);
+		properties.put(IntegrityAuditProperties.DB_PWD, TestUtils.DEFAULT_DB_PWD);
 		properties.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
 		properties.put(IntegrityAuditProperties.NODE_TYPE, "pdp_xacml");
 				
@@ -277,10 +277,10 @@ public class AuditPeriodTest {
 		 * Start audit for pdp2.
 		 */
 		Properties properties2 = new Properties();
-		properties2.put(IntegrityAuditProperties.DB_DRIVER, IntegrityAuditProperties.DEFAULT_DB_DRIVER);
-		properties2.put(IntegrityAuditProperties.DB_URL, IntegrityAuditProperties.DEFAULT_DB_URL);
-		properties2.put(IntegrityAuditProperties.DB_USER, IntegrityAuditProperties.DEFAULT_DB_USER);
-		properties2.put(IntegrityAuditProperties.DB_PWD, IntegrityAuditProperties.DEFAULT_DB_PWD);
+		properties2.put(IntegrityAuditProperties.DB_DRIVER, TestUtils.DEFAULT_DB_DRIVER);
+		properties2.put(IntegrityAuditProperties.DB_URL, TestUtils.DEFAULT_DB_URL);
+		properties2.put(IntegrityAuditProperties.DB_USER, TestUtils.DEFAULT_DB_USER);
+		properties2.put(IntegrityAuditProperties.DB_PWD, TestUtils.DEFAULT_DB_PWD);
 		properties2.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
 		properties2.put(IntegrityAuditProperties.NODE_TYPE, "pdp_xacml");
 		properties2.put(IntegrityAuditProperties.AUDIT_PERIOD_SECONDS, "300");
@@ -293,10 +293,10 @@ public class AuditPeriodTest {
 		 * Start audit for pdp3.
 		 */
 		Properties properties3 = new Properties();
-		properties3.put(IntegrityAuditProperties.DB_DRIVER, IntegrityAuditProperties.DEFAULT_DB_DRIVER);
-		properties3.put(IntegrityAuditProperties.DB_URL, IntegrityAuditProperties.DEFAULT_DB_URL);
-		properties3.put(IntegrityAuditProperties.DB_USER, IntegrityAuditProperties.DEFAULT_DB_USER);
-		properties3.put(IntegrityAuditProperties.DB_PWD, IntegrityAuditProperties.DEFAULT_DB_PWD);
+		properties3.put(IntegrityAuditProperties.DB_DRIVER, TestUtils.DEFAULT_DB_DRIVER);
+		properties3.put(IntegrityAuditProperties.DB_URL, TestUtils.DEFAULT_DB_URL);
+		properties3.put(IntegrityAuditProperties.DB_USER, TestUtils.DEFAULT_DB_USER);
+		properties3.put(IntegrityAuditProperties.DB_PWD, TestUtils.DEFAULT_DB_PWD);
 		properties3.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
 		properties3.put(IntegrityAuditProperties.NODE_TYPE, "pdp_xacml");
 		properties3.put(IntegrityAuditProperties.AUDIT_PERIOD_SECONDS, "300");
@@ -393,10 +393,10 @@ public class AuditPeriodTest {
 		 * Start audit for pdp2.
 		 */
 		Properties properties2 = new Properties();
-		properties2.put(IntegrityAuditProperties.DB_DRIVER, IntegrityAuditProperties.DEFAULT_DB_DRIVER);
-		properties2.put(IntegrityAuditProperties.DB_URL, IntegrityAuditProperties.DEFAULT_DB_URL);
-		properties2.put(IntegrityAuditProperties.DB_USER, IntegrityAuditProperties.DEFAULT_DB_USER);
-		properties2.put(IntegrityAuditProperties.DB_PWD, IntegrityAuditProperties.DEFAULT_DB_PWD);
+		properties2.put(IntegrityAuditProperties.DB_DRIVER, TestUtils.DEFAULT_DB_DRIVER);
+		properties2.put(IntegrityAuditProperties.DB_URL, TestUtils.DEFAULT_DB_URL);
+		properties2.put(IntegrityAuditProperties.DB_USER, TestUtils.DEFAULT_DB_USER);
+		properties2.put(IntegrityAuditProperties.DB_PWD, TestUtils.DEFAULT_DB_PWD);
 		properties2.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
 		properties2.put(IntegrityAuditProperties.NODE_TYPE, "pdp_xacml");
 		properties2.put(IntegrityAuditProperties.AUDIT_PERIOD_SECONDS, "20");
@@ -409,10 +409,10 @@ public class AuditPeriodTest {
 		 * Start audit for pdp3.
 		 */
 		Properties properties3 = new Properties();
-		properties3.put(IntegrityAuditProperties.DB_DRIVER, IntegrityAuditProperties.DEFAULT_DB_DRIVER);
-		properties3.put(IntegrityAuditProperties.DB_URL, IntegrityAuditProperties.DEFAULT_DB_URL);
-		properties3.put(IntegrityAuditProperties.DB_USER, IntegrityAuditProperties.DEFAULT_DB_USER);
-		properties3.put(IntegrityAuditProperties.DB_PWD, IntegrityAuditProperties.DEFAULT_DB_PWD);
+		properties3.put(IntegrityAuditProperties.DB_DRIVER, TestUtils.DEFAULT_DB_DRIVER);
+		properties3.put(IntegrityAuditProperties.DB_URL, TestUtils.DEFAULT_DB_URL);
+		properties3.put(IntegrityAuditProperties.DB_USER, TestUtils.DEFAULT_DB_USER);
+		properties3.put(IntegrityAuditProperties.DB_PWD, TestUtils.DEFAULT_DB_PWD);
 		properties3.put(IntegrityAuditProperties.SITE_NAME, "SiteA");
 		properties3.put(IntegrityAuditProperties.NODE_TYPE, "pdp_xacml");
 		properties3.put(IntegrityAuditProperties.AUDIT_PERIOD_SECONDS, "20");