From: <die...@us...> - 2013-06-27 09:50:55
|
Revision: 4271 http://openutils.svn.sourceforge.net/openutils/?rev=4271&view=rev Author: diego_schivo Date: 2013-06-27 09:50:51 +0000 (Thu, 27 Jun 2013) Log Message: ----------- Merged revisions 4270 via svnmerge from svn+ssh://die...@sv.../p/openutils/code/magnoliamodules/trunk ........ r4270 | diego_schivo | 2013-06-27 11:47:50 +0200 (Thu, 27 Jun 2013) | 1 line CRIT-54 unit-test + fix ........ Revision Links: -------------- http://openutils.svn.sourceforge.net/openutils/?rev=4270&view=rev Removed Paths: ------------- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java Property Changed: ---------------- magnoliamodules/branches/magnolia44/ Index: magnoliamodules/branches/magnolia44 =================================================================== --- magnoliamodules/branches/magnolia44 2013-06-27 09:47:50 UTC (rev 4270) +++ magnoliamodules/branches/magnolia44 2013-06-27 09:50:51 UTC (rev 4271) Property changes on: magnoliamodules/branches/magnolia44 ___________________________________________________________________ Modified: svnmerge-integrated ## -1 +1 ## -/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268 +/magnoliamodules/trunk:1-3778,4049-4053,4264-4266,4268,4270 \ No newline at end of property Deleted: magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java =================================================================== --- magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java 2013-06-27 09:47:50 UTC (rev 4270) +++ magnoliamodules/branches/magnolia44/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/DegreeSignTest.java 2013-06-27 09:50:51 UTC (rev 4271) @@ -1,98 +0,0 @@ -/** - * - * Criteria API for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcriteria.html) - * Copyright(C) 2009-2013, Openmind S.r.l. http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package net.sourceforge.openutils.mgnlcriteria.jcr.query; - -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 javax.jcr.Node; - -import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions; -import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils; - -import org.testng.Assert; -import org.testng.annotations.BeforeClass; -import org.testng.annotations.Test; - - -/** - * CRIT-53 - * @author dschivo - */ -@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = { - "/crit-bootstrap/website.n°-21.xml", - "/crit-bootstrap/userroles.anonymous.xml", - "/crit-bootstrap/users.system.anonymous.xml" }) -public class DegreeSignTest extends TestNgRepositoryTestcase -{ - - /** - * {@inheritDoc} - */ - @Override - @BeforeClass - public void setUp() throws Exception - { - super.setUp(); - - // Nodes in this workspace: - // - n°-21 (title=n°-21) - // --- foo (title=foo) - MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save(); - - ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport()); - - // info.magnolia.cms.security.SecurityTest.setUp() - final SecuritySupportImpl sec = new SecuritySupportImpl(); - sec.addUserManager(Realm.REALM_SYSTEM.getName(), new SystemUserManager()); - sec.setRoleManager(new MgnlRoleManager()); - ComponentsTestUtil.setInstance(SecuritySupport.class, sec); - } - - /** - * @throws Exception - */ - @Test - public void testEscape() throws Exception - { - Criteria criteria = JCRCriteriaFactory - .createCriteria() - .setWorkspace(RepositoryConstants.WEBSITE) - .setBasePath("/jcr:root/n°-21/*") - .add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT)); - AdvancedResult result = criteria.execute(); - ResultIterator< ? extends Node> iterator = result.getItems(); - Assert.assertTrue(iterator.hasNext()); - Node resultNode = iterator.next(); - Assert.assertEquals(CriteriaTestUtils.title(resultNode), "foo"); - } - -} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |