Skip to content
Snippets Groups Projects
Commit af717b42 authored by brinn's avatar brinn
Browse files

fix: test expectations regarding logging 

SVN: 3966
parent d8ffe596
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
+ 12
− 6
View file @ af717b42
...@@ -135,7 +135,8 @@ public class DBMigrationEngineTest ...@@ -135,7 +135,8 @@ public class DBMigrationEngineTest
}); });
final DBMigrationEngine migrationEngine = new DBMigrationEngine(daoFactory, scriptProvider, true); final DBMigrationEngine migrationEngine = new DBMigrationEngine(daoFactory, scriptProvider, true);
migrationEngine.migrateTo(version); migrationEngine.migrateTo(version);
assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - Dropping database."
+ OSUtilities.LINE_SEPARATOR + "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - "
+ "Database 'my 1. database' does not exist." + OSUtilities.LINE_SEPARATOR + "Database 'my 1. database' does not exist." + OSUtilities.LINE_SEPARATOR
+ "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - "
+ "Database 'my 2. database' version 042 has been successfully created.", logRecorder.getLogContent()); + "Database 'my 2. database' version 042 has been successfully created.", logRecorder.getLogContent());
...@@ -176,7 +177,8 @@ public class DBMigrationEngineTest ...@@ -176,7 +177,8 @@ public class DBMigrationEngineTest
}); });
final DBMigrationEngine migrationEngine = new DBMigrationEngine(daoFactory, scriptProvider, true); final DBMigrationEngine migrationEngine = new DBMigrationEngine(daoFactory, scriptProvider, true);
migrationEngine.migrateTo(version); migrationEngine.migrateTo(version);
assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - Dropping database."
+ OSUtilities.LINE_SEPARATOR + "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - "
+ "Database 'my 1. database' does not exist." + OSUtilities.LINE_SEPARATOR + "Database 'my 1. database' does not exist." + OSUtilities.LINE_SEPARATOR
+ "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - "
+ "Database 'my 2. database' version 042 has been successfully created.", logRecorder.getLogContent()); + "Database 'my 2. database' version 042 has been successfully created.", logRecorder.getLogContent());
...@@ -217,7 +219,8 @@ public class DBMigrationEngineTest ...@@ -217,7 +219,8 @@ public class DBMigrationEngineTest
{ {
assertSame(exception, e); assertSame(exception, e);
} }
assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - Dropping database."
+ OSUtilities.LINE_SEPARATOR + "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - "
+ "Database 'my 1. database' does not exist.", logRecorder.getLogContent()); + "Database 'my 1. database' does not exist.", logRecorder.getLogContent());
context.assertIsSatisfied(); context.assertIsSatisfied();
...@@ -568,7 +571,8 @@ public class DBMigrationEngineTest ...@@ -568,7 +571,8 @@ public class DBMigrationEngineTest
{ {
assertEquals(message, e.getMessage()); assertEquals(message, e.getMessage());
} }
assertEquals("ERROR OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + message, logRecorder assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - Dropping database."
+ OSUtilities.LINE_SEPARATOR + "ERROR OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + message, logRecorder
.getLogContent()); .getLogContent());
context.assertIsSatisfied(); context.assertIsSatisfied();
...@@ -610,7 +614,8 @@ public class DBMigrationEngineTest ...@@ -610,7 +614,8 @@ public class DBMigrationEngineTest
{ {
assertEquals(message, e.getMessage()); assertEquals(message, e.getMessage());
} }
assertEquals("ERROR OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + message, logRecorder assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - Dropping database."
+ OSUtilities.LINE_SEPARATOR + "ERROR OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + message, logRecorder
.getLogContent()); .getLogContent());
context.assertIsSatisfied(); context.assertIsSatisfied();
...@@ -653,7 +658,8 @@ public class DBMigrationEngineTest ...@@ -653,7 +658,8 @@ public class DBMigrationEngineTest
{ {
assertEquals(message, e.getMessage()); assertEquals(message, e.getMessage());
} }
assertEquals("ERROR OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + message, logRecorder assertEquals("INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - Dropping database."
+ OSUtilities.LINE_SEPARATOR + "ERROR OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - " + message, logRecorder
.getLogContent()); .getLogContent());
context.assertIsSatisfied(); context.assertIsSatisfied();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment