(no commit message)

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java
index a12ff76685c578954f59634f7000e3daabfc9f05..6e53f5196147813988187a7d687ff93736ded80c 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestDatabase.java
@@ -5,6 +5,7 @@ package eu.etaxonomy.cdm.test.function;
 import java.util.UUID;\r
 \r
 import org.apache.log4j.Logger;\r
+import org.hibernate.dialect.H2Dialect;\r
 \r
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;\r
 import eu.etaxonomy.cdm.api.service.IDatabaseService;\r
@@ -33,8 +34,8 @@ public class TestDatabase {
        private void test(){\r
                System.out.println("Start TestDatabase");\r
                //testNewDatabaseConnection();\r
-               testFacts();\r
-               //testNewDatasourceClass();\r
+               //testFacts();\r
+               testNewDatasourceClass();\r
        //      testPaddie();\r
                System.out.println("\nEnd TestDatabase");\r
        }\r
@@ -54,12 +55,14 @@ public class TestDatabase {
        \r
        public void testNewDatasourceClass(){\r
                try {\r
-                       String server = "192.168.2.10";\r
-                       String database = "cdm_test_andreasM";\r
-                       String username = "edit";\r
-                       String password = CdmUtils.readInputLine("Password: ");\r
+//                     String server = "192.168.2.10";\r
+//                     String database = "cdm_test_andreasM";\r
+//                     String username = "edit";\r
+//                     String password = CdmUtils.readInputLine("Password: ");\r
                        DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;\r
-                       ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
+\r
+//                     ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
+                       ICdmDataSource datasource = CdmDataSource.NewH2EmbeddedInstance("CDM", "sa", "");\r
                        CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation);\r
                        \r
                        Rank genus = Rank.GENUS();\r
@@ -110,7 +113,7 @@ public class TestDatabase {
                        String database = "cdm_test_andreasM";\r
                        String username = "edit";\r
                        String password = CdmUtils.readInputLine("Password: ");\r
-                       DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE;\r
+                       DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE;\r
                        ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password);\r
                        CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation);\r
                        \r

diff --git a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestTaxonFunction.java b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestTaxonFunction.java
index 8ff75f1b5231303b1ff2a81dfdaa3b03d2374238..419bf472e300a70da51602be1b61afbbc8a41054 100644 (file)
--- a/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestTaxonFunction.java
+++ b/cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/TestTaxonFunction.java
@@ -51,7 +51,7 @@ public class TestTaxonFunction {
                CdmApplicationController cdmApp = getCdmApplicationController("defaultMySql", hbm2dll);\r
                \r
                INonViralNameParser<NonViralName> parser = NonViralNameParserImpl.NewInstance();\r
-               ReferenceBase sec = new Book();\r
+               ReferenceBase sec = Book.NewInstance();\r
                sec.setTitleCache("ConceptRef");\r
                \r
                //root\r

diff --git a/cdmlib-services/src/test/resources/log4j.properties b/cdmlib-services/src/test/resources/log4j.properties
index 2f5592b32f2a1899ea55f353e6a90c1fa2999b02..77f2cc38892b938552c6b0638b306e35c5aba786 100644 (file)
--- a/cdmlib-services/src/test/resources/log4j.properties
+++ b/cdmlib-services/src/test/resources/log4j.properties
@@ -17,7 +17,7 @@ log4j.appender.file.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
 
 ### set log levels - for more verbose logging change 'info' to 'debug' ###
 
-log4j.rootLogger=warn, stdout
+log4j.rootLogger=warn, stdout, file
 
        ### *** CDM *** ###
 
@@ -40,10 +40,10 @@ log4j.logger.org.springframework.core.io.support = info
 
        ### ***HIBERNATE ************ ###
 
-log4j.logger.org.hibernate=warn
+log4j.logger.org.hibernate=info
 
 ### No warnings as thrown by SQLServer
-log4j.logger.org.hibernate.cfg = warn
+###log4j.logger.org.hibernate.cfg = warn
 
 ### No warnings as thrown by SQLServer
 log4j.logger.org.hibernate.util.JDBCExceptionReporter = error