You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2010/10/24 15:17:05 UTC
svn commit: r1026791 -
/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/AbstractTest.java
Author: cziegeler
Date: Sun Oct 24 13:17:05 2010
New Revision: 1026791
URL: http://svn.apache.org/viewvc?rev=1026791&view=rev
Log:
SLING-1849 : DropQueueTest failure
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/AbstractTest.java
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/AbstractTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/AbstractTest.java?rev=1026791&r1=1026790&r2=1026791&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/AbstractTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/impl/AbstractTest.java Sun Oct 24 13:17:05 2010
@@ -70,10 +70,6 @@ public abstract class AbstractTest {
session = repository.loginAdministrative(repository.getDefaultWorkspace());
assertTrue(RepositoryTestUtil.registerNodeType(session, DistributingEventHandler.class.getResourceAsStream("/SLING-INF/nodetypes/event.cnd")));
assertTrue(RepositoryTestUtil.registerNodeType(session, DistributingEventHandler.class.getResourceAsStream("/SLING-INF/nodetypes/folder.cnd")));
- if ( session.itemExists(REPO_PATH) ) {
- session.getItem(REPO_PATH).remove();
- session.save();
- }
}
@org.junit.AfterClass public static void shutdownRepository() throws Exception {
@@ -85,6 +81,11 @@ public abstract class AbstractTest {
}
@org.junit.Before public void setup() throws Throwable {
+ // remove content from another test
+ if ( session.itemExists(REPO_PATH) ) {
+ session.getItem(REPO_PATH).remove();
+ session.save();
+ }
// activate
this.activate(null);
}