X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ONAP-PAP-REST%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fpolicy%2Fpap%2Fxacml%2Frest%2FPAPRestConfigTest.java;h=dfadf8e819631aa01dfcf3ef02b382c6ce2ba2af;hb=4068da123ee33b532b4b52f15545c76a978f977e;hp=b57c187c75434b517ecad107232a937c3a1346f0;hpb=f74bbc97aefb9c7e550b8e123581f1e4fa78f84d;p=policy%2Fengine.git diff --git a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java index b57c187c7..dfadf8e81 100644 --- a/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java +++ b/ONAP-PAP-REST/src/test/java/org/onap/policy/pap/xacml/rest/PAPRestConfigTest.java @@ -28,46 +28,46 @@ import org.onap.policy.pap.xacml.rest.PAPRestConfig; import org.springframework.orm.hibernate4.HibernateTransactionManager; public class PAPRestConfigTest { - @Test - public void testSetAndGet() { - String testVal = "testVal"; - - PAPRestConfig.setDbDriver(testVal); - assertEquals(PAPRestConfig.getDbDriver(), testVal); - PAPRestConfig.setDbUrl(testVal); - assertEquals(PAPRestConfig.getDbUrl(), testVal); - PAPRestConfig.setDbUserName(testVal); - assertEquals(PAPRestConfig.getDbUserName(), testVal); - PAPRestConfig.setDbPassword(testVal); - assertEquals(PAPRestConfig.getDbPassword(), testVal); - } - - @Test - public void testInit() { - String driver = "org.mariadb.jdbc.Driver"; - String url = "jdbc:mariadb://localhost:3306/onap_sdk?connectTimeout=30000&socketTimeout=60000&log=true&sessionVariables=max_statement_time=30"; - String user = "policy_user"; - String password = "policy_user"; - - PAPRestConfig config = new PAPRestConfig(); - config.init(); - - assertEquals(PAPRestConfig.getDbDriver(), driver); - assertEquals(PAPRestConfig.getDbUrl(), url); - assertEquals(PAPRestConfig.getDbUserName(), user); - assertEquals(PAPRestConfig.getDbPassword(), password); - - // Test hibernate - BasicDataSource source = (BasicDataSource)config.getDataSource(); - assertEquals(source.getDriverClassName(), driver); - assertEquals(source.getUrl(), url); - assertEquals(source.getUsername(), user); - assertEquals(source.getPassword(), password); - - SessionFactory factory = config.getSessionFactory(source); - assertEquals(factory.isClosed(), false); - - HibernateTransactionManager manager = config.getTransactionManager(factory); - assertEquals(manager.getSessionFactory(), factory); - } + @Test + public void testSetAndGet() { + String testVal = "testVal"; + + PAPRestConfig.setDbDriver(testVal); + assertEquals(PAPRestConfig.getDbDriver(), testVal); + PAPRestConfig.setDbUrl(testVal); + assertEquals(PAPRestConfig.getDbUrl(), testVal); + PAPRestConfig.setDbUserName(testVal); + assertEquals(PAPRestConfig.getDbUserName(), testVal); + PAPRestConfig.setDbPassword(testVal); + assertEquals(PAPRestConfig.getDbPassword(), testVal); + } + + @Test + public void testInit() { + String driver = "org.mariadb.jdbc.Driver"; + String url = "jdbc:mariadb://localhost:3306/onap_sdk?connectTimeout=30000&socketTimeout=60000&log=true&sessionVariables=max_statement_time=30"; + String user = "policy_user"; + String password = "policy_user"; + + PAPRestConfig config = new PAPRestConfig(); + config.init(); + + assertEquals(PAPRestConfig.getDbDriver(), driver); + assertEquals(PAPRestConfig.getDbUrl(), url); + assertEquals(PAPRestConfig.getDbUserName(), user); + assertEquals(PAPRestConfig.getDbPassword(), password); + + // Test hibernate + BasicDataSource source = (BasicDataSource)config.getDataSource(); + assertEquals(source.getDriverClassName(), driver); + assertEquals(source.getUrl(), url); + assertEquals(source.getUsername(), user); + assertEquals(source.getPassword(), password); + + SessionFactory factory = config.getSessionFactory(source); + assertEquals(factory.isClosed(), false); + + HibernateTransactionManager manager = config.getTransactionManager(factory); + assertEquals(manager.getSessionFactory(), factory); + } }