You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by st...@apache.org on 2015/06/23 17:27:46 UTC
svn commit: r1687085 - in
/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup:
Instance.java OSGiMock.java
Author: stefanegli
Date: Tue Jun 23 15:27:46 2015
New Revision: 1687085
URL: http://svn.apache.org/r1687085
Log:
SLING-4587 : do resetRepo before registering the event listener as otherwise it will receive tons of events as a result of the deletion of /var which could contain leftovers of previous runs - and that conflicts with the test
Modified:
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/Instance.java
sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java
Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/Instance.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/Instance.java?rev=1687085&r1=1687084&r2=1687085&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/Instance.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/Instance.java Tue Jun 23 15:27:46 2015
@@ -374,6 +374,14 @@ public class Instance {
observationManager = session.getWorkspace()
.getObservationManager();
+ if (resetRepo) {
+ //SLING-4587 : do resetRepo before creating the observationListener
+ // otherwise it will get tons of events from the deletion of /var
+ // which the previous test could have left over.
+ // Doing it before addEventListener should prevent that.
+ osgiMock.resetRepo();
+ }
+
observationListener = new MyEventListener(slingId);
observationManager.addEventListener(
observationListener
@@ -383,7 +391,7 @@ public class Instance {
null,
null, false);
- osgiMock.activateAll(resetRepo);
+ osgiMock.activateAll();
}
@Override
Modified: sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java?rev=1687085&r1=1687084&r2=1687085&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java (original)
+++ sling/trunk/bundles/extensions/discovery/impl/src/test/java/org/apache/sling/discovery/impl/setup/OSGiMock.java Tue Jun 23 15:27:46 2015
@@ -42,20 +42,20 @@ public class OSGiMock {
services.add(service);
}
- public void activateAll(boolean resetRepo) throws Exception {
- if (resetRepo) {
- Session l = RepositoryProvider.instance().getRepository()
- .loginAdministrative(null);
- try {
- l.removeItem("/var");
- l.save();
- l.logout();
- } catch (Exception e) {
- l.refresh(false);
- l.logout();
- }
+ public void resetRepo() throws Exception {
+ Session l = RepositoryProvider.instance().getRepository()
+ .loginAdministrative(null);
+ try {
+ l.removeItem("/var");
+ l.save();
+ l.logout();
+ } catch (Exception e) {
+ l.refresh(false);
+ l.logout();
}
-
+ }
+
+ public void activateAll() throws Exception {
for (@SuppressWarnings("rawtypes")
Iterator it = services.iterator(); it.hasNext();) {
Object aService = it.next();