From 3df349d7e86b75b750899ef086aa95b17524e779 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Sat, 28 Jun 2008 21:19:52 +0000 Subject: [PATCH] --- .../cdm/test/function/TestDatabase.java | 19 +++++++++++-------- .../cdm/test/function/TestTaxonFunction.java | 2 +- .../src/test/resources/log4j.properties | 6 +++--- 3 files changed, 15 insertions(+), 12 deletions(-) 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 a12ff76685..6e53f51961 100644 --- 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; import org.apache.log4j.Logger; +import org.hibernate.dialect.H2Dialect; import eu.etaxonomy.cdm.api.application.CdmApplicationController; import eu.etaxonomy.cdm.api.service.IDatabaseService; @@ -33,8 +34,8 @@ public class TestDatabase { private void test(){ System.out.println("Start TestDatabase"); //testNewDatabaseConnection(); - testFacts(); - //testNewDatasourceClass(); + //testFacts(); + testNewDatasourceClass(); // testPaddie(); System.out.println("\nEnd TestDatabase"); } @@ -54,12 +55,14 @@ public class TestDatabase { public void testNewDatasourceClass(){ try { - String server = "192.168.2.10"; - String database = "cdm_test_andreasM"; - String username = "edit"; - String password = CdmUtils.readInputLine("Password: "); +// String server = "192.168.2.10"; +// String database = "cdm_test_andreasM"; +// String username = "edit"; +// String password = CdmUtils.readInputLine("Password: "); DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE; - ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password); + +// ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password); + ICdmDataSource datasource = CdmDataSource.NewH2EmbeddedInstance("CDM", "sa", ""); CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation); Rank genus = Rank.GENUS(); @@ -110,7 +113,7 @@ public class TestDatabase { String database = "cdm_test_andreasM"; String username = "edit"; String password = CdmUtils.readInputLine("Password: "); - DbSchemaValidation dbSchemaValidation = DbSchemaValidation.CREATE; + DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, database, username, password); CdmApplicationController appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation); 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 8ff75f1b52..419bf472e3 100644 --- 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); INonViralNameParser parser = NonViralNameParserImpl.NewInstance(); - ReferenceBase sec = new Book(); + ReferenceBase sec = Book.NewInstance(); sec.setTitleCache("ConceptRef"); //root diff --git a/cdmlib-services/src/test/resources/log4j.properties b/cdmlib-services/src/test/resources/log4j.properties index 2f5592b32f..77f2cc3889 100644 --- 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 -- 2.34.1