From af717b42a105630ed29e06a230e71f280194adf8 Mon Sep 17 00:00:00 2001
From: brinn <brinn>
Date: Sun, 3 Feb 2008 12:04:04 +0000
Subject: [PATCH] fix: test expectations regarding logging
SVN: 3966
---
.../dbmigration/DBMigrationEngineTest.java | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
index e57e4f904f3..5c747cc32e0 100644
--- a/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
+++ b/dbmigration/sourceTest/java/ch/systemsx/cisd/dbmigration/DBMigrationEngineTest.java
@@ -135,7 +135,8 @@ public class DBMigrationEngineTest
});
final DBMigrationEngine migrationEngine = new DBMigrationEngine(daoFactory, scriptProvider, true);
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
+ "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - "
+ "Database 'my 2. database' version 042 has been successfully created.", logRecorder.getLogContent());
@@ -176,7 +177,8 @@ public class DBMigrationEngineTest
});
final DBMigrationEngine migrationEngine = new DBMigrationEngine(daoFactory, scriptProvider, true);
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
+ "INFO OPERATION.ch.systemsx.cisd.dbmigration.DBMigrationEngine - "
+ "Database 'my 2. database' version 042 has been successfully created.", logRecorder.getLogContent());
@@ -217,7 +219,8 @@ public class DBMigrationEngineTest
{
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());
context.assertIsSatisfied();
@@ -568,7 +571,8 @@ public class DBMigrationEngineTest
{
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());
context.assertIsSatisfied();
@@ -610,7 +614,8 @@ public class DBMigrationEngineTest
{
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());
context.assertIsSatisfied();
@@ -653,7 +658,8 @@ public class DBMigrationEngineTest
{
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());
context.assertIsSatisfied();
--
GitLab