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

[davsclaus]

Author: davsclaus
Date: Mon Aug 13 09:06:33 2012
New Revision: 1372331

URL: http://svn.apache.org/viewvc?rev=1372331&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.9.x/   (props changed)
    
camel/branches/camel-2.9.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java

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

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

Modified: 
camel/branches/camel-2.9.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java?rev=1372331&r1=1372330&r2=1372331&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
 (original)
+++ 
camel/branches/camel-2.9.x/components/camel-testng/src/main/java/org/apache/camel/testng/CamelSpringTestSupport.java
 Mon Aug 13 09:06:33 2012
@@ -34,6 +34,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;
 
 
@@ -81,7 +82,7 @@ public abstract class CamelSpringTestSup
 
 
     @Override
-    @AfterTest
+    @AfterMethod
     public void tearDown() throws Exception {
         super.tearDown();