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 <davscl...@apache.org> Authored: Sun Jun 23 09:26:28 2013 +0200 Committer: Claus Ibsen <davscl...@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();
