You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2015/03/25 07:47:12 UTC
[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 <da...@apache.org>
Authored: Wed Mar 25 07:48:03 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
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
[2/3] camel git commit: CAMEL-8541: camel-test CDI compliant
Posted by da...@apache.org.
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/33952117
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/33952117
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/33952117
Branch: refs/heads/camel-2.14.x
Commit: 3395211792bd7466d624f571970ece4718fb9e75
Parents: eb0feec
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 25 07:48:03 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 25 07:49:04 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/33952117/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 d574f60..0a51a7f 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
// -------------------------------------------------------------------------
@@ -567,6 +564,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
[3/3] camel git commit: CAMEL-8541: camel-test CDI compliant
Posted by da...@apache.org.
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/5b80cceb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/5b80cceb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/5b80cceb
Branch: refs/heads/camel-2.15.x
Commit: 5b80cceb96b8081bedba6c51ea6e875eca8e4eb2
Parents: 38beadc
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 25 07:48:03 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 25 07:49:12 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/5b80cceb/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