Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4434] magnoliamodules/trunk
|
From: <fg...@us...> - 2013-10-28 10:25:09
|
Revision: 4434
http://openutils.svn.sourceforge.net/openutils/?rev=4434&view=rev
Author: fgiust
Date: 2013-10-28 10:25:04 +0000 (Mon, 28 Oct 2013)
Log Message:
-----------
unit tests
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml
magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/ImageUtilsTest.java
magnoliamodules/trunk/openutils-mgnlmedia/src/test/resources/log4j.xml
magnoliamodules/trunk/openutils-mgnltagcloud/pom.xml
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/AbstractRepositoryTestcase.java
magnoliamodules/trunk/openutils-mgnltests/src/main/java/it/openutils/mgnlutils/test/RepositoryTestConfiguration.java
magnoliamodules/trunk/openutils-mgnltests/src/test/java/it/openutils/mgnlutils/test/testng/TestNgRepositoryTestcaseTest.java
magnoliamodules/trunk/openutils-mgnlutils/src/test/java/it/openutils/mgnlutils/el/MgnlUtilsElFunctionsTest.java
Removed Paths:
-------------
magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNodeData.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -61,7 +55,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class BasePathTest extends TestNgRepositoryTestcase
{
@@ -90,13 +84,6 @@
// ------- AdvancedCriteriaImpl
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -54,7 +48,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class BasePathWithSpacesTest extends TestNgRepositoryTestcase
{
@@ -72,13 +66,6 @@
// --- consectetur adipisici elit
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,19 +22,12 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
-import java.util.Map;
-
import javax.jcr.Node;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
@@ -61,7 +54,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class Content2BeanTest extends TestNgRepositoryTestcase
{
@@ -79,13 +72,6 @@
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@SuppressWarnings("unchecked")
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,14 +20,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -55,7 +49,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class FirstDigitEscapeTest extends TestNgRepositoryTestcase
{
@@ -70,14 +64,6 @@
super.setUp();
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -63,7 +58,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase
{
@@ -88,14 +83,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,11 +21,6 @@
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -56,7 +51,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase
{
@@ -81,14 +76,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@SuppressWarnings("deprecation")
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -56,7 +51,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class OrderingTest extends TestNgRepositoryTestcase
{
@@ -112,14 +107,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -57,7 +52,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class PaginationTest extends TestNgRepositoryTestcase
{
@@ -83,14 +78,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,11 +21,6 @@
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -56,7 +51,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase
{
@@ -73,14 +68,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
@@ -109,15 +96,23 @@
ResultIterator< ? extends Node> iterator = advResult.getItems();
- Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore() > ((AdvancedResultItem) iterator.next())
- .getScore());
+ AdvancedResultItem first = (AdvancedResultItem) iterator.next();
+ AdvancedResultItem second = (AdvancedResultItem) iterator.next();
+ Assert.assertTrue(first.getScore() >= second.getScore(), "First element score "
+ + first.getScore()
+ + " is not greater of "
+ + second.getScore());
+ // actually, the score should be the same, since the word is always contained in the title... accents should not
+ // be considered
+
iterator = advResult.getItems();
// not sure what the selector name "s" means, but that's the only valid selector for this query, according to
// jackrabbit
- Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore("s") > ((AdvancedResultItem) iterator.next())
- .getScore("s"));
+ Assert
+ .assertTrue(((AdvancedResultItem) iterator.next()).getScore("s") >= ((AdvancedResultItem) iterator.next())
+ .getScore("s"));
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -60,7 +55,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class XpathEscapeTest extends TestNgRepositoryTestcase
{
@@ -76,14 +71,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -21,12 +21,7 @@
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
import info.magnolia.cms.security.PermissionUtil;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.repository.RepositoryConstants;
@@ -63,7 +58,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class AccessibleResultItemResultIteratorTest extends TestNgRepositoryTestcase
{
@@ -106,13 +101,6 @@
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -23,14 +23,8 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
import info.magnolia.cms.core.MgnlNodeType;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -50,7 +44,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class CorrectElementsWithoutMaxResults extends TestNgRepositoryTestcase
{
@@ -83,14 +77,6 @@
// ************************************************************
// total 13 pets
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
@Test
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.MetaDataUtil;
import info.magnolia.jcr.util.PropertyUtil;
@@ -58,8 +53,7 @@
"/crit-bootstrap/website.pets.xml",
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
- "/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.auditLogging.xml" }, security = true)
public class CriteriaTest extends TestNgRepositoryTestcase
{
@@ -96,14 +90,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
@@ -184,7 +170,7 @@
Criteria criteria = toXpathExpressionJavadocExampleCriteria();
AdvancedResult result = criteria.execute();
- Assert.assertEquals(result.getTotalSize(), 1);
+ Assert.assertEquals(result.getTotalSize(), 1, "Expected 1 result for query " + criteria.toXpathExpression());
ResultIterator< ? extends Node> iterator = result.getItems();
Assert.assertEquals(iterator.getSize(), 1);
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,11 +22,6 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.cms.i18n.DefaultI18nContentSupport;
import info.magnolia.cms.i18n.I18nContentSupport;
-import info.magnolia.cms.security.MgnlRoleManager;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -51,7 +46,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class EscapeSignTest extends TestNgRepositoryTestcase
{
@@ -73,14 +68,6 @@
MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
-
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -20,17 +20,11 @@
package net.sourceforge.openutils.mgnlcriteria.jcr.query.lucene;
import info.magnolia.cms.security.AccessManager;
-import info.magnolia.cms.security.MgnlRoleManager;
import info.magnolia.cms.security.Permission;
-import info.magnolia.cms.security.Realm;
-import info.magnolia.cms.security.SecuritySupport;
-import info.magnolia.cms.security.SecuritySupportImpl;
-import info.magnolia.cms.security.SystemUserManager;
import info.magnolia.context.Context;
import info.magnolia.context.ContextDecorator;
import info.magnolia.context.MgnlContext;
import info.magnolia.repository.RepositoryConstants;
-import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -63,7 +57,7 @@
"/crit-bootstrap/userroles.anonymous.xml",
"/crit-bootstrap/users.system.anonymous.xml",
"/crit-bootstrap/config.server.auditLogging.xml",
- "/crit-bootstrap/config.server.i18n.content.xml" })
+ "/crit-bootstrap/config.server.i18n.content.xml" }, security = true)
public class AclSearchIndexTest extends TestNgRepositoryTestcase
{
@@ -101,13 +95,6 @@
Session hm = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
hm.save();
- // info.magnolia.cms.security.SecurityTest.setUp()
- final SecuritySupportImpl sec = new SecuritySupportImpl();
- SystemUserManager systemUserManager = new SystemUserManager();
- systemUserManager.setRealmName(Realm.REALM_SYSTEM.getName());
- sec.addUserManager(Realm.REALM_SYSTEM.getName(), systemUserManager);
- sec.setRoleManager(new MgnlRoleManager());
- ComponentsTestUtil.setInstance(SecuritySupport.class, sec);
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-repository/indexing_configuration.xml 2013-10-28 10:25:04 UTC (rev 4434)
@@ -14,20 +14,14 @@
</analyzer>
</analyzers>
-
+
<index-rule nodeType="nt:hierarchyNode">
<property boost="10" useInExcerpt="false">title</property>
<property boost="1.0" useInExcerpt="true">text</property>
+ <property useInExcerpt="false" nodeScopeIndex="false" isRegexp="true">.*</property>
+ <property useInExcerpt="false" nodeScopeIndex="false" isRegexp="true">.*:.*</property>
</index-rule>
- <index-rule nodeType="mgnl:page">
- <property boost="10" useInExcerpt="false">title</property>
- <property boost="1.0" useInExcerpt="true">text</property>
- </index-rule>
- <index-rule nodeType="mgnl:component">
- <property boost="0.5" useInExcerpt="false">title</property>
- <property boost="1.0" useInExcerpt="true">text</property>
- </index-rule>
-
+
<!-- index text content on paragraphs -->
<!-- aggregates content on the main column -->
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/lifecycle/MediaModule.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -104,8 +104,11 @@
public void start(ModuleLifecycleContext ctx)
{
log.info("Starting module media");
- ctx.registerModuleObservingComponent("mediatypes", (ObservedManager) mediaConfigurationManager);
- version = ctx.getCurrentModuleDefinition().getVersion().toString();
+ if (ctx != null)
+ {
+ ctx.registerModuleObservingComponent("mediatypes", (ObservedManager) mediaConfigurationManager);
+ version = ctx.getCurrentModuleDefinition().getVersion().toString();
+ }
}
/**
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/repotests/MediaTests.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -22,6 +22,7 @@
import info.magnolia.cms.core.MgnlNodeType;
import info.magnolia.context.MgnlContext;
import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
@@ -30,6 +31,8 @@
import javax.jcr.Node;
import javax.jcr.Session;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.DefaultMediaConfigurationManager;
+import net.sourceforge.openutils.mgnlmedia.media.configuration.MediaConfigurationManager;
import net.sourceforge.openutils.mgnlmedia.media.utils.MediaLoadUtils;
import org.apache.commons.io.IOUtils;
@@ -41,9 +44,11 @@
* @author fgiust
* @version $Id$
*/
-@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"
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/test-repository/jackrabbit-test-configuration.xml", //
+repositoryConfig = "/test-repository/test-repositories.xml", //
+autostart = true, //
+bootstrapDirectory = {"/mgnl-bootstrap/media", "/mgnl-bootstrap/media-nooverwrite" })
+// , startModules = @ModuleConfiguration(name = "media", moduleclass = MediaModule.class))
public class MediaTests extends TestNgRepositoryTestcase
{
@@ -53,6 +58,7 @@
{
super.setUp();
// MgnlContext.getHierarchyManager("media").save();
+ ComponentsTestUtil.setImplementation(MediaConfigurationManager.class, DefaultMediaConfigurationManager.class);
}
@Test(enabled = true)
Modified: magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java 2013-10-22 20:13:36 UTC (rev 4433)
+++ magnoliamodules/trunk/openutils-mgnlmedia/src/test/java/net/sourceforge/openutils/mgnlmedia/media/utils/FileNode.java 2013-10-28 10:25:04 UTC (rev 4434)
@@ -19,912 +19,52 @@
package net.sourceforge.openutils.mgnlmedia.media.utils;
-import java.io.ByteArrayInputStream;
+import info.magnolia.test.mock.jcr.MockNode;
+import info.magnolia.test.mock.jcr.MockValue;
+
import java.io.IOException;
import java.io.InputStream;
-import java.math.BigDecimal;
-import java.util.Calendar;
-import javax.jcr.AccessDeniedException;
-import javax.jcr.Binary;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.InvalidLifecycleTransitionException;
-import javax.jcr.Item;
-import javax.jcr.ItemExistsException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.ItemVisitor;
-import javax.jcr.MergeException;
-import javax.jcr.NoSuchWorkspaceException;
import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.Property;
-import javax.jcr.PropertyIterator;
-import javax.jcr.ReferentialIntegrityException;
-import javax.jcr.RepositoryException;
-import javax.jcr.Session;
-import javax.jcr.UnsupportedRepositoryOperationException;
-import javax.jcr.Value;
-import javax.jcr.ValueFormatException;
-import javax.jcr.lock.Lock;
-import javax.jcr.lock.LockException;
-import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.NodeType;
-import javax.jcr.version.ActivityViolationException;
-import javax.jcr.version.Version;
-import javax.jcr.version.VersionException;
-import javax.jcr.version.VersionHistory;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.jackrabbit.value.BinaryImpl;
/**
* @author fgiust
* @version $Id: FileNodeData.java 4331 2013-09-20 12:38:39Z fgiust $
*/
-public class FileNode implements Node
+public class FileNode extends MockNode implements Node
{
- private byte[] content;
-
- private String extension;
-
/**
* @param classpathLocation
* @throws IOException
*/
public FileNode(String classpathLocation) throws IOException
{
+ super(StringUtils.substringAfterLast(classpathLocation, "/"));
InputStream is = getClass().getResourceAsStream(classpathLocation);
if (is == null)
{
throw new IllegalArgumentException("Classpath resource " + classpathLocation + " cannot be found");
}
+ String extension = StringUtils.substringAfterLast(classpathLocation, ".");
+ setProperty("extension", extension);
+
try
{
- extension = StringUtils.substringAfterLast(classpathLocation, ".");
-
- content = IOUtils.toByteArray(is);
+ byte[] byteArray = IOUtils.toByteArray(is);
+ setProperty("jcr:data", new MockValue(new BinaryImpl(byteArray)));
}
finally
{
IOUtils.closeQuietly(is);
}
- }
- /**
- * {@inheritDoc}
- */
- public String getAttribute(String key)
- {
- if (StringUtils.equals(key, "extension"))
- {
- return this.extension;
- }
- // TODO Auto-generated method stub
- return null;
}
- /**
- * {@inheritDoc}
- */
- public InputStream getStream()
- {
- return new ByteArrayInputStream(content);
- }
-
- /**
- * {@inheritDoc}
- */
- public String getPath() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getName() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Item getAncestor(int depth) throws ItemNotFoundException, AccessDeniedException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Node getParent() throws ItemNotFoundException, AccessDeniedException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getDepth() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- public Session getSession() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isNode()
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isNew()
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isModified()
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isSame(Item otherItem) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public void accept(ItemVisitor visitor) throws RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void save() throws AccessDeniedException, ItemExistsException, ConstraintViolationException,
- InvalidItemStateException, ReferentialIntegrityException, VersionException, LockException,
- NoSuchNodeTypeException, RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void refresh(boolean keepChanges) throws InvalidItemStateException, RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public void remove() throws VersionException, LockException, ConstraintViolationException, AccessDeniedException,
- RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public Node addNode(String relPath) throws ItemExistsException, PathNotFoundException, VersionException,
- ConstraintViolationException, LockException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Node addNode(String relPath, String primaryNodeTypeName) throws ItemExistsException, PathNotFoundException,
- NoSuchNodeTypeException, LockException, VersionException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public void orderBefore(String srcChildRelPath, String destChildRelPath)
- throws UnsupportedRepositoryOperationException, VersionException, ConstraintViolationException,
- ItemNotFoundException, LockException, RepositoryException
- {
- // TODO Auto-generated method stub
-
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, Value value) throws ValueFormatException, VersionException, LockException,
- ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, Value value, int type) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, Value[] values) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, Value[] values, int type) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, String[] values) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, String[] values, int type) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, String value) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, String value, int type) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, InputStream value) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, Binary value) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, boolean value) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, double value) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, BigDecimal value) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, long value) throws ValueFormatException, VersionException, LockException,
- ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, Calendar value) throws ValueFormatException, VersionException,
- LockException, ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property setProperty(String name, Node value) throws ValueFormatException, VersionException, LockException,
- ConstraintViolationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Node getNode(String relPath) throws PathNotFoundException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public NodeIterator getNodes() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public NodeIterator getNodes(String namePattern) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public NodeIterator getNodes(String[] nameGlobs) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Property getProperty(String relPath) throws PathNotFoundException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyIterator getProperties() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyIterator getProperties(String namePattern) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyIterator getProperties(String[] nameGlobs) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public Item getPrimaryItem() throws ItemNotFoundException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getUUID() throws UnsupportedRepositoryOperationException, RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public String getIdentifier() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public int getIndex() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyIterator getReferences() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyIterator getReferences(String name) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyIterator getWeakReferences() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public PropertyIterator getWeakReferences(String name) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasNode(String relPath) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasProperty(String relPath) throws RepositoryException
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasNodes() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean hasProperties() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return false;
- }
-
- /**
- * {@inheritDoc}
- */
- public NodeType getPrimaryNodeType() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public NodeType[] getMixinNodeTypes() throws RepositoryException
- {
- // TODO Auto-generated method stub
- return null;
- }
-
- /**
- * {@inheritDoc}
- */
- public boolean isNodeType(String nodeTypeName) throws RepositoryException
- {
- // TODO Auto-generate...
[truncated message content] |
