[Openutils-svn] SF.net SVN: openutils:[2958] trunk/openutils-mgnlcriteria/src/test

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

Revision: 2958
          http://openutils.svn.sourceforge.net/openutils/?rev=2958&view=rev
Author:   fgiust
Date:     2010-08-31 15:51:03 +0000 (Tue, 31 Aug 2010)

Log Message:
-----------
added an additional unit test

Modified Paths:
--------------
    trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
    trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml

Modified: trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2010-08-31 15:44:42 UTC (rev 2957)
+++ trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java	2010-08-31 15:51:03 UTC (rev 2958)
@@ -366,6 +366,24 @@
     }
 
     @Test
+    public void testEscapeOrKeywordWithEqual() throws Exception
+    {
+        String searchText = "OR SONO";
+        Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(ContentRepository.WEBSITE);
+        criteria.setBasePath(StringUtils.EMPTY);
+        criteria.add(Restrictions.eq("@jcr:primaryType", "mgnl:content"));
+        criteria.add(Restrictions.eq("@title", searchText));
+
+        Assert.assertEquals(
+            criteria.toXpathExpression(),
+            "//*[( (@jcr:primaryType='mgnl:content')  and  (@title='OR SONO')  )] ");
+
+        AdvancedResult advResult = criteria.execute();
+        CriteriaTestUtils.assertNumOfResults(1, CriteriaTestUtils.collectCollectionFromResult(advResult), searchText);
+
+    }
+
+    @Test
     public void testEscapeAndKeyword() throws Exception
     {
         String searchText = "AND ME";

Modified: trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml
===================================================================
--- trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml	2010-08-31 15:44:42 UTC (rev 2957)
+++ trunk/openutils-mgnlcriteria/src/test/resources/crit-bootstrap/website.00000.xml	2010-08-31 15:51:03 UTC (rev 2958)
@@ -4115,7 +4115,7 @@
       <sv:value>2010-02-05T13:01:35.001+01:00</sv:value>
     </sv:property>
     <sv:property sv:name="title" sv:type="String">
-      <sv:value> OR SONO</sv:value>
+      <sv:value>OR SONO</sv:value>
     </sv:property>
     <sv:property sv:name="urlMappingId" sv:type="String">
       <sv:value>1072721</sv:value>


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