Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-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 B1C7A175BF for ; Wed, 25 Mar 2015 06:47:12 +0000 (UTC) Received: (qmail 41063 invoked by uid 500); 25 Mar 2015 06:47:12 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 41004 invoked by uid 500); 25 Mar 2015 06:47:12 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 40990 invoked by uid 99); 25 Mar 2015 06:47:12 -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; Wed, 25 Mar 2015 06:47:12 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6C9F9E1839; Wed, 25 Mar 2015 06:47:12 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davsclaus@apache.org To: commits@camel.apache.org Date: Wed, 25 Mar 2015 06:47:12 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/3] camel git commit: CAMEL-8541: camel-test CDI compliant Repository: camel Updated Branches: refs/heads/camel-2.14.x eb0feec45 -> 339521179 refs/heads/camel-2.15.x 38beadc19 -> 5b80cceb9 refs/heads/master e83d342f6 -> 7584d4c9c CAMEL-8541: camel-test CDI compliant Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7584d4c9 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7584d4c9 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7584d4c9 Branch: refs/heads/master Commit: 7584d4c9c59627a5b5d302b0a402685cfe410ecf Parents: e83d342 Author: Claus Ibsen Authored: Wed Mar 25 07:48:03 2015 +0100 Committer: Claus Ibsen Committed: Wed Mar 25 07:48:03 2015 +0100 ---------------------------------------------------------------------- .../org/apache/camel/test/junit4/TestSupport.java | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/7584d4c9/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java ---------------------------------------------------------------------- diff --git a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java index 0df328a..caf7ce1 100644 --- a/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java +++ b/components/camel-test/src/main/java/org/apache/camel/test/junit4/TestSupport.java @@ -55,10 +55,7 @@ public abstract class TestSupport extends Assert { private static final Logger LOG = LoggerFactory.getLogger(TestSupport.class); protected Logger log = LoggerFactory.getLogger(getClass()); - // CHECKSTYLE:OFF - @Rule - public TestName testName = new TestName(); - // CHECKSTYLE:ON + private TestName testName = new TestName(); // Builder methods for expressions used when testing // ------------------------------------------------------------------------- @@ -575,6 +572,16 @@ public abstract class TestSupport extends Assert { } /** + * Gets the current test name + * + * @return the test name + */ + @Rule + public TestName getTestName() { + return testName; + } + + /** * Gets the current test method name * * @return the method name