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 2013/06/23 09:27:56 UTC
[1/4] git commit: Added unit test based on user forum issue
Updated Branches:
refs/heads/camel-2.10.x 0d5872b15 -> e22052986
refs/heads/camel-2.11.x 270962a54 -> 0530c21fb
refs/heads/master 36cf2763a -> b2cd9f1c8
Added unit test based on user forum issue
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e73e5407
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e73e5407
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e73e5407
Branch: refs/heads/master
Commit: e73e5407057389d0cdf88324cf37329d84573770
Parents: 36cf276
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jun 22 10:29:51 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jun 23 09:03:28 2013 +0200
----------------------------------------------------------------------
.../simple/SimpleParserPredicateTest.java | 34 ++++++++++++++++++++
1 file changed, 34 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e73e5407/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
index f089afa..a6fc7f0 100644
--- a/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
+++ b/camel-core/src/test/java/org/apache/camel/language/simple/SimpleParserPredicateTest.java
@@ -16,11 +16,14 @@
*/
package org.apache.camel.language.simple;
+import java.util.ArrayList;
import java.util.HashMap;
+import java.util.List;
import java.util.Map;
import org.apache.camel.ExchangeTestSupport;
import org.apache.camel.Predicate;
+import org.apache.camel.impl.JndiRegistry;
/**
*
@@ -209,4 +212,35 @@ public class SimpleParserPredicateTest extends ExchangeTestSupport {
pre = parser.parsePredicate();
assertTrue("Should match", pre.matches(exchange));
}
+
+ protected JndiRegistry createRegistry() throws Exception {
+ JndiRegistry jndi = super.createRegistry();
+
+ List<String> list = new ArrayList<String>();
+ list.add("foo");
+ list.add("bar");
+
+ jndi.bind("myList", list);
+ return jndi;
+ }
+
+ public void testSimpleIn() throws Exception {
+ Map<String, String> map = new HashMap<String, String>();
+ map.put("key", "foo");
+ map.put("key2", "bar");
+ map.put("key3", "none");
+ exchange.getIn().setBody(map);
+
+ SimplePredicateParser parser = new SimplePredicateParser("${body[key]} in ${ref:myList}", true);
+ Predicate pre = parser.parsePredicate();
+ assertTrue("Should match", pre.matches(exchange));
+
+ parser = new SimplePredicateParser("${body[key2]} in ${ref:myList}", true);
+ pre = parser.parsePredicate();
+ assertTrue("Should match", pre.matches(exchange));
+
+ parser = new SimplePredicateParser("${body[key3]} in ${ref:myList}", true);
+ pre = parser.parsePredicate();
+ assertFalse("Should not match", pre.matches(exchange));
+ }
}
[3/4] git commit: CAMEL-6478: TestNG test cases not working correctly
with groups. Thanks to David Arthur for the patch.
Posted by da...@apache.org.
CAMEL-6478: TestNG test cases not working correctly with groups. Thanks to David Arthur for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/0530c21f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/0530c21f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/0530c21f
Branch: refs/heads/camel-2.11.x
Commit: 0530c21fb10ba8f3e6df8ddca124bd196c046d4f
Parents: 270962a
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jun 23 09:26:28 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jun 23 09:27:09 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/testng/CamelSpringTestSupport.java | 4 ++--
.../main/java/org/apache/camel/testng/CamelTestSupport.java | 6 +++---
.../main/java/org/apache/camel/testng/ExchangeTestSupport.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/0530c21f/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
index f0a975d..663a173 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
@@ -79,7 +79,7 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
@Override
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
super.tearDown();
@@ -91,7 +91,7 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
}
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearSpringDownAfterClass() throws Exception {
if (threadAppContext.get() != null) {
threadAppContext.get().destroy();
http://git-wip-us.apache.org/repos/asf/camel/blob/0530c21f/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
index 3476a59..a4b2e46 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
@@ -191,7 +191,7 @@ public abstract class CamelTestSupport extends TestSupport {
threadService.set(camelContextService);
}
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception {
log.info("********************************************************************************");
log.info("Testing: " + getTestMethodName() + "(" + getClass().getName() + ")");
@@ -309,7 +309,7 @@ public abstract class CamelTestSupport extends TestSupport {
INIT.set(true);
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
long time = watch.stop();
@@ -328,7 +328,7 @@ public abstract class CamelTestSupport extends TestSupport {
doStopCamelContext(context, camelContextService);
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception {
INIT.remove();
LOG.debug("tearDownAfterClass test");
http://git-wip-us.apache.org/repos/asf/camel/blob/0530c21f/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
index 058bd83..a90e7c1 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
@@ -47,7 +47,7 @@ public abstract class ExchangeTestSupport extends CamelTestSupport {
}
@Override
- @BeforeTest
+ @BeforeTest(alwaysRun = true)
public void setUp() throws Exception {
super.setUp();
exchange = createExchange();
[4/4] git commit: CAMEL-6478: TestNG test cases not working correctly
with groups. Thanks to David Arthur for the patch.
Posted by da...@apache.org.
CAMEL-6478: TestNG test cases not working correctly with groups. Thanks to David Arthur for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/e2205298
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/e2205298
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/e2205298
Branch: refs/heads/camel-2.10.x
Commit: e220529860733bdd95ef3d7fe6f83813f5094cae
Parents: 0d5872b
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jun 23 09:26:28 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jun 23 09:27:34 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/testng/CamelSpringTestSupport.java | 4 ++--
.../main/java/org/apache/camel/testng/CamelTestSupport.java | 6 +++---
.../main/java/org/apache/camel/testng/ExchangeTestSupport.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/e2205298/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
index c4e2e32..ba391b0 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
@@ -81,7 +81,7 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
@Override
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
super.tearDown();
@@ -93,7 +93,7 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
}
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearSpringDownAfterClass() throws Exception {
if (threadAppContext.get() != null) {
threadAppContext.get().destroy();
http://git-wip-us.apache.org/repos/asf/camel/blob/e2205298/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
index 3476a59..a4b2e46 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
@@ -191,7 +191,7 @@ public abstract class CamelTestSupport extends TestSupport {
threadService.set(camelContextService);
}
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception {
log.info("********************************************************************************");
log.info("Testing: " + getTestMethodName() + "(" + getClass().getName() + ")");
@@ -309,7 +309,7 @@ public abstract class CamelTestSupport extends TestSupport {
INIT.set(true);
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
long time = watch.stop();
@@ -328,7 +328,7 @@ public abstract class CamelTestSupport extends TestSupport {
doStopCamelContext(context, camelContextService);
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception {
INIT.remove();
LOG.debug("tearDownAfterClass test");
http://git-wip-us.apache.org/repos/asf/camel/blob/e2205298/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
index 058bd83..a90e7c1 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
@@ -47,7 +47,7 @@ public abstract class ExchangeTestSupport extends CamelTestSupport {
}
@Override
- @BeforeTest
+ @BeforeTest(alwaysRun = true)
public void setUp() throws Exception {
super.setUp();
exchange = createExchange();
[2/4] git commit: CAMEL-6478: TestNG test cases not working correctly
with groups. Thanks to David Arthur for the patch.
Posted by da...@apache.org.
CAMEL-6478: TestNG test cases not working correctly with groups. Thanks to David Arthur for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b2cd9f1c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b2cd9f1c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b2cd9f1c
Branch: refs/heads/master
Commit: b2cd9f1c84de7d5e5741604599ccf29d0519fd0c
Parents: e73e540
Author: Claus Ibsen <da...@apache.org>
Authored: Sun Jun 23 09:26:28 2013 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sun Jun 23 09:26:28 2013 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/testng/CamelSpringTestSupport.java | 4 ++--
.../main/java/org/apache/camel/testng/CamelTestSupport.java | 6 +++---
.../main/java/org/apache/camel/testng/ExchangeTestSupport.java | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b2cd9f1c/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
index f0a975d..663a173 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
@@ -79,7 +79,7 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
@Override
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
super.tearDown();
@@ -91,7 +91,7 @@ public abstract class CamelSpringTestSupport extends CamelTestSupport {
}
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearSpringDownAfterClass() throws Exception {
if (threadAppContext.get() != null) {
threadAppContext.get().destroy();
http://git-wip-us.apache.org/repos/asf/camel/blob/b2cd9f1c/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
index 3476a59..a4b2e46 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/CamelTestSupport.java
@@ -191,7 +191,7 @@ public abstract class CamelTestSupport extends TestSupport {
threadService.set(camelContextService);
}
- @BeforeMethod
+ @BeforeMethod(alwaysRun = true)
public void setUp() throws Exception {
log.info("********************************************************************************");
log.info("Testing: " + getTestMethodName() + "(" + getClass().getName() + ")");
@@ -309,7 +309,7 @@ public abstract class CamelTestSupport extends TestSupport {
INIT.set(true);
}
- @AfterMethod
+ @AfterMethod(alwaysRun = true)
public void tearDown() throws Exception {
long time = watch.stop();
@@ -328,7 +328,7 @@ public abstract class CamelTestSupport extends TestSupport {
doStopCamelContext(context, camelContextService);
}
- @AfterClass
+ @AfterClass(alwaysRun = true)
public static void tearDownAfterClass() throws Exception {
INIT.remove();
LOG.debug("tearDownAfterClass test");
http://git-wip-us.apache.org/repos/asf/camel/blob/b2cd9f1c/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java b/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
index 058bd83..a90e7c1 100644
--- a/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
+++ b/components/camel-testng/src/main/java/org/apache/camel/testng/ExchangeTestSupport.java
@@ -47,7 +47,7 @@ public abstract class ExchangeTestSupport extends CamelTestSupport {
}
@Override
- @BeforeTest
+ @BeforeTest(alwaysRun = true)
public void setUp() throws Exception {
super.setUp();
exchange = createExchange();