Resolve LF license header issue

[policy/engine.git] / ONAP-PAP-REST / src / test / java / org / onap / policy / pap / ia / DbAuditCompareEntriesTest.java

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 6c91411..049f721 100644 (file)
--- 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
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertTrue;
 
 import java.util.Date;
 import java.util.HashMap;
-import java.util.HashSet;
 import java.util.Properties;
+import java.util.Set;
 
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
@@ -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";
@@ -147,7 +150,7 @@ public class DbAuditCompareEntriesTest {
                
                String className = null;
                //There is only one entry IntegrityAuditEntity, but we will check anyway
-               HashSet<String> classNameSet = dbDAO.getPersistenceClassNames();
+               Set<String> classNameSet = dbDAO.getPersistenceClassNames();
                for(String c : classNameSet){
                        if (c.equals("org.onap.policy.common.ia.jpa.IntegrityAuditEntity")){
                                className = c;
@@ -184,7 +187,7 @@ public class DbAuditCompareEntriesTest {
                myEntries.put("pdp1", entry1);
                theirEntries.put("pdp1", entry2);
                                
-               HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+               Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
                
                /*
                 * Assert that there are no mismatches returned
@@ -230,7 +233,7 @@ public class DbAuditCompareEntriesTest {
                 
                
                entry1.setFlag("flag1");
-               entry1.setResoruceNodeName("node1");
+               entry1.setResourceNodeName("node1");
                entry1.setResourceName("resourceName");
                entry1.setTimeStamp(new Date());
                
@@ -243,7 +246,7 @@ public class DbAuditCompareEntriesTest {
                myEntries.put("pdp1", entry1);
                theirEntries.put("pdp1", entry2);
                                
-               HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+               Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
                
                
                // Assert that there are no mismatches returned
@@ -303,7 +306,7 @@ public class DbAuditCompareEntriesTest {
                myEntries.put("pdp1", entry1);
                theirEntries.put("pdp1", entry2);
                                
-               HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+               Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
                
                
                // Assert that there are no mismatches returned
@@ -360,7 +363,7 @@ public class DbAuditCompareEntriesTest {
                myEntries.put("pdp1", entry1);
                theirEntries.put("pdp1", entry2);
                                
-               HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+               Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
                
                
                // Assert that there are no mismatches returned
@@ -417,7 +420,7 @@ public class DbAuditCompareEntriesTest {
                myEntries.put("pdp1", entry1);
                theirEntries.put("pdp1", entry2);
                                
-               HashSet<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
+               Set<Object> result = dbAudit.compareEntries(myEntries, theirEntries);
                
                
                // Assert that there are no mismatches returned