Return-Path: X-Original-To: apmail-deltaspike-commits-archive@www.apache.org Delivered-To: apmail-deltaspike-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id B3EAF10DA4 for ; Sat, 14 Feb 2015 10:19:21 +0000 (UTC) Received: (qmail 20138 invoked by uid 500); 14 Feb 2015 10:19:21 -0000 Delivered-To: apmail-deltaspike-commits-archive@deltaspike.apache.org Received: (qmail 20051 invoked by uid 500); 14 Feb 2015 10:19:21 -0000 Mailing-List: contact commits-help@deltaspike.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@deltaspike.apache.org Delivered-To: mailing list commits@deltaspike.apache.org Received: (qmail 20006 invoked by uid 99); 14 Feb 2015 10:19:21 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 14 Feb 2015 10:19:21 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id EAC71E0534; Sat, 14 Feb 2015 10:19:20 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: tandraschko@apache.org To: commits@deltaspike.apache.org Date: Sat, 14 Feb 2015 10:19:24 -0000 Message-Id: <19f04783e5114460aed59861a4a7ab54@git.apache.org> In-Reply-To: <294f1dbeba124623a6c5a8d58e568771@git.apache.org> References: <294f1dbeba124623a6c5a8d58e568771@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] deltaspike git commit: DELTASPIKE-823 fixed test as the new proxy throws the real exception and not a wrapped InvocationTargetException DELTASPIKE-823 fixed test as the new proxy throws the real exception and not a wrapped InvocationTargetException Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/eb8dc9a8 Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/eb8dc9a8 Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/eb8dc9a8 Branch: refs/heads/master Commit: eb8dc9a897c7e19b9ed12da44e06cba973dded26 Parents: 812b554 Author: Thomas Andraschko Authored: Sat Feb 14 11:17:02 2015 +0100 Committer: Thomas Andraschko Committed: Sat Feb 14 11:17:02 2015 +0100 ---------------------------------------------------------------------- .../org/apache/deltaspike/data/impl/criteria/CriteriaTest.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/deltaspike/blob/eb8dc9a8/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java ---------------------------------------------------------------------- diff --git a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java index 49c7e79..1efd4ac 100644 --- a/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java +++ b/deltaspike/modules/data/impl/src/test/java/org/apache/deltaspike/data/impl/criteria/CriteriaTest.java @@ -24,7 +24,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import static org.junit.Assert.assertTrue; -import java.lang.reflect.InvocationTargetException; import java.util.Calendar; import java.util.Date; import java.util.List; @@ -32,6 +31,7 @@ import java.util.List; import javax.enterprise.inject.Produces; import javax.inject.Inject; import javax.persistence.EntityManager; +import javax.persistence.NonUniqueResultException; import javax.persistence.PersistenceContext; import org.apache.deltaspike.data.test.TransactionalTestCase; @@ -310,7 +310,7 @@ public class CriteriaTest extends TransactionalTestCase assertNull(result2); } - @Test(expected = InvocationTargetException.class) + @Test(expected = NonUniqueResultException.class) public void should_fail_with_optional_nonunique_result() { // given