You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by bd...@apache.org on 2014/10/29 10:58:30 UTC
svn commit: r1635082 -
/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Author: bdelacretaz
Date: Wed Oct 29 09:58:29 2014
New Revision: 1635082
URL: http://svn.apache.org/r1635082
Log:
SLING-4058 - improve test isolation, tests pass with Oak now
Modified:
sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
Modified: sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java?rev=1635082&r1=1635081&r2=1635082&view=diff
==============================================================================
--- sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java (original)
+++ sling/trunk/launchpad/test-services/src/main/java/org/apache/sling/launchpad/testservices/serversidetests/ResourceResolverTest.java Wed Oct 29 09:58:29 2014
@@ -45,7 +45,7 @@ import org.apache.sling.junit.annotation
import org.apache.sling.junit.annotations.TestReference;
import org.apache.sling.launchpad.testservices.events.EventsCounter;
import org.apache.sling.launchpad.testservices.exported.FakeSlingHttpServletRequest;
-import org.junit.AfterClass;
+import org.junit.After;
import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
@@ -144,8 +144,8 @@ public class ResourceResolverTest {
}
- @AfterClass
- public static void deleteTestNodes() throws Exception {
+ @After
+ public void deleteTestNodes() throws Exception {
logger.debug("{} test done, deleting test nodes", ResourceResolverTest.class.getSimpleName());
final ResourceResolver resolver = cleanupResolverFactory.getAdministrativeResourceResolver(null);
final Session session = resolver.adaptTo(Session.class);