This is an automated email from the git hooks/post-receive script. New commit to branch feature/4062 in repository topia. See https://gitlab.nuiton.org/nuiton/topia.git commit 31790ef2c9eedc5e8ecdb45687022cc77451ca72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Thu Dec 15 11:32:49 2016 +0100 refs #4062 Fix two tests --- .../java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java | 7 +++---- .../java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java b/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java index 6a90910..5edb1e5 100644 --- a/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java +++ b/topia-it/src/test/java/org/nuiton/topia/it/legacy/persistence/NaturalIdTest.java @@ -26,18 +26,17 @@ package org.nuiton.topia.it.legacy.persistence; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.hibernate.HibernateException; import org.hibernate.PropertyValueException; import org.junit.Assert; import org.junit.Rule; import org.junit.Test; import org.nuiton.topia.it.legacy.TopiaItLegacyDatabase; -import org.nuiton.topia.persistence.TopiaException; import org.nuiton.topia.it.legacy.TopiaItLegacyEntityEnum; import org.nuiton.topia.it.legacy.TopiaItLegacyTopiaPersistenceContext; import org.nuiton.topia.it.legacy.topiatest.NaturalizedEntity; import org.nuiton.topia.it.legacy.topiatest.NaturalizedEntityTopiaDao; - -import javax.persistence.PersistenceException; +import org.nuiton.topia.persistence.TopiaException; /** * NaturalIdTest @@ -117,7 +116,7 @@ public class NaturalIdTest { entity.setNaturalIdNotNull(8); persistenceContext.commit(); } catch (TopiaException eee) { - Assert.assertEquals(PersistenceException.class, eee.getCause().getClass()); + Assert.assertEquals(HibernateException.class, eee.getCause().getClass()); } } diff --git a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java index 6ef173f..0f3276b 100644 --- a/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java +++ b/topia-service-migration/src/test/java/org/nuiton/topia/migration/TopiaMigrationEngineTest.java @@ -153,7 +153,7 @@ public class TopiaMigrationEngineTest { persistenceContext.close(); Assert.fail("Validation should have failed"); } catch (SchemaValidationTopiaException e) { - Assert.assertEquals("Missing column: name in H2.PUBLIC.B71", e.getMessage()); + Assert.assertEquals("Schema-validation: missing column [name] in table [b71]", e.getMessage()); } applicationContext.close(); -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.