From 7e997a0ed5c7552a70f60ac55869fab51370f4ac Mon Sep 17 00:00:00 2001 From: David Gageot Date: Wed, 13 May 2015 11:47:38 +0200 Subject: [PATCH] Tests should not catch the exception --- .../sonar/jpa/session/DatabaseSessionTest.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/sonar-core/src/test/java/org/sonar/jpa/session/DatabaseSessionTest.java b/sonar-core/src/test/java/org/sonar/jpa/session/DatabaseSessionTest.java index b3d0c14da46..ff941b979c9 100644 --- a/sonar-core/src/test/java/org/sonar/jpa/session/DatabaseSessionTest.java +++ b/sonar-core/src/test/java/org/sonar/jpa/session/DatabaseSessionTest.java @@ -73,14 +73,9 @@ public class DatabaseSessionTest extends AbstractDbUnitTestCase { assertNull(getSession().getSingleResult(ResourceModel.class, "name", "test")); } - @Test + @Test(expected = IllegalStateException.class) public void testGetSingleResultWithNoCriterias() { - try { - assertNull(getSession().getSingleResult(ResourceModel.class, (Object[]) null)); - fail("No IllegalStateException raised"); - } catch (IllegalStateException ex) { - // error raised correctly - } + assertNull(getSession().getSingleResult(ResourceModel.class, (Object[]) null)); } @Test @@ -91,15 +86,10 @@ public class DatabaseSessionTest extends AbstractDbUnitTestCase { assertEquals(project1, hit); } - @Test + @Test(expected = NonUniqueResultException.class) public void testGetSingleResultWithTwoResults() { getSession().save(project1, project2); - try { - getSession().getSingleResult(ResourceModel.class, "qualifier", "JAV"); - fail("No NonUniqueResultException raised"); - } catch (NonUniqueResultException ex) { - // error raised correctly - } + getSession().getSingleResult(ResourceModel.class, "qualifier", "JAV"); } @Test -- 2.39.5