pushing clearAuthentication up to CdmTransactionalIntegrationTest

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java
index fbb89350ac50aa21d6affd11e6b68237f2f8503a..10519ab25c7c28fdd963d63ee2972b7493960072 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTest.java
@@ -12,6 +12,7 @@ package eu.etaxonomy.cdm.test.integration;
 import org.apache.log4j.Logger;\r
 import org.junit.After;\r
 import org.junit.Before;\r
+import org.springframework.security.core.context.SecurityContextHolder;\r
 import org.springframework.transaction.PlatformTransactionManager;\r
 import org.springframework.transaction.TransactionDefinition;\r
 import org.springframework.transaction.TransactionException;\r
@@ -147,6 +148,12 @@ public abstract class CdmTransactionalIntegrationTest extends CdmIntegrationTest
         }\r
     }\r
 \r
+    @After\r
+    @Before\r
+    public void clearAuthentication() {\r
+        SecurityContextHolder.getContext().setAuthentication(null);\r
+    }\r
+\r
     /**\r
      * Subclasses can override this method to perform any setup operations, such\r
      * as populating a database table, <i>before</i> the transaction created by\r

diff --git a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTestWithSecurity.java b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTestWithSecurity.java
index 5e91919aea83daa614a81540e653c07bc221339c..1267070375fe7e17900bf20f1ae62e6b8950c7e3 100644 (file)
--- a/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTestWithSecurity.java
+++ b/cdmlib-persistence/src/test/java/eu/etaxonomy/cdm/test/integration/CdmTransactionalIntegrationTestWithSecurity.java
@@ -9,11 +9,5 @@ import org.unitils.spring.annotation.SpringApplicationContext;
 public abstract class CdmTransactionalIntegrationTestWithSecurity extends  CdmTransactionalIntegrationTest {\r
 \r
 \r
-    @After\r
-    @Before\r
-    public void clearAuthentication() {\r
-        SecurityContextHolder.getContext().setAuthentication(null);\r
-    }\r
-\r
 \r
 }\r