Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[3542] trunk/openutils-mgnlmedia
|
From: <fg...@us...> - 2011-06-16 16:58:10
|
Revision: 3542
http://openutils.svn.sourceforge.net/openutils/?rev=3542&view=rev
Author: fgiust
Date: 2011-06-16 16:58:03 +0000 (Thu, 16 Jun 2011)
Log Message:
-----------
tests draft
Modified Paths:
--------------
trunk/openutils-mgnlmedia/pom.xml
trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
Added Paths:
-----------
trunk/openutils-mgnlmedia/src/test/resources/META-INF/
trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/
trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
trunk/openutils-mgnlmedia/src/test/resources/log4j.xml
Modified: trunk/openutils-mgnlmedia/pom.xml
===================================================================
--- trunk/openutils-mgnlmedia/pom.xml 2011-06-16 13:31:03 UTC (rev 3541)
+++ trunk/openutils-mgnlmedia/pom.xml 2011-06-16 16:58:03 UTC (rev 3542)
@@ -101,34 +101,6 @@
</dependency>
<dependency>
<groupId>info.magnolia</groupId>
- <artifactId>magnolia-module-fckEditor</artifactId>
- <version>${magnolia.version}</version>
- <optional>true</optional>
- <exclusions>
- <exclusion>
- <groupId>javax.mail</groupId>
- <artifactId>mail</artifactId>
- </exclusion>
- <exclusion>
- <groupId>javax.jms</groupId>
- <artifactId>jms</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jdmk</groupId>
- <artifactId>jmxtools</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.jmx</groupId>
- <artifactId>jmxri</artifactId>
- </exclusion>
- <exclusion>
- <groupId>pdfbox</groupId>
- <artifactId>pdfbox</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>info.magnolia</groupId>
<artifactId>magnolia-module-admininterface</artifactId>
<version>${magnolia.version}</version>
<exclusions>
@@ -173,8 +145,25 @@
<artifactId>magnolia-module-standard-templating-kit</artifactId>
<version>1.4</version>
<optional>true</optional>
+ <exclusions>
+ <exclusion>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-resources</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-module-public-user-registration</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
+ <groupId>info.magnolia</groupId>
+ <artifactId>magnolia-core</artifactId>
+ <classifier>tests</classifier>
+ <version>${magnolia.version}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>com.drewnoakes</groupId>
<artifactId>metadata-extractor</artifactId>
<version>2.4.0-beta-1</version>
@@ -241,6 +230,6 @@
</dependency>
</dependencies>
<properties>
- <magnolia.version>4.4.1</magnolia.version>
+ <magnolia.version>4.4.4</magnolia.version>
</properties>
</project>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
===================================================================
--- trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2011-06-16 13:31:03 UTC (rev 3541)
+++ trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2011-06-16 16:58:03 UTC (rev 3542)
@@ -19,6 +19,9 @@
package net.sourceforge.openutils.mgnlmedia.media.repotests;
import info.magnolia.cms.core.Content;
+import info.magnolia.cms.core.HierarchyManager;
+import info.magnolia.cms.util.ContentUtil;
+import info.magnolia.context.MgnlContext;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -27,7 +30,6 @@
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
-import org.testng.Assert;
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
@@ -36,7 +38,8 @@
* @author fgiust
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/test-repository/test-repositories.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/test-repository/test-repositories.xml", autostart = true)
+// , startModules = @ModuleConfiguration(name = "media", moduleclass = MediaModule.class)
// , bootstrapFiles = "/test-bootstrap/media.x.xml"
public class MediaTests extends TestNgRepositoryTestcase
{
@@ -49,15 +52,20 @@
// MgnlContext.getHierarchyManager("media").save();
}
- @Test(enabled = false)
+ @Test(enabled = true)
public void uploadIco() throws Exception
{
+
+ HierarchyManager hm = MgnlContext.getHierarchyManager("media");
+ ContentUtil.createPath(hm, "/test/folder");
+ hm.save();
+
InputStream is = getClass().getResourceAsStream("/images/openmind.ico");
Content entry = MediaLoadUtils.loadEntry(is, "/test/folder", "openmind.ico", true);
IOUtils.closeQuietly(is);
- Assert.assertNotNull(entry);
+ // Assert.assertNotNull(entry);
}
}
Added: trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
===================================================================
--- trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml (rev 0)
+++ trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml 2011-06-16 16:58:03 UTC (rev 3542)
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE module SYSTEM "module.dtd">
+<module>
+<!-- overwrite the real description during tests to avoid the long list of dependencies -->
+ <name>standard-templating-kit</name>
+ <displayName>Magnolia Standard Templating Kit</displayName>
+ <description></description>
+ <class>info.magnolia.module.templatingkit.STKModule</class>
+ <versionHandler>info.magnolia.module.templatingkit.setup.STKModuleVersionHandler</versionHandler>
+ <version>1.4</version>
+ <properties>
+ <property>
+ <name>info.magnolia.module.templatingkit.style.Theme</name>
+ <value>info.magnolia.module.templatingkit.style.ThemeImpl</value>
+ </property>
+ <property>
+ <name>info.magnolia.module.templatingkit.sites.SiteManager</name>
+ <value>info.magnolia.module.templatingkit.sites.STKSiteManager</value>
+ </property>
+ <property>
+ <name>info.magnolia.module.templatingkit.beanmerger.BeanMerger</name>
+ <value>info.magnolia.module.templatingkit.beanmerger.STKBeanMerger</value>
+ </property>
+ <property>
+ <name>info.magnolia.module.templatingkit.categorization.CategorizationSupport</name>
+ <value>info.magnolia.module.templatingkit.categorization.STKCategorizationSupport</value>
+ </property>
+ <property>
+ <name>info.magnolia.cms.core.AggregationState</name>
+ <value>info.magnolia.module.templatingkit.ExtendedAggregationState</value>
+ </property>
+ </properties>
+ <dependencies>
+ <dependency>
+ <name>core</name>
+ <version>4.4/*</version>
+ </dependency>
+ <!--
+ <dependency>
+ <name>adminInterface</name>
+ <version>4.4/*</version>
+ </dependency>
+ <dependency>
+ <name>cache</name>
+ <version>4.4/*</version>
+ </dependency>
+ <dependency>
+ <name>fckEditor</name>
+ <version>4.4/*</version>
+ </dependency>
+ <dependency>
+ <name>resources</name>
+ <version>1.3/*</version>
+ </dependency>
+ <dependency>
+ <name>inplace-templating</name>
+ <version>1.2/*</version>
+ </dependency>
+ <dependency>
+ <name>dms</name>
+ <version>1.5/*</version>
+ </dependency>
+ <dependency>
+ <name>data</name>
+ <version>1.6/*</version>
+ </dependency>
+ <dependency>
+ <name>rssaggregator</name>
+ <version>1.1/*</version>
+ </dependency>
+ <dependency>
+ <name>public-user-registration</name>
+ <version>1.2/*</version>
+ <optional>true</optional>
+ </dependency>
+ -->
+ </dependencies>
+</module>
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/META-INF/magnolia/standard-templating-kit.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Property changes on: trunk/openutils-mgnlmedia/src/test/resources/log4j.xml
___________________________________________________________________
Added: svn:mime-type
+ text/xml
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
