Merge remote-tracking branch 'origin/develop' into develop

[cdmlib.git] / cdmlib-persistence / src / test / java / eu / etaxonomy / cdm / database / CdmPersistentDataSourceTest.java

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java
index 46be95e8ff0831aeffd7fbfaf719b11ba73a3ae7..b41ccffad0d93ab6f0a7df9b5cb77b13edaa551e 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/database/CdmPersistentDataSourceTest.java
@@ -33,7 +33,9 @@ import org.springframework.beans.PropertyValue;
 import org.springframework.beans.PropertyValues;\r
 import org.springframework.beans.factory.config.BeanDefinition;\r
 \r
-import eu.etaxonomy.cdm.database.CdmPersistentDataSource.DbProperties;\r
+import eu.etaxonomy.cdm.config.CdmPersistentSourceUtils;\r
+import eu.etaxonomy.cdm.config.CdmPersistentXMLSource.CdmSourceProperties;\r
+\r
 \r
 /**\r
  * @author a.mueller\r
@@ -70,7 +72,7 @@ public class CdmPersistentDataSourceTest {
                String dataSourceString = "tmp";\r
                //delete\r
                try {\r
-                       CdmPersistentDataSource.delete(CdmPersistentDataSource.NewInstance(dataSourceString));\r
+                       CdmPersistentSourceUtils.delete(CdmPersistentDataSource.NewInstance(dataSourceString));\r
                } catch (DataSourceNotFoundException e) {\r
                        //;\r
                }\r
@@ -87,7 +89,7 @@ public class CdmPersistentDataSourceTest {
                String dataSourceString = "tmp";\r
                //delete\r
                try {\r
-                       CdmPersistentDataSource.delete(CdmPersistentDataSource.NewInstance(dataSourceString));\r
+                       CdmPersistentSourceUtils.delete(CdmPersistentDataSource.NewInstance(dataSourceString));\r
                } catch (DataSourceNotFoundException e) {\r
                        //;\r
                }\r
@@ -157,7 +159,7 @@ public class CdmPersistentDataSourceTest {
         */\r
        @Test\r
        public void testGetDbProperty() {\r
-               assertEquals("com.mysql.jdbc.Driver", dataSource.getDatasourceProperty(DbProperties.DRIVER_CLASS));\r
+               assertEquals("com.mysql.jdbc.Driver", dataSource.getCdmSourceProperty(CdmSourceProperties.DRIVER_CLASS));\r
        }\r
 \r
        /**\r
@@ -192,7 +194,7 @@ public class CdmPersistentDataSourceTest {
                \r
                Properties properties = (Properties)propValue.getValue();\r
                assertEquals(hbm2dll.toString(), properties.getProperty("hibernate.hbm2ddl.auto"));\r
-               assertEquals(dataSource.getDatabaseType().getHibernateDialect(), properties.getProperty("hibernate.dialect"));\r
+               assertEquals(dataSource.getDatabaseType().getHibernateDialectCanonicalName(), properties.getProperty("hibernate.dialect"));\r
                assertEquals(NoCachingRegionFactory.class.getName(), properties.getProperty("hibernate.cache.region.factory_class"));\r
                assertEquals(String.valueOf(false), properties.getProperty("hibernate.show_sql"));\r
                assertEquals(String.valueOf(false), properties.getProperty("hibernate.format_sql"));\r
@@ -229,7 +231,7 @@ public class CdmPersistentDataSourceTest {
                \r
                Properties properties = (Properties)propValue.getValue();\r
                assertEquals(hbm2dll.toString(), properties.getProperty("hibernate.hbm2ddl.auto"));\r
-               assertEquals(dataSource.getDatabaseType().getHibernateDialect(), properties.getProperty("hibernate.dialect"));\r
+               assertEquals(dataSource.getDatabaseType().getHibernateDialectCanonicalName(), properties.getProperty("hibernate.dialect"));\r
                assertEquals(cacheProviderClass.getName(), properties.getProperty("hibernate.cache.region.factory_class"));\r
                assertEquals(String.valueOf(showSql), properties.getProperty("hibernate.show_sql"));\r
                assertEquals(String.valueOf(formatSql), properties.getProperty("hibernate.format_sql"));\r
@@ -272,13 +274,13 @@ public class CdmPersistentDataSourceTest {
                        fail();\r
                }\r
                assertEquals(databaseType, dataSource.getDatabaseType());\r
-               assertEquals(DatabaseTypeEnum.SqlServer2005.getDriverClassName(), loadedDataSource.getDatasourceProperty(DbProperties.DRIVER_CLASS));\r
-               assertEquals("jdbc:sqlserver://server:1234;databaseName=database;SelectMethod=cursor", loadedDataSource.getDatasourceProperty(DbProperties.URL));\r
-               assertEquals(username, loadedDataSource.getDatasourceProperty(DbProperties.USERNAME));\r
-               assertEquals(password, loadedDataSource.getDatasourceProperty(DbProperties.PASSWORD));\r
+               assertEquals(DatabaseTypeEnum.SqlServer2005.getDriverClassName(), loadedDataSource.getCdmSourceProperty(CdmSourceProperties.DRIVER_CLASS));\r
+               assertEquals("jdbc:sqlserver://server:1234;databaseName=database;SelectMethod=cursor", loadedDataSource.getCdmSourceProperty(CdmSourceProperties.URL));\r
+               assertEquals(username, loadedDataSource.getCdmSourceProperty(CdmSourceProperties.USERNAME));\r
+               assertEquals(password, loadedDataSource.getCdmSourceProperty(CdmSourceProperties.PASSWORD));\r
                //delete\r
                try {\r
-                       CdmPersistentDataSource.delete(CdmPersistentDataSource.NewInstance(dataSourceString));\r
+                       CdmPersistentSourceUtils.delete(CdmPersistentDataSource.NewInstance(dataSourceString));\r
                } catch (DataSourceNotFoundException e) {\r
                        fail();\r
                }\r
@@ -328,7 +330,7 @@ public class CdmPersistentDataSourceTest {
         */\r
        @Test\r
        public void testGetDataSourceInputStream() {\r
-               FileInputStream is = CdmPersistentDataSource.getDataSourceInputStream();\r
+               FileInputStream is = CdmPersistentSourceUtils.getCdmSourceInputStream();\r
                assertNotNull( is);\r
                int firstInput;\r
                try {\r
@@ -346,7 +348,7 @@ public class CdmPersistentDataSourceTest {
        @Ignore\r
        @Test\r
        public void testGetDataSourceOutputStream() {\r
-               FileOutputStream os = CdmPersistentDataSource.getDataSourceOutputStream();\r
+               FileOutputStream os = CdmPersistentSourceUtils.getCdmSourceOutputStream();\r
                assertNotNull(os);\r
        }\r
 \r