From 2c24745f398411bf3bd54f37762401d19eabe558 Mon Sep 17 00:00:00 2001 From: jcibik Date: Wed, 2 Aug 2017 09:39:08 +0200 Subject: [PATCH] [HHH-11904] Changed assertion in EnumExplicitTypeTest --- .../test/enums/EnumExplicitTypeTest.java | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/hibernate-core/src/test/java/org/hibernate/test/enums/EnumExplicitTypeTest.java b/hibernate-core/src/test/java/org/hibernate/test/enums/EnumExplicitTypeTest.java index 1641d59fd4c9..2293a6eb0839 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/enums/EnumExplicitTypeTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/enums/EnumExplicitTypeTest.java @@ -13,6 +13,7 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; /** * @author Vlad Mihalcea @@ -26,21 +27,24 @@ protected String[] getMappings() { @Test @TestForIssue(jiraKey = "HHH-10766") public void hbmEnumWithExplicitTypeTest() { - Session s = openSession(); - s.getTransaction().begin(); - Person painted = Person.person( Gender.MALE, HairColor.BROWN ); - painted.setOriginalHairColor( HairColor.BLONDE ); - s.persist( painted ); - s.getTransaction().commit(); - s.clear(); + Session s = openSession(); + try { + s.getTransaction().begin(); + Person painted = Person.person(Gender.MALE, HairColor.BROWN); + painted.setOriginalHairColor(HairColor.BLONDE); + s.persist(painted); + s.getTransaction().commit(); + s.clear(); - s.getTransaction().begin(); - Number id = (Number) session.createSQLQuery( - "select id from Person where originalHairColor = :color" ) - .setParameter( "color", HairColor.BLONDE.name() ) - .uniqueResult(); - assertEquals( 1L, id.longValue() ); - s.getTransaction().commit(); - s.close(); + s.getTransaction().begin(); + Object id = session.createSQLQuery( + "select id from Person where originalHairColor = :color") + .setParameter("color", HairColor.BLONDE.name()) + .uniqueResult(); + assertTrue(id instanceof Number); + } finally { + s.getTransaction().commit(); + s.close(); + } } }