Menu
▾
▴
openutils-svn
|
From: <die...@us...> - 2012-04-06 13:29:31
|
Revision: 3919
http://openutils.svn.sourceforge.net/openutils/?rev=3919&view=rev
Author: diego_schivo
Date: 2012-04-06 13:29:21 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
anonymous
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
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 2012-04-06 13:19:58 UTC (rev 3918)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2012-04-06 13:29:21 UTC (rev 3919)
@@ -65,7 +65,10 @@
*
* @author dschivo
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.pets.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class AccessibleResultItemResultIteratorTest extends
TestNgRepositoryTestcase {
Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml 2012-04-06 13:29:21 UTC (rev 3919)
@@ -0,0 +1,588 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="anonymous" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:role</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-05-04T17:05:39.645+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-05-04T17:05:45.177+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2007-04-27T15:30:35.731+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="acl_dms">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>51db7d40-c71e-4933-bacc-d21f5f921754</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-06-22T11:02:19.959+09:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2b0e3d7f-b607-4b24-8b79-4b3c0d1615b3</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-06-22T11:02:19.962+09:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_uri">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>563cf8eb-9455-4785-8290-6f59036b3bc4</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:35.754+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1976d144-2a16-4ba4-bf62-1d9b25765fd5</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>0</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:35.756+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="00">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>42ac6ddc-3d4a-4747-b669-1ef5030b936e</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/.magnolia*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>0</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2008-06-21T11:54:45.262+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="01">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f7864413-4bba-4d8b-82a1-f8a8d313ab8c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/sample-lms.html</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-04-06T15:24:08.184+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_website">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>177f2f3e-f234-4129-8a34-db2810e2dd25</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:36.180+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>c31ce407-57ca-4eec-aa5b-a95bb18b0e41</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>0</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:36.181+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="00">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>4b45b571-aa3c-4132-b391-cb48e4690a87</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/sample-lms</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-04-06T15:24:08.181+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="01">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
+ <sv:value>mix:lockable</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e807f35f-392c-45f7-9945-20fc6f975ec7</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/sample-lms/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>0</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2012-04-06T15:24:08.183+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_users">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>7c9e151f-bd11-465f-bf3e-efe223146c5f</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:36.522+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_mgnlVersion">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>e17a88cc-b1d5-4be7-b4c4-b3da6a26ce45</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:36.692+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_config">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>04fb15de-091c-4486-ba3b-1bc80877a855</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:36.850+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_userroles">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>9ec74d72-db89-4de1-9347-71ca4c6a4255</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.017+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_mgnlSystem">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6d5d1a0b-b0e6-4ce0-9f4b-03a62e076981</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.117+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_Store">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f1c63218-b05d-41c4-a699-5a15b0f68317</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.283+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>6c1b4e6f-179a-498f-ab89-81fea9207b04</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.284+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_Expressions">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>fc6d875a-13d8-4551-b667-86db6cd486e8</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.543+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>1c8ca47b-5112-445a-b7b8-4aacdebfc59c</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.544+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_usergroups">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2f70a4ed-4519-49ad-88a2-f8e1fadcb829</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-27T15:30:37.797+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="acl_resources">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>be24a0c4-bd1b-478e-b980-9c536d31e3cb</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>99f5a6c4-96ce-4c21-b252-e9d5a42446bd</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="path" sv:type="String">
+ <sv:value>/*</sv:value>
+ </sv:property>
+ <sv:property sv:name="permissions" sv:type="Long">
+ <sv:value>8</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Added: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/users.system.anonymous.xml 2012-04-06 13:29:21 UTC (rev 3919)
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="anonymous" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:user</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>2d78094b-8f7e-4c95-8b1d-22e3dc417c34</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="language" sv:type="String">
+ <sv:value>en</sv:value>
+ </sv:property>
+ <sv:property sv:name="pswd" sv:type="String">
+ <sv:value>$2a$12$V19uaB7NAJbXpZMzNjkvZ.l1zwoTOpVe7V7loHz1LMjBnD80Py2DK</sv:value>
+ </sv:property>
+ <sv:property sv:name="title" sv:type="String">
+ <sv:value>anonymous</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activatorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2006-05-04T17:05:03.710+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastaction" sv:type="Date">
+ <sv:value>2006-05-04T17:06:54.122+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2007-04-19T10:20:08.554+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:template" sv:type="String">
+ <sv:value/>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="groups">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>f0a15b82-9f33-406b-ad22-f3a88324954b</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2007-04-19T10:20:08.561+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="roles">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:contentNode</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:uuid" sv:type="String">
+ <sv:value>0ea2a469-5f64-49e4-a4ab-ef453ca88247</sv:value>
+ </sv:property>
+ <sv:property sv:name="0" sv:type="String">
+ <sv:value>d98728c7-b80f-444d-bfda-b54b28dc240c</sv:value>
+ </sv:property>
+ <sv:property sv:name="00" sv:type="String">
+ <sv:value>a106b4cf-d205-418c-acf3-27263612f5a4</sv:value>
+ </sv:property>
+ <sv:property sv:name="01" sv:type="String">
+ <sv:value>0e008dcd-3412-47fe-ab91-a1a1b3c38baa</sv:value>
+ </sv:property>
+ <sv:property sv:name="02" sv:type="String">
+ <sv:value>cf760801-f21e-4548-af47-e21cf9c4317a</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ <...
[truncated message content] |
|
From: <die...@us...> - 2012-04-06 15:14:43
|
Revision: 3926
http://openutils.svn.sourceforge.net/openutils/?rev=3926&view=rev
Author: diego_schivo
Date: 2012-04-06 14:28:06 +0000 (Fri, 06 Apr 2012)
Log Message:
-----------
criteria 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/CorrectElementsWithoutMaxResults.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/userroles.anonymous.xml
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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -19,8 +19,14 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
+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;
@@ -47,7 +53,10 @@
* @author dschivo
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.Criteria.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.Criteria.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class BasePathTest extends TestNgRepositoryTestcase
{
@@ -75,6 +84,12 @@
// ----------- MagnoliaCriteriaWithLimitImpl
// ------- AdvancedCriteriaImpl
MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save();
+
+ // 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);
}
/**
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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -19,8 +19,14 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
+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.AdvancedResult;
@@ -40,7 +46,10 @@
* @author dschivo
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class BasePathWithSpacesTest extends TestNgRepositoryTestcase
{
@@ -57,6 +66,12 @@
// - Lorem ipsum dolor sit amet
// --- consectetur adipisici elit
MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save();
+
+ // 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);
}
/**
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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -21,6 +21,11 @@
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;
@@ -48,7 +53,10 @@
* @author fgiust
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.contains.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class Content2BeanTest extends TestNgRepositoryTestcase
{
@@ -65,6 +73,12 @@
MgnlContext.getHierarchyManager(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);
}
@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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -19,8 +19,14 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
+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.AdvancedResult;
@@ -40,7 +46,10 @@
* @author dschivo
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.myproject.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.myproject.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class FirstDigitEscapeTest extends TestNgRepositoryTestcase
{
@@ -55,6 +64,12 @@
super.setUp();
MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save();
+
+ // 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);
}
@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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -21,6 +21,11 @@
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;
@@ -50,7 +55,10 @@
* @author dschivo
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.contains.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase
{
@@ -75,6 +83,12 @@
MgnlContext.getHierarchyManager(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);
}
@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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -22,6 +22,11 @@
import info.magnolia.cms.core.HierarchyManager;
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;
@@ -45,7 +50,10 @@
* @author dschivo
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.contains.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.contains.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase
{
@@ -70,6 +78,12 @@
MgnlContext.getHierarchyManager(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);
}
@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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -21,6 +21,11 @@
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;
@@ -42,7 +47,10 @@
* Tests pagination in criteria queries.
* @author fnecci
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.letters.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.letters.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class OrderingTest extends TestNgRepositoryTestcase
{
@@ -98,6 +106,12 @@
MgnlContext.getHierarchyManager(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);
}
/**
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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -21,6 +21,11 @@
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;
@@ -43,7 +48,10 @@
* Tests pagination in criteria queries.
* @author dschivo
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.letters.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.letters.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class PaginationTest extends TestNgRepositoryTestcase
{
@@ -69,6 +77,12 @@
MgnlContext.getHierarchyManager(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);
}
/**
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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -20,8 +20,16 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.Content;
+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;
@@ -42,7 +50,10 @@
* @author fgiust
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.00000.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase
{
@@ -57,6 +68,14 @@
super.setUp();
MgnlContext.getHierarchyManager(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);
}
@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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -20,8 +20,16 @@
package net.sourceforge.openutils.mgnlcriteria.advanced;
import info.magnolia.cms.core.Content;
+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;
@@ -45,7 +53,10 @@
* @author lbrindisi
* @version $Id$
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.00000.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.00000.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class XpathEscapeTest extends TestNgRepositoryTestcase
{
@@ -59,6 +70,14 @@
super.setUp();
MgnlContext.getHierarchyManager(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);
}
@Test
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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -23,8 +23,14 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
import info.magnolia.cms.core.ItemType;
+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;
@@ -39,7 +45,10 @@
/**
* @author carlo
*/
-@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = "/crit-bootstrap/website.pets.xml")
+@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
+ "/crit-bootstrap/website.pets.xml",
+ "/crit-bootstrap/userroles.anonymous.xml",
+ "/crit-bootstrap/users.system.anonymous.xml" })
public class CorrectElementsWithoutMaxResults extends TestNgRepositoryTestcase
{
@@ -72,6 +81,12 @@
// ************************************************************
// total 13 pets
MgnlContext.getHierarchyManager(RepositoryConstants.WEBSITE).save();
+
+ // 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);
}
@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 2012-04-06 14:05:47 UTC (rev 3925)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2012-04-06 14:28:06 UTC (rev 3926)
@@ -22,9 +22,17 @@
import info.magnolia.cms.core.Content;
import info.magnolia.cms.core.HierarchyManager;
import info.magnolia.cms.core.ItemType;
+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.cms.util.NodeDataUtil;
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;
@@ -44,7 +52,10 @@
* @author dschivo
* @version $Id$
*/
-@Rep...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-20 19:08:53
|
Revision: 4417
http://openutils.svn.sourceforge.net/openutils/?rev=4417&view=rev
Author: fgiust
Date: 2013-10-20 19:08:45 +0000 (Sun, 20 Oct 2013)
Log Message:
-----------
reduce logging
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/log4j.xml
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.auditLogging.xml
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/config.server.i18n.content.xml
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -59,7 +59,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.Criteria.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class BasePathTest extends TestNgRepositoryTestcase
{
@@ -189,7 +191,7 @@
criteria.add(Restrictions.eq("@title", title));
}
AdvancedResult advResult = criteria.execute();
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
List<String> paths = new ArrayList<String>();
while (items.hasNext())
{
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -52,7 +52,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.Lorem ipsum dolor sit amet.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class BasePathWithSpacesTest extends TestNgRepositoryTestcase
{
@@ -85,9 +87,9 @@
{
Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(RepositoryConstants.WEBSITE);
criteria.setBasePath("/Lorem ipsum dolor sit amet");
- criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, MgnlNodeType.NT_PAGE ));
+ criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, MgnlNodeType.NT_PAGE));
AdvancedResult advResult = criteria.execute();
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Assert.assertTrue(items.hasNext());
Assert.assertEquals(items.next().getName(), "consectetur adipisici elit");
}
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -59,7 +59,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.contains.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class Content2BeanTest extends TestNgRepositoryTestcase
{
@@ -97,7 +99,7 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
Assert.assertEquals(CriteriaTestUtils.path(item), "/contains/lorem-ipsum");
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -52,7 +52,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.myproject.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class FirstDigitEscapeTest extends TestNgRepositoryTestcase
{
@@ -85,7 +87,7 @@
AdvancedResult advResult = criteria.execute();
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertTrue(resultIterator.hasNext());
Assert.assertEquals(CriteriaTestUtils.name(resultIterator.next()), "ceb55065-e6cd-451a-8ce0-7e495e7e8fbc");
}
@@ -100,7 +102,7 @@
AdvancedResult advResult = criteria.execute();
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertFalse(resultIterator.hasNext());
}
@@ -114,7 +116,7 @@
AdvancedResult advResult = criteria.execute();
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertFalse(resultIterator.hasNext());
}
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -61,7 +61,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.contains.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class JcrContainsCriteriaSearchTest extends TestNgRepositoryTestcase
{
@@ -101,7 +103,7 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
}
@@ -113,7 +115,7 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "lorem");
}
@@ -125,7 +127,7 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 2);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
List<String> titles = new ArrayList<String>();
while (items.hasNext())
{
@@ -146,7 +148,7 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 2);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
List<String> titles = new ArrayList<String>();
while (items.hasNext())
{
@@ -176,7 +178,7 @@
}
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "hello test? world");
}
@@ -200,7 +202,7 @@
}
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "hello te?st world");
}
@@ -225,7 +227,7 @@
}
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "hello \"Milano\" world");
}
@@ -249,7 +251,7 @@
}
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<? extends Node> items = advResult.getItems();
+ ResultIterator< ? extends Node> items = advResult.getItems();
Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "hello l:u");
}
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -54,7 +54,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.contains.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class JcrContainsQuestionMarkTest extends TestNgRepositoryTestcase
{
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -54,7 +54,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.letters.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class OrderingTest extends TestNgRepositoryTestcase
{
@@ -133,7 +135,7 @@
Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length);
int i = 0;
@@ -164,7 +166,7 @@
Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH, "Wrong iterator size.");
int i = 0;
@@ -263,7 +265,7 @@
Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length - offset, "Wrong iterator size.");
int i = 0;
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -55,7 +55,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.letters.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class PaginationTest extends TestNgRepositoryTestcase
{
@@ -104,7 +106,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 26);
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "A");
@@ -153,7 +155,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "J");
Assert.assertEquals(resultIterator.getSize(), 17);
@@ -175,7 +177,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 10);
Node content = null;
@@ -202,7 +204,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 5);
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "K");
@@ -228,7 +230,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 2);
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "Y");
@@ -252,7 +254,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
Assert.assertEquals(advResult.getNumberOfPages(), 6);
- ResultIterator<? extends Node> resultIterator = advResult.getItems();
+ ResultIterator< ? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 5);
}
}
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -54,7 +54,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.00000.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class ScoreAnalizerAndSortTest extends TestNgRepositoryTestcase
{
@@ -103,7 +105,7 @@
CriteriaTestUtils.assertNumOfResults(3, result, "fagiano");
- ResultIterator<? extends Node> iterator = advResult.getItems();
+ ResultIterator< ? extends Node> iterator = advResult.getItems();
Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore() > ((AdvancedResultItem) iterator.next())
.getScore());
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -58,7 +58,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.00000.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class XpathEscapeTest extends TestNgRepositoryTestcase
{
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -61,7 +61,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.pets.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class AccessibleResultItemResultIteratorTest extends TestNgRepositoryTestcase
{
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/CorrectElementsWithoutMaxResults.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -48,7 +48,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.pets.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class CorrectElementsWithoutMaxResults extends TestNgRepositoryTestcase
{
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-20 19:03:16 UTC (rev 4416)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2013-10-20 19:08:45 UTC (rev 4417)
@@ -57,7 +57,9 @@
@RepositoryTestConfiguration(jackrabbitRepositoryConfig = "/crit-repository/jackrabbit-test-configuration.xml", repositoryConfig = "/crit-repository/test-repositories.xml", bootstrapFiles = {
"/crit-bootstrap/website.pets.xml",
"/crit-bootstrap/userroles.anonymous.xml",
- "/crit-bootstrap/users.system.anonymous.xml" })
+ "/crit-bootstrap/users.system.anonymous.xml",
+ "/crit-bootstrap/config.server.auditLogging.xml",
+ "/crit-bootstrap/config.server.i18n.content.xml" })
public class CriteriaTest extends TestNgRepositoryTestcase
{
@@ -164,7 +166,7 @@
.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_PAGE))
.add(Restrictions.eq("@title", "Pets"));
AdvancedResult result = criteria.execute();
- ResultIterator<? extends Node> iterator = result.getItems();
+ ResultIterator< ? extends Node> iterator = result.getItems();
Assert.assertTrue(iterator.hasNext());
Node resultNode = iterator.next();
Assert.assertEquals(CriteriaTestUtils.title(resultNode), "Pets");
@@ -182,7 +184,7 @@
AdvancedResult result = criteria.execute();
Assert.assertEquals(result.getTotalSize(), 1);
- ResultIterator<? extends Node> iterator = result.getItems();
+ ResultIterator< ? extends Node> iterator = result.getItems();
Assert.assertEquals(iterator.getSize(), 1);
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
}
@@ -242,7 +244,7 @@
// --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
Assert.assertEquals(result.getTotalSize(), 8);
- ResultIterator<? extends Node> iterator = result.getItems();
+ ResultIterator< ? extends Node> iterator = result.getItems();
Assert.assertEquals(iterator.getSize(), 3);
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "1");
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "5");
@@ -282,7 +284,7 @@
// --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
Assert.assertEquals(result.getTotalSize(), 8);
- ResultIterator<? extends Node> iterator = result.getItems();
+ ResultIterator< ? extends Node> iterator = result.getItems();
Assert.assertEquals(iterator.getSize(), 3);
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "1");
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "5");
@@ -297,7 +299,7 @@
public void testAddOrder() throws Exception
{
Criteria criteria;
- ResultIterator<? extends Node> iterator;
+ ResultIterator< ? extends Node> iterator;
Calendar birthDate;
// gets the oldest pet (ascending order)
@@ -342,7 +344,7 @@
public void testAddOrderMultiple() throws Exception
{
Criteria criteria;
- ResultIterator<? extends Node> iterator;
+ ResultIterator< ? extends Node> iterator;
// order by @birthDate ascending, @title ascending
criteria = JCRCriteriaFactory
@@ -381,7 +383,7 @@
public void testDateComparison() throws Exception
{
Criteria criteria;
- ResultIterator<? extends Node> iterator;
+ ResultIterator< ? extends Node> iterator;
Node node;
Calendar date;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/EscapeSignTest.java
=======================================================...
[truncated message content] |
|
From: <fg...@us...> - 2013-10-21 09:33:47
|
Revision: 4422
http://openutils.svn.sourceforge.net/openutils/?rev=4422&view=rev
Author: fgiust
Date: 2013-10-21 09:33:43 +0000 (Mon, 21 Oct 2013)
Log Message:
-----------
fix nodetypes in tests
Modified Paths:
--------------
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/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/XpathEscapeTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml
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-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-10-21 09:33:43 UTC (rev 4422)
@@ -104,11 +104,11 @@
Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
Assert.assertEquals(CriteriaTestUtils.path(item), "/contains/lorem-ipsum");
- // this is also a Map!
- Assert.assertEquals(((Map<String, Object>) item).get("title"), "lorem ipsum");
- Assert.assertEquals(((Map<String, Object>) item).get("text"), "ohoh");
- Assert.assertEquals(((Map<String, Object>) item).get("number").toString(), "5");
- Assert.assertEquals(((Map<String, Object>) item).get("handle"), "/contains/lorem-ipsum");
+ // not a Map anymore, now that we implement Node and not ContentMap!
+ // Assert.assertEquals(((Map<String, Object>) item).get("title"), "lorem ipsum");
+ // Assert.assertEquals(((Map<String, Object>) item).get("text"), "ohoh");
+ // Assert.assertEquals(((Map<String, Object>) item).get("number").toString(), "5");
+ // Assert.assertEquals(((Map<String, Object>) item).get("handle"), "/contains/lorem-ipsum");
ResultIterator<Page> itemsTransformed = advResult.getItems(Page.class);
Assert.assertNotNull(itemsTransformed);
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-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-10-21 09:33:43 UTC (rev 4422)
@@ -166,7 +166,7 @@
Criteria criteria = criteria(textEnteredByUser, true);
Assert.assertEquals(
StringUtils.remove(criteria.toXpathExpression(), ' '),
- "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'test\\?')))]orderby@jcr:scoredescending");
+ "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'test\\?')))]orderby@jcr:scoredescending");
AdvancedResult advResult = null;
try
{
@@ -190,7 +190,7 @@
Criteria criteria = criteria(textEnteredByUser, true);
Assert.assertEquals(
StringUtils.remove(criteria.toXpathExpression(), ' '),
- "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'te\\?st')))]orderby@jcr:scoredescending");
+ "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'te\\?st')))]orderby@jcr:scoredescending");
AdvancedResult advResult = null;
try
{
@@ -215,7 +215,7 @@
Assert
.assertEquals(
StringUtils.remove(criteria.toXpathExpression(), ' '),
- "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'\\\"Milano\\\"')))]orderby@jcr:scoredescending");
+ "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'\\\"Milano\\\"')))]orderby@jcr:scoredescending");
AdvancedResult advResult = null;
try
{
@@ -239,7 +239,7 @@
Criteria criteria = criteria(textEnteredByUser, true);
Assert.assertEquals(
StringUtils.remove(criteria.toXpathExpression(), ' '),
- "//*[((@jcr:primaryType='mgnl:content')and(jcr:contains(@title,'l\\:u')))]orderby@jcr:scoredescending");
+ "//*[((@jcr:primaryType='mgnl:page')and(jcr:contains(@title,'l\\:u')))]orderby@jcr:scoredescending");
AdvancedResult advResult = null;
try
{
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-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-10-21 09:33:43 UTC (rev 4422)
@@ -98,7 +98,7 @@
AdvancedResultImpl advResult = null;
try
{
- String stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'test?')))] order by @jcr:score";
+ String stmt = "//*[((@jcr:primaryType='mgnl:page') and (jcr:contains(@title,'test?')))] order by @jcr:score";
advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, 10, 0, null, false);
}
catch (JCRQueryException e)
@@ -120,7 +120,7 @@
{
Session hm = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE);
- String stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'test\\?')))] order by @jcr:score";
+ String stmt = "//*[((@jcr:primaryType='mgnl:page') and (jcr:contains(@title,'test\\?')))] order by @jcr:score";
AdvancedResultImpl advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
Assert.assertEquals(advResult.getTotalSize(), 1);
@@ -135,11 +135,11 @@
String stmt;
AdvancedResultImpl advResult;
- stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'te?st')))] order by @jcr:score";
+ stmt = "//*[((@jcr:primaryType='mgnl:page') and (jcr:contains(@title,'te?st')))] order by @jcr:score";
advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
Assert.assertEquals(advResult.getTotalSize(), 0);
- stmt = "//*[((@jcr:primaryType='mgnl:content') and (jcr:contains(@title,'te\\?st')))] order by @jcr:score";
+ stmt = "//*[((@jcr:primaryType='mgnl:page') and (jcr:contains(@title,'te\\?st')))] order by @jcr:score";
advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
Assert.assertEquals(advResult.getTotalSize(), 1);
Assert.assertEquals(CriteriaTestUtils.title(advResult.getItems().next()), "hello te?st world");
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-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-10-21 09:33:43 UTC (rev 4422)
@@ -262,7 +262,7 @@
Assert.assertEquals(
criteria.toXpathExpression(),
- "//*[( (@jcr:primaryType='mgnl:content') and ( jcr:contains(@title, '\\(ai\\)\\(n\\)\\(uk\\)') ) )] ");
+ "//*[( (@jcr:primaryType='mgnl:page') and ( jcr:contains(@title, '\\(ai\\)\\(n\\)\\(uk\\)') ) )] ");
try
{
@@ -323,7 +323,7 @@
Assert.assertEquals(
criteria.toXpathExpression(),
- "//*[( (@jcr:primaryType='mgnl:content') and ( jcr:contains(@title, '\\:') ) )] ");
+ "//*[( (@jcr:primaryType='mgnl:page') and ( jcr:contains(@title, '\\:') ) )] ");
AdvancedResult advResult = criteria.execute();
Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
@@ -379,7 +379,7 @@
Assert.assertEquals(
criteria.toXpathExpression(),
- "//*[( (@jcr:primaryType='mgnl:content') and ( jcr:contains(@title, '\"OR\" SONO') ) )] ");
+ "//*[( (@jcr:primaryType='mgnl:page') and ( jcr:contains(@title, '\"OR\" SONO') ) )] ");
AdvancedResult advResult = criteria.execute();
CriteriaTestUtils.assertNumOfResults(1, CriteriaTestUtils.collectCollectionFromResult(advResult), searchText);
@@ -397,7 +397,7 @@
Assert.assertEquals(
criteria.toXpathExpression(),
- "//*[( (@jcr:primaryType='mgnl:content') and (@title='OR SONO') )] ");
+ "//*[( (@jcr:primaryType='mgnl:page') and (@title='OR SONO') )] ");
AdvancedResult advResult = criteria.execute();
CriteriaTestUtils.assertNumOfResults(1, CriteriaTestUtils.collectCollectionFromResult(advResult), searchText);
@@ -415,7 +415,7 @@
Assert.assertEquals(
criteria.toXpathExpression(),
- "//*[( (@jcr:primaryType='mgnl:content') and ( jcr:contains(@title, 'AND ME') ) )] ");
+ "//*[( (@jcr:primaryType='mgnl:page') and ( jcr:contains(@title, 'AND ME') ) )] ");
AdvancedResult advResult = criteria.execute();
CriteriaTestUtils.assertNumOfResults(0, CriteriaTestUtils.collectCollectionFromResult(advResult), searchText);
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml 2013-10-21 09:32:12 UTC (rev 4421)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/resources/log4j.xml 2013-10-21 09:33:43 UTC (rev 4422)
@@ -34,6 +34,12 @@
<category name="info.magnolia.objectfactory.ObservedComponentFactory">
<priority value="WARN" />
</category>
+ <category name="info.magnolia.cms.security.PermissionUtil">
+ <priority value="ERROR" />
+ </category>
+ <!-- <category name="org.apache.jackrabbit.core.session.SessionState">
+ <priority value="ERROR" />
+ </category> -->
<root>
<priority value="ALL" />
<appender-ref ref="test-appender" />
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X