Revision c9b48c79
Added by Cherian Mathew about 10 years ago
| cdmlib-io/src/test/java/eu/etaxonomy/cdm/test/integration/TestCdmDbComparator.java | ||
|---|---|---|
| 16 | 16 |
import org.apache.log4j.Logger; |
| 17 | 17 |
import org.springframework.transaction.TransactionStatus; |
| 18 | 18 |
|
| 19 |
import eu.etaxonomy.cdm.api.application.CdmApplicationController; |
|
| 19 |
import eu.etaxonomy.cdm.api.application.CdmApplicationDefaultController;
|
|
| 20 | 20 |
import eu.etaxonomy.cdm.common.AccountStore; |
| 21 | 21 |
import eu.etaxonomy.cdm.database.CdmDataSource; |
| 22 | 22 |
import eu.etaxonomy.cdm.database.DbSchemaValidation; |
| ... | ... | |
| 243 | 243 |
|
| 244 | 244 |
logger.info("Loading data from DB " + dbname);
|
| 245 | 245 |
|
| 246 |
CdmApplicationController appCtr = null; |
|
| 246 |
CdmApplicationDefaultController appCtr = null;
|
|
| 247 | 247 |
|
| 248 | 248 |
|
| 249 | 249 |
String password = AccountStore.readOrStorePassword(dbname, server, username, null); |
| 250 | 250 |
|
| 251 | 251 |
DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; |
| 252 | 252 |
ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password); |
| 253 |
appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true); |
|
| 253 |
appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation, true);
|
|
| 254 | 254 |
|
| 255 | 255 |
|
| 256 | 256 |
TransactionStatus txStatus = appCtr.startTransaction(true); |
| ... | ... | |
| 278 | 278 |
|
| 279 | 279 |
logger.info("Loading data from DB " + dbname);
|
| 280 | 280 |
|
| 281 |
CdmApplicationController appCtr = null; |
|
| 281 |
CdmApplicationDefaultController appCtr = null;
|
|
| 282 | 282 |
|
| 283 | 283 |
|
| 284 | 284 |
String password = AccountStore.readOrStorePassword(dbname, server, username, null); |
| 285 | 285 |
|
| 286 | 286 |
DbSchemaValidation dbSchemaValidation = DbSchemaValidation.VALIDATE; |
| 287 | 287 |
ICdmDataSource datasource = CdmDataSource.NewMySqlInstance(server, dbname, username, password); |
| 288 |
appCtr = CdmApplicationController.NewInstance(datasource, dbSchemaValidation, true); |
|
| 288 |
appCtr = CdmApplicationDefaultController.NewInstance(datasource, dbSchemaValidation, true);
|
|
| 289 | 289 |
|
| 290 | 290 |
|
| 291 | 291 |
TransactionStatus txStatus = appCtr.startTransaction(true); |
| ... | ... | |
| 325 | 325 |
|
| 326 | 326 |
} |
| 327 | 327 |
|
| 328 |
private Map<String, List<CdmBase>> retrieveAllTables_(CdmApplicationController appCtr) {
|
|
| 328 |
private Map<String, List<CdmBase>> retrieveAllTables_(CdmApplicationDefaultController appCtr) {
|
|
| 329 | 329 |
|
| 330 | 330 |
Map<String, List<CdmBase>> tables_ = new HashMap<String, List<CdmBase>>(table_list.length); |
| 331 | 331 |
|
| ... | ... | |
| 423 | 423 |
return tables; |
| 424 | 424 |
} |
| 425 | 425 |
|
| 426 |
private Map<String, List<String>> retrieveAllTables(CdmApplicationController appCtr) {
|
|
| 426 |
private Map<String, List<String>> retrieveAllTables(CdmApplicationDefaultController appCtr) {
|
|
| 427 | 427 |
|
| 428 | 428 |
Map<String, List<String>> tables = new HashMap<String, List<String>>(table_list.length); |
| 429 | 429 |
|
| ... | ... | |
| 569 | 569 |
|
| 570 | 570 |
private void test(){
|
| 571 | 571 |
|
| 572 |
CdmApplicationController appCtrOne = null; |
|
| 573 |
CdmApplicationController appCtrTwo = null; |
|
| 572 |
CdmApplicationDefaultController appCtrOne = null;
|
|
| 573 |
CdmApplicationDefaultController appCtrTwo = null;
|
|
| 574 | 574 |
logger.info("Comparing '" + sourceDbOne + "' and '" + sourceDbTwo + "'");
|
| 575 | 575 |
|
| 576 | 576 |
try {
|
| 577 |
appCtrOne = CdmApplicationController.NewInstance(sourceOne, DbSchemaValidation.VALIDATE, true); |
|
| 578 |
appCtrTwo = CdmApplicationController.NewInstance(sourceTwo, DbSchemaValidation.VALIDATE, true); |
|
| 577 |
appCtrOne = CdmApplicationDefaultController.NewInstance(sourceOne, DbSchemaValidation.VALIDATE, true);
|
|
| 578 |
appCtrTwo = CdmApplicationDefaultController.NewInstance(sourceTwo, DbSchemaValidation.VALIDATE, true);
|
|
| 579 | 579 |
|
| 580 | 580 |
} catch (Exception e) {
|
| 581 | 581 |
logger.error("Error creating application controller");
|
Also available in: Unified diff
renaming CdmApplicationController to CdmApplicationDefaultController