From 09d9b94a2ea2036aa493c049adf69558cc30cbab Mon Sep 17 00:00:00 2001
From: buczekp <buczekp>
Date: Mon, 10 May 2010 13:03:19 +0000
Subject: [PATCH] [LMS-1531] fixed migration test
SVN: 15872
---
.../dataaccess/db/SqlUnitMigrationTest.java | 20 +++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlUnitMigrationTest.java b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlUnitMigrationTest.java
index 3c73475646b..9244725886d 100644
--- a/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlUnitMigrationTest.java
+++ b/openbis/sourceTest/java/ch/systemsx/cisd/openbis/generic/server/dataaccess/db/SqlUnitMigrationTest.java
@@ -261,6 +261,7 @@ public final class SqlUnitMigrationTest
final DatabaseConfigurationContext configurationContext =
createDatabaseContext(databaseKind);
AbstractApplicationContext applicationContext = null;
+ File migratedSchemaFile = null;
try
{
final String initialVersion = "034";
@@ -271,17 +272,8 @@ public final class SqlUnitMigrationTest
(SessionFactory) applicationContext.getBean("hibernate-session-factory");
assertNotNull(sessionFactory);
// dump the migrated database schema to the file
- final File migratedSchemaFile =
- new File(unitTestRootDirectory, "migratedDatabaseSchema.sql");
+ migratedSchemaFile = new File(unitTestRootDirectory, "migratedDatabaseSchema.sql");
dumpSchema(configurationContext, migratedSchemaFile);
-
- final File originalSchemaFile = dumpOriginalSchema();
-
- final String schemasDelta = compareSchemas(migratedSchemaFile, originalSchemaFile);
- final String errorMsg =
- "The migrated schema is not identical to the original one. "
- + "Consider attaching following script to the migration file.";
- AssertJUnit.assertEquals(errorMsg, "", schemasDelta);
} finally
{
configurationContext.closeConnections();
@@ -290,6 +282,14 @@ public final class SqlUnitMigrationTest
applicationContext.close();
}
}
+ // need to close connections before dumping schema
+ final File originalSchemaFile = dumpOriginalSchema();
+
+ final String schemasDelta = compareSchemas(migratedSchemaFile, originalSchemaFile);
+ final String errorMsg =
+ "The migrated schema is not identical to the original one. "
+ + "Consider attaching following script to the migration file.";
+ AssertJUnit.assertEquals(errorMsg, "", schemasDelta);
}
// create an original database from scratch and dump its schema to the file
--
GitLab