[Openutils-svn] SF.net SVN: openutils:[4413] magnoliamodules/trunk/openutils-mgnltests/src

[<fg...@us...>]

Revision: 4413
          http://openutils.svn.sourceforge.net/openutils/?rev=4413&view=rev
Author:   fgiust
Date:     2013-10-20 18:38:09 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
properly shutdown without warnings

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
    magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java

Modified: magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-20 18:13:24 UTC (rev 4412)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-10-20 18:38:09 UTC (rev 4413)
@@ -18,7 +18,7 @@
  */
 
 package it.openutils.mgnlutils.test;
- 
+
 import info.magnolia.cms.core.Path;
 import info.magnolia.cms.core.SystemProperty;
 import info.magnolia.cms.util.ClasspathResourcesUtil;
@@ -55,6 +55,7 @@
 import info.magnolia.objectfactory.configuration.InstanceConfiguration;
 import info.magnolia.objectfactory.configuration.ProviderConfiguration;
 import info.magnolia.repository.DefaultRepositoryManager;
+import info.magnolia.repository.RepositoryConstants;
 import info.magnolia.repository.RepositoryManager;
 import info.magnolia.test.ComponentsTestUtil;
 import info.magnolia.test.FixedModuleDefinitionReader;
@@ -76,6 +77,8 @@
 import javax.jcr.ImportUUIDBehavior;
 import javax.jcr.Node;
 import javax.jcr.RepositoryException;
+import javax.jcr.observation.EventListenerIterator;
+import javax.jcr.observation.ObservationManager;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -183,8 +186,21 @@
                 logger.setLevel(Level.WARN);
             }
             MgnlContext.release();
-            Components.getComponent(SystemContext.class).release();
 
+            SystemContext systemContext = Components.getComponent(SystemContext.class);
+
+            final ObservationManager observationManager = systemContext
+                .getJCRSession(RepositoryConstants.CONFIG)
+                .getWorkspace()
+                .getObservationManager();
+            final EventListenerIterator listeners = observationManager.getRegisteredEventListeners();
+            while (listeners.hasNext())
+            {
+                observationManager.removeEventListener(listeners.nextEventListener());
+            }
+
+            systemContext.release();
+
             Components.getComponent(RepositoryManager.class).shutdown();
             if (true)
             {

Modified: magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java	2013-10-20 18:13:24 UTC (rev 4412)
+++ magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/junit/JUnitRepositoryTestcaseTest.java	2013-10-20 18:38:09 UTC (rev 4413)
@@ -57,7 +57,7 @@
         Node letters = session.getNode("/letters");
         Assert.assertNotNull(letters);
 
-        Assert.assertEquals(NodeUtil.getCollectionFromNodeIterator(letters.getNodes()).size(), 26);
+        Assert.assertEquals(NodeUtil.asList(NodeUtil.getNodes(letters, NodeUtil.EXCLUDE_META_DATA_FILTER)).size(), 26);
     }
 
     @Test

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.