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

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

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.