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 2012/08/13 11:05:12 UTC

svn commit: r1372330 - in /camel/branches/camel-2.10.x: ./ components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java

Author: davsclaus
Date: Mon Aug 13 09:05:12 2012
New Revision: 1372330

URL: http://svn.apache.org/viewvc?rev=1372330&view=rev
Log:
CAMEL-5500: Spring test support in camel-testng should use @AfterMethod like its base class does in teardown.

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1372329

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: camel/branches/camel-2.10.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java?rev=1372330&r1=1372329&r2=1372330&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java (original)
+++ camel/branches/camel-2.10.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java Mon Aug 13 09:05:12 2012
@@ -30,6 +30,7 @@ import org.springframework.context.Appli
 import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.testng.annotations.AfterClass;
+import org.testng.annotations.AfterMethod;
 import org.testng.annotations.AfterTest;
 
 public abstract class CamelSpringTestSupport extends CamelTestSupport {
@@ -80,7 +81,7 @@ public abstract class CamelSpringTestSup
 
 
     @Override
-    @AfterTest
+    @AfterMethod
     public void tearDown() throws Exception {
         super.tearDown();