minor
authorAndreas Müller <a.mueller@bgbm.org>
Thu, 11 Dec 2014 12:44:01 +0000 (12:44 +0000)
committerAndreas Müller <a.mueller@bgbm.org>
Thu, 11 Dec 2014 12:44:01 +0000 (12:44 +0000)
cdmlib-services/src/test/java/eu/etaxonomy/cdm/test/function/Datasource.java

index a8171950db23ddbed3316ca9b5076174b7ce5e2c..7240a2ee71146e02ea6e2ee30019efb19e9c05a3 100644 (file)
@@ -62,7 +62,7 @@ public class Datasource {
        \r
        private void testNewConfigControler(){\r
                List<CdmPersistentDataSource> lsDataSources = CdmPersistentDataSource.getAllDataSources();\r
-               DbSchemaValidation schema = DbSchemaValidation.CREATE;\r
+               DbSchemaValidation schema = DbSchemaValidation.VALIDATE;\r
                System.out.println(lsDataSources);\r
                ICdmDataSource dataSource;\r
                \r
@@ -71,7 +71,7 @@ public class Datasource {
                \r
                String server = "localhost";\r
                String database = (schema == DbSchemaValidation.VALIDATE  ? "cdm34" : "cdm341");\r
-//             database = "test";\r
+               database = "cdmTest";\r
                String username = "edit";\r
                dataSource = CdmDataSource.NewMySqlInstance(server, database, username, AccountStore.readOrStorePassword(server, database, username, null));\r
 \r
@@ -100,10 +100,12 @@ public class Datasource {
 ////           dataSource = CdmDataSource.NewSqlServer2005Instance(server, database, port, username, AccountStore.readOrStorePassword(server, database, username, null));\r
 //             \r
                //H2\r
+//             String path = "C:\\Users\\a.mueller\\eclipse\\svn\\cdmlib-trunk\\cdmlib-remote-webapp\\src\\test\\resources\\h2";\r
+       String path = "C:\\Users\\a.mueller\\.cdmLibrary\\writableResources\\h2\\LocalH2_test34";\r
                username = "sa";\r
-       dataSource = CdmDataSource.NewH2EmbeddedInstance("cdm", username, "", "C:\\Users\\a.mueller\\.cdmLibrary\\writableResources\\h2\\LocalH2_test34",   NomenclaturalCode.ICNAFP);\r
+       dataSource = CdmDataSource.NewH2EmbeddedInstance("cdmTest", username, "", path,   NomenclaturalCode.ICNAFP);\r
 //     dataSource = CdmDataSource.NewH2EmbeddedInstance(database, username, "sa", NomenclaturalCode.ICNAFP);\r
-\r
+       \r
                try {\r
                        CdmUpdater updater = new CdmUpdater();\r
                        if (schema == DbSchemaValidation.VALIDATE){\r