[Openutils-svn] SF.net SVN: openutils:[4447] magnoliamodules/trunk

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

Revision: 4447
          http://openutils.svn.sourceforge.net/openutils/?rev=4447&view=rev
Author:   fgiust
Date:     2013-11-02 13:52:15 +0000 (Sat, 02 Nov 2013)
Log Message:
-----------
fix invalid test configuration

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
    magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java

Modified: magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-11-02 10:06:01 UTC (rev 4446)
+++ magnoliamodules/trunk/openutils-mgnltagcloud/src/test/java/net/sourceforge/openutils/mgnltagcloud/manager/TagCloudManagerTest.java	2013-11-02 13:52:15 UTC (rev 4447)
@@ -59,7 +59,7 @@
  * @author cstrappazzon
  * @version $Id$
  */
-@RepositoryTestConfiguration(repositoryConfig = "/utils-repository/test-repositories.xml", jackrabbitRepositoryConfig = "/repo-conf/jackrabbit-memory-search.xml", magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "tagcloud", moduleclass = TagCloudModule.class) })
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/repo-conf/jackrabbit-memory-search.xml", magnoliaProperties = "/test-magnolia.properties", startModules = {@ModuleConfiguration(name = "tagcloud", moduleclass = TagCloudModule.class) })
 public class TagCloudManagerTest extends TestNgRepositoryTestcase
 {
 

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-11-02 10:06:01 UTC (rev 4446)
+++ magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java	2013-11-02 13:52:15 UTC (rev 4447)
@@ -79,6 +79,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.reflect.Field;
+import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
@@ -389,10 +390,15 @@
             logger.setLevel(Level.WARN);
         }
 
-        InputStream repositoryConfigFileStream = ClasspathResourcesUtil
-            .getResource(repositoryConfigFileName)
-            .openStream();
+        URL repositoryConfigURL = ClasspathResourcesUtil.getResource(repositoryConfigFileName);
 
+        if (repositoryConfigURL == null)
+        {
+            throw new IllegalArgumentException("Unable to find repository config file " + repositoryConfigFileName);
+        }
+
+        InputStream repositoryConfigFileStream = repositoryConfigURL.openStream();
+
         extractConfigFile("magnolia.repositories.config", repositoryConfigFileStream, "target/repositories.xml");
 
         IOUtils.closeQuietly(repositoryConfigFileStream);

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