Author: athimel Date: 2012-07-02 17:35:24 +0200 (Mon, 02 Jul 2012) New Revision: 2594 Url: http://nuiton.org/repositories/revision/topia/2594 Log: Check TMSVersion#version from the database Modified: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigration.java Modified: trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigration.java =================================================================== --- trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigration.java 2012-07-02 15:15:56 UTC (rev 2593) +++ trunk/topia-service-migration/src/test/java/org/nuiton/topia/migration/TckItMigration.java 2012-07-02 15:35:24 UTC (rev 2594) @@ -10,11 +10,14 @@ import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaContextFactory; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.migration.mappings.TMSVersionDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.tck.TopiaDatabase; import org.nuiton.topia.tck.it.Company; import org.nuiton.topia.tck.it.CompanyDAO; import org.nuiton.topia.tck.it.TopiaTckItDAOHelper; +import org.nuiton.util.Version; +import org.nuiton.util.VersionUtil; import java.io.File; import java.io.IOException; @@ -49,7 +52,7 @@ Files.copy(new InputSupplier<InputStream>() { @Override public InputStream getInput() throws IOException { - return TckItMigration.class.getResourceAsStream("/migration-source-database.h2.db"); + return getClass().getResourceAsStream("/migration-source-database.h2.db"); } }, dataCopyForTest); @@ -88,7 +91,8 @@ @Test public void testMigrationDone() throws TopiaException { - Assert.assertEquals("Test is written for model 1.2", "1.2", TopiaTckItDAOHelper.getModelVersion()); + String expectedVersion = "1.2"; + Assert.assertEquals("Test is written for a specific version", expectedVersion, TopiaTckItDAOHelper.getModelVersion()); TopiaContext context = rootCtxt.beginTransaction(); CompanyDAO companyDAO = TopiaTckItDAOHelper.getCompanyDAO(context); @@ -102,6 +106,9 @@ // Siret is 123 only if migration is done List<Company> bySiret = companyDAO.findAllBySiret(123); Assert.assertEquals(1, bySiret.size()); + + Version version = TMSVersionDAO.getVersion(context, "tms_version"); + Assert.assertEquals(VersionUtil.valueOf(expectedVersion), version); } }