Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4242] magnoliamodules/trunk/openutils-mgnlcriteria/ src
|
From: <fg...@us...> - 2013-05-19 14:48:32
|
Revision: 4242
http://openutils.svn.sourceforge.net/openutils/?rev=4242&view=rev
Author: fgiust
Date: 2013-05-19 14:48:28 +0000 (Sun, 19 May 2013)
Log Message:
-----------
use plain "javax.jcr.Node"s when possible
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
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/jcr/query/CriteriaTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIterator.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -25,6 +25,7 @@
import java.util.NoSuchElementException;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.query.RowIterator;
@@ -84,7 +85,7 @@
{
if (!PermissionUtil.isGranted(
next.getSession().getWorkspace().getName(),
- NodeUtil.getPathIfPossible(next.getJCRNode()),
+ NodeUtil.getPathIfPossible(next),
Session.ACTION_READ))
{
next = null;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultImpl.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -19,11 +19,10 @@
package net.sourceforge.openutils.mgnlcriteria.advanced.impl;
-import info.magnolia.content2bean.Content2BeanException;
-import info.magnolia.content2bean.Content2BeanUtil;
import info.magnolia.jcr.RuntimeRepositoryException;
import javax.jcr.Item;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
import javax.jcr.query.InvalidQueryException;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AdvancedResultItemResultIterator.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -22,6 +22,7 @@
import info.magnolia.cms.security.AccessDeniedException;
import javax.jcr.Item;
+import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.query.Row;
import javax.jcr.query.RowIterator;
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/main/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/AdvancedResult.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -21,7 +21,9 @@
import java.util.Iterator;
+import javax.jcr.Node;
+
/**
* The result of a jcr query. You can access to the actual result items using getItems(). This bean will also give you
* information about the total number of available items, the current page number, the total number of pages.
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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -34,8 +34,9 @@
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -187,7 +188,7 @@
criteria.add(Restrictions.eq("@title", title));
}
AdvancedResult advResult = criteria.execute();
- ResultIterator<AdvancedResultItem> 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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/BasePathWithSpacesTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -29,8 +29,10 @@
import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -84,7 +86,7 @@
criteria.setBasePath("/Lorem ipsum dolor sit amet");
criteria.add(Restrictions.eq(Criterion.JCR_PRIMARYTYPE, "mgnl:content"));
AdvancedResult advResult = criteria.execute();
- ResultIterator<AdvancedResultItem> 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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/Content2BeanTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -34,8 +34,9 @@
import java.util.Map;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -95,8 +96,8 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
- AdvancedResultItem item = items.next();
+ 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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/FirstDigitEscapeTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -29,8 +29,10 @@
import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -83,7 +85,7 @@
AdvancedResult advResult = criteria.execute();
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertTrue(resultIterator.hasNext());
Assert.assertEquals(CriteriaTestUtils.name(resultIterator.next()), "ceb55065-e6cd-451a-8ce0-7e495e7e8fbc");
}
@@ -98,7 +100,7 @@
AdvancedResult advResult = criteria.execute();
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertFalse(resultIterator.hasNext());
}
@@ -112,7 +114,7 @@
AdvancedResult advResult = criteria.execute();
- ResultIterator<AdvancedResultItem> 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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsCriteriaSearchTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -36,6 +36,8 @@
import java.util.Collections;
import java.util.List;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -99,8 +101,8 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
- AdvancedResultItem item = items.next();
+ ResultIterator<? extends Node> items = advResult.getItems();
+ Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "lorem ipsum");
}
@@ -111,8 +113,8 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
- AdvancedResultItem item = items.next();
+ ResultIterator<? extends Node> items = advResult.getItems();
+ Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "lorem");
}
@@ -123,7 +125,7 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 2);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
+ ResultIterator<? extends Node> items = advResult.getItems();
List<String> titles = new ArrayList<String>();
while (items.hasNext())
{
@@ -144,7 +146,7 @@
AdvancedResult advResult = criteria.execute();
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 2);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
+ ResultIterator<? extends Node> items = advResult.getItems();
List<String> titles = new ArrayList<String>();
while (items.hasNext())
{
@@ -174,8 +176,8 @@
}
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
- AdvancedResultItem item = items.next();
+ ResultIterator<? extends Node> items = advResult.getItems();
+ Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "hello test? world");
}
@@ -198,8 +200,8 @@
}
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
- AdvancedResultItem item = items.next();
+ ResultIterator<? extends Node> items = advResult.getItems();
+ Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "hello te?st world");
}
@@ -223,8 +225,8 @@
}
Assert.assertNotNull(advResult);
Assert.assertEquals(advResult.getTotalSize(), 1);
- ResultIterator<AdvancedResultItem> items = advResult.getItems();
- AdvancedResultItem item = items.next();
+ ResultIterator<? extends Node> items = advResult.getItems();
+ Node item = items.next();
Assert.assertEquals(CriteriaTestUtils.title(item), "hello \"Milano\" world");
}
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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/JcrContainsQuestionMarkTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -38,6 +38,7 @@
import net.sourceforge.openutils.mgnlcriteria.advanced.impl.AdvancedResultImpl;
import net.sourceforge.openutils.mgnlcriteria.advanced.impl.QueryExecutorHelper;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRQueryException;
+import net.sourceforge.openutils.mgnlcriteria.tests.CriteriaTestUtils;
import org.testng.Assert;
import org.testng.annotations.BeforeClass;
@@ -121,7 +122,7 @@
AdvancedResultImpl advResult = QueryExecutorHelper.execute(stmt, Query.XPATH, hm, -1, 0, null, false);
Assert.assertEquals(advResult.getTotalSize(), 1);
- Assert.assertEquals(advResult.getItems().next().getTitle(), "hello test? world");
+ Assert.assertEquals(CriteriaTestUtils.title(advResult.getItems().next()), "hello test? world");
}
@SuppressWarnings("deprecation")
@@ -139,6 +140,6 @@
stmt = "//*[((@jcr:primaryType='mgnl:content') 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(advResult.getItems().next().getTitle(), "hello te?st world");
+ Assert.assertEquals(CriteriaTestUtils.title(advResult.getItems().next()), "hello te?st world");
}
}
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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/OrderingTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -31,8 +31,10 @@
import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -130,11 +132,11 @@
Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length);
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length);
int i = 0;
- for (AdvancedResultItem currentResult : resultIterator)
+ for (Node currentResult : resultIterator)
{
Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i]);
i++;
@@ -161,11 +163,11 @@
Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), PAGINATION_LENGTH, "Wrong iterator size.");
int i = 0;
- for (AdvancedResultItem currentResult : resultIterator)
+ for (Node currentResult : resultIterator)
{
Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i], "Position "
+ i
@@ -183,7 +185,7 @@
// check that hasNext doesn't change the result of getPosition()
while (resultIterator.hasNext() && resultIterator.hasNext() && resultIterator.hasNext())
{
- AdvancedResultItem currentResult = resultIterator.next();
+ Node currentResult = resultIterator.next();
Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i], "Position "
+ i
+ ": found "
@@ -260,11 +262,11 @@
Assert.assertEquals(advResult.getTotalSize(), LETTERS_ARRAY.length, "Unset total size.");
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), LETTERS_ARRAY.length - offset, "Wrong iterator size.");
int i = 0;
- for (AdvancedResultItem currentResult : resultIterator)
+ for (Node currentResult : resultIterator)
{
Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i + offset], "Position "
+ i
@@ -282,7 +284,7 @@
// check that hasNext doesn't change the result of getPosition()
while (resultIterator.hasNext() && resultIterator.hasNext() && resultIterator.hasNext())
{
- AdvancedResultItem currentResult = resultIterator.next();
+ Node currentResult = resultIterator.next();
Assert.assertEquals(CriteriaTestUtils.title(currentResult), LETTERS_ARRAY[i + offset], "Position "
+ i
+ ": found "
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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/PaginationTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -31,8 +31,10 @@
import info.magnolia.test.ComponentsTestUtil;
import it.openutils.mgnlutils.test.RepositoryTestConfiguration;
import it.openutils.mgnlutils.test.TestNgRepositoryTestcase;
+
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -101,12 +103,12 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 26);
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "A");
- AdvancedResultItem content = null;
+ Node content = null;
while (resultIterator.hasNext())
{
content = resultIterator.next();
@@ -125,7 +127,7 @@
int count = 0;
- for (AdvancedResultItem content : advResult.getItems())
+ for (Node content : advResult.getItems())
{
Assert.assertNotNull(content);
count++;
@@ -150,7 +152,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "J");
Assert.assertEquals(resultIterator.getSize(), 17);
@@ -172,10 +174,10 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 10);
- AdvancedResultItem content = null;
+ Node content = null;
while (resultIterator.hasNext())
{
content = resultIterator.next();
@@ -199,7 +201,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 5);
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "K");
@@ -225,7 +227,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
- ResultIterator<AdvancedResultItem> resultIterator = advResult.getItems();
+ ResultIterator<? extends Node> resultIterator = advResult.getItems();
Assert.assertEquals(resultIterator.getSize(), 2);
Assert.assertEquals(CriteriaTestUtils.title(resultIterator.next()), "Y");
@@ -249,7 +251,7 @@
Assert.assertEquals(advResult.getTotalSize(), 26);
Assert.assertEquals(advResult.getNumberOfPages(), 6);
- ResultIterator<AdvancedResultItem> 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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/ScoreAnalizerAndSortTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -35,6 +35,8 @@
import java.util.Collection;
import java.util.List;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -84,7 +86,7 @@
// Alighieri, Dante
AdvancedResult advResult = CriteriaTestUtils.search("Dante Alighieri", 1, 200);
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(2, result, "Dante Alighieri");
}
@@ -97,19 +99,21 @@
// fàgiànò
AdvancedResult advResult = CriteriaTestUtils.search("fagiano", 1, 200);
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(3, result, "fagiano");
- ResultIterator<AdvancedResultItem> iterator = advResult.getItems();
+ ResultIterator<? extends Node> iterator = advResult.getItems();
- Assert.assertTrue(iterator.next().getScore() > iterator.next().getScore());
+ Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore() > ((AdvancedResultItem) iterator.next())
+ .getScore());
iterator = advResult.getItems();
// not sure what the selector name "s" means, but that's the only valid selector for this query, according to
// jackrabbit
- Assert.assertTrue(iterator.next().getScore("s") > iterator.next().getScore("s"));
+ Assert.assertTrue(((AdvancedResultItem) iterator.next()).getScore("s") > ((AdvancedResultItem) iterator.next())
+ .getScore("s"));
}
@Test
@@ -119,7 +123,7 @@
// canna da pesca
AdvancedResult advResult = CriteriaTestUtils.search("pesca", 1, 200);
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertSortedResults(new String[]{"pèsca", "canna da pesca" }, result, "pesca");
}
@@ -161,7 +165,7 @@
// "Faccina sorridente :)"
AdvancedResult advResult = CriteriaTestUtils.search("francia", 1, 200);
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
Assert.assertEquals(advResult.getTotalSize(), 7);
@@ -182,7 +186,7 @@
CriteriaTestUtils.assertUnsortedResults(
new String[]{"Frància", "Parigi (Francia)", "Parigi (Frància)", },
- ((List<AdvancedResultItem>) result).subList(0, 3),
+ ((List<Node>) result).subList(0, 3),
"francia");
// the remaining 4 pages have the same score, so the order is not stable
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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/XpathEscapeTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -34,6 +34,8 @@
import java.util.Collection;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -101,9 +103,9 @@
Assert.assertEquals(CriteriaTestUtils.title(advResult.getFirstResult()), title);
- Collection<AdvancedResultItem> collection = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> collection = CriteriaTestUtils.collectCollectionFromResult(advResult);
Assert.assertEquals(collection.size(), 1);
- for (AdvancedResultItem content : collection)
+ for (Node content : collection)
{
Assert.assertEquals(CriteriaTestUtils.title(content), title);
}
@@ -186,7 +188,7 @@
{
AdvancedResult advResult = CriteriaTestUtils.search("superuser", 1, 200);
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(0, result, "superuser");
}
@@ -195,7 +197,7 @@
public void testNotInPrivatePropertiesNoTemplates()
{
AdvancedResult advResult = CriteriaTestUtils.search("t-redirect", 1, 200);
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(0, result, "t-redirect");
}
@@ -322,7 +324,7 @@
"//*[( (@jcr:primaryType='mgnl:content') and ( jcr:contains(@title, '\\:') ) )] ");
AdvancedResult advResult = criteria.execute();
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(0, result, searchText);
}
@@ -340,7 +342,7 @@
Assert.assertEquals(criteria.toXpathExpression(), "//*[( ( jcr:contains(@title, '\\)') ) )] ");
AdvancedResult advResult = criteria.execute();
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(0, result, searchText);
}
@@ -359,7 +361,7 @@
Assert.assertEquals(criteria.toXpathExpression(), "//*[( ( jcr:contains(@title, '\\: \\)') ) )] ");
AdvancedResult advResult = criteria.execute();
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(0, result, searchText);
}
@@ -431,7 +433,7 @@
Assert.assertEquals(criteria.toXpathExpression(), "//*[( ( jcr:contains(@title, '\\: \\)') ) )] ");
AdvancedResult advResult = criteria.execute();
- Collection<AdvancedResultItem> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
+ Collection<Node> result = CriteriaTestUtils.collectCollectionFromResult(advResult);
CriteriaTestUtils.assertNumOfResults(0, result, searchText);
}
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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/advanced/impl/AccessibleResultItemResultIteratorTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -36,10 +36,10 @@
import java.util.Calendar;
+import javax.jcr.Node;
import javax.jcr.Session;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
-import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.JCRCriteriaFactory;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.ResultIterator;
@@ -51,73 +51,70 @@
import org.testng.annotations.BeforeClass;
import org.testng.annotations.Test;
+
/**
- * A test which retrieves a bunch of nodes, some of them actually forbidden by
- * the magnolia ACLs on the website repo. Iterating on the returned result
- * should probably generate an AccessDeniedException that we have to decide how
- * to handle (probably just by silently skipping nodes during the iteration as a
- * first solution)
- *
+ * A test which retrieves a bunch of nodes, some of them actually forbidden by the magnolia ACLs on the website repo.
+ * Iterating on the returned result should probably generate an AccessDeniedException that we have to decide how to
+ * handle (probably just by silently skipping nodes during the iteration as a first solution)
* @author dschivo
*/
@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 {
+public class AccessibleResultItemResultIteratorTest extends TestNgRepositoryTestcase
+{
/**
- * {@inheritDoc}
- */
- @Override
- @BeforeClass
- public void setUp() throws Exception {
- super.setUp();
+ * {@inheritDoc}
+ */
+ @Override
+ @BeforeClass
+ public void setUp() throws Exception
+ {
+ super.setUp();
- // Nodes in this workspace:
- // - pets (title=Pets)
- // --- cats (title=Cats)
- // ----- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
- // ----- 7 (title=Samantha, petType=cat, birthDate=1995-09-04)
- // ----- 8 (title=Max, petType=cat, birthDate=1995-09-04)
- // ----- 13 (title=Sly, petType=cat, birthDate=2002-06-08)
- // --- dogs (title=Dogs)
- // ----- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
- // ----- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
- // ----- 10 (title=Mulligan, petType=dog, birthDate=1997-02-24)
- // ----- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
- // --- lizards (title=Lizards)
- // ----- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
- // --- snakes (title=Snakes)
- // ----- 6 (title=George, petType=snake, birthDate=2000-01-20)
- // --- birds (title=Birds)
- // ----- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
- // ----- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
- // --- hamsters (title=Hamsters)
- // ----- 2 (title=Basil, petType=hamster, birthDate=2002-08-06)
-
- MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
-
+ // Nodes in this workspace:
+ // - pets (title=Pets)
+ // --- cats (title=Cats)
+ // ----- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
+ // ----- 7 (title=Samantha, petType=cat, birthDate=1995-09-04)
+ // ----- 8 (title=Max, petType=cat, birthDate=1995-09-04)
+ // ----- 13 (title=Sly, petType=cat, birthDate=2002-06-08)
+ // --- dogs (title=Dogs)
+ // ----- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
+ // ----- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
+ // ----- 10 (title=Mulligan, petType=dog, birthDate=1997-02-24)
+ // ----- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
+ // --- lizards (title=Lizards)
+ // ----- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
+ // --- snakes (title=Snakes)
+ // ----- 6 (title=George, petType=snake, birthDate=2000-01-20)
+ // --- birds (title=Birds)
+ // ----- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
+ // ----- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
+ // --- hamsters (title=Hamsters)
+ // ----- 2 (title=Basil, petType=hamster, birthDate=2002-08-06)
+ MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save();
+
Session userrolesSession = MgnlContext.getJCRSession("userroles");
PropertyUtil.setProperty(userrolesSession.getNode("/anonymous/acl_website/0"), "path", "/pets/dogs/*");
userrolesSession.save();
- ComponentsTestUtil.setInstance(I18nContentSupport.class, new DefaultI18nContentSupport());
+ 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);
- }
+ }
- /**
- * Tests that the website HierarchyManager allows access only to /pets/dogs.
- *
- * @throws Exception
- */
+ /**
+ * Tests that the website HierarchyManager allows access only to /pets/dogs.
+ * @throws Exception
+ */
@Test
public void testGetContent() throws Exception
{
@@ -132,48 +129,49 @@
"should not be allowed to read path /pets/cats");
}
- /**
- * Tests the method of an advanced result for iterating over accessible
- * nodes (i.e. those which do not throw an AccessDeniedException).
- *
- * @throws Exception
- */
- @Test
- public void testGetAccessibleItems() throws Exception {
- Calendar begin = Calendar.getInstance();
- begin.set(1999, Calendar.JANUARY, 1);
- Calendar end = Calendar.getInstance();
- end.set(2001, Calendar.DECEMBER, 31);
+ /**
+ * Tests the method of an advanced result for iterating over accessible nodes (i.e. those which do not throw an
+ * AccessDeniedException).
+ * @throws Exception
+ */
+ @Test
+ public void testGetAccessibleItems() throws Exception
+ {
+ Calendar begin = Calendar.getInstance();
+ begin.set(1999, Calendar.JANUARY, 1);
+ Calendar end = Calendar.getInstance();
+ end.set(2001, Calendar.DECEMBER, 31);
- Criteria criteria = JCRCriteriaFactory.createCriteria().setWorkspace(
- RepositoryConstants.WEBSITE).setBasePath("/pets").add(
- Restrictions.between("@birthDate", begin, end)).addOrder(
- Order.asc("@birthDate"));
+ Criteria criteria = JCRCriteriaFactory
+ .createCriteria()
+ .setWorkspace(RepositoryConstants.WEBSITE)
+ .setBasePath("/pets")
+ .add(Restrictions.between("@birthDate", begin, end))
+ .addOrder(Order.asc("@birthDate"));
- // Query results:
- // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
- // --- 6 (title=George, petType=snake, birthDate=2000-01-20)
- // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
- // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
- // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
- // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
- // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
- // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
- AdvancedResult result = criteria.execute();
+ // Query results:
+ // --- 9 (title=Lucky, petType=bird, birthDate=1999-08-06)
+ // --- 6 (title=George, petType=snake, birthDate=2000-01-20)
+ // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
+ // --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
+ // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
+ // --- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
+ // --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
+ // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
+ AdvancedResult result = criteria.execute();
- // Accessible results (dogs only):
- // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
- // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
- // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
- ResultIterator<AdvancedResultItem> iterator = result.getItems();
+ // Accessible results (dogs only):
+ // --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
+ // --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
+ // --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
+ ResultIterator< ? extends Node> iterator = result.getItems();
- Assert.assertTrue(iterator.hasNext());
- Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "4");
- Assert.assertTrue(iterator.hasNext());
- Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
- Assert.assertTrue(iterator.hasNext());
- Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "3");
- Assert.assertFalse(iterator.hasNext());
- }
-
+ Assert.assertTrue(iterator.hasNext());
+ Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "4");
+ Assert.assertTrue(iterator.hasNext());
+ Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
+ Assert.assertTrue(iterator.hasNext());
+ Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "3");
+ Assert.assertFalse(iterator.hasNext());
+ }
}
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-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/CriteriaTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -27,10 +27,8 @@
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.jcr.util.MetaDataUtil;
-import info.magnolia.jcr.util.NodeUtil;
import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.repository.RepositoryConstants;
import info.magnolia.test.ComponentsTestUtil;
@@ -39,6 +37,8 @@
import java.util.Calendar;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Order;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.criterion.Restrictions;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.xpath.utils.XPathTextUtils;
@@ -164,9 +164,9 @@
.add(Restrictions.eq("@jcr:primaryType", MgnlNodeType.NT_CONTENT))
.add(Restrictions.eq("@title", "Pets"));
AdvancedResult result = criteria.execute();
- ResultIterator<AdvancedResultItem> iterator = result.getItems();
+ ResultIterator<? extends Node> iterator = result.getItems();
Assert.assertTrue(iterator.hasNext());
- AdvancedResultItem resultNode = iterator.next();
+ Node resultNode = iterator.next();
Assert.assertEquals(CriteriaTestUtils.title(resultNode), "Pets");
}
@@ -182,7 +182,7 @@
AdvancedResult result = criteria.execute();
Assert.assertEquals(result.getTotalSize(), 1);
- ResultIterator<AdvancedResultItem> iterator = result.getItems();
+ ResultIterator<? extends Node> iterator = result.getItems();
Assert.assertEquals(iterator.getSize(), 1);
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "12");
}
@@ -242,7 +242,7 @@
// --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
Assert.assertEquals(result.getTotalSize(), 8);
- ResultIterator<AdvancedResultItem> 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 +282,7 @@
// --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
Assert.assertEquals(result.getTotalSize(), 8);
- ResultIterator<AdvancedResultItem> 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 +297,7 @@
public void testAddOrder() throws Exception
{
Criteria criteria;
- ResultIterator<AdvancedResultItem> iterator;
+ ResultIterator<? extends Node> iterator;
Calendar birthDate;
// gets the oldest pet (ascending order)
@@ -311,7 +311,7 @@
// ----- 7 (title=Samantha, petType=cat, birthDate=1995-09-04)
// ----- 8 (title=Max, petType=cat, birthDate=1995-09-04)
Assert.assertTrue(iterator.hasNext());
-
+
birthDate = PropertyUtil.getDate(iterator.next(), "birthDate", null);
Assert.assertEquals(birthDate.get(Calendar.YEAR), 1995);
Assert.assertEquals(birthDate.get(Calendar.MONTH) + 1, 9);
@@ -342,7 +342,7 @@
public void testAddOrderMultiple() throws Exception
{
Criteria criteria;
- ResultIterator<AdvancedResultItem> iterator;
+ ResultIterator<? extends Node> iterator;
// order by @birthDate ascending, @title ascending
criteria = JCRCriteriaFactory
@@ -381,8 +381,8 @@
public void testDateComparison() throws Exception
{
Criteria criteria;
- ResultIterator<AdvancedResultItem> iterator;
- AdvancedResultItem node;
+ ResultIterator<? extends Node> iterator;
+ Node node;
Calendar date;
criteria = JCRCriteriaFactory
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/jcr/query/lucene/AclSearchIndexTest.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -36,6 +36,7 @@
import java.util.Calendar;
import java.util.List;
+import javax.jcr.Node;
import javax.jcr.Session;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
@@ -187,7 +188,7 @@
// --- 4 (title=Jewel, petType=dog, birthDate=2000-03-07)
// --- 12 (title=Lucky, petType=dog, birthDate=2000-06-24)
// --- 3 (title=Rosy, petType=dog, birthDate=2001-04-17)
- ResultIterator<AdvancedResultItem> iterator = result.getItems();
+ ResultIterator<? extends Node> iterator = result.getItems();
Assert.assertTrue(iterator.hasNext());
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "4");
@@ -278,7 +279,7 @@
// --- 11 (title=Freddy, petType=bird, birthDate=2000-03-09)
// --- 1 (title=Leo, petType=cat, birthDate=2000-09-07)
// --- 5 (title=Iggy, petType=lizard, birthDate=2000-11-30)
- ResultIterator<AdvancedResultItem> iterator = result.getItems();
+ ResultIterator<? extends Node> iterator = result.getItems();
Assert.assertTrue(iterator.hasNext());
Assert.assertEquals(CriteriaTestUtils.name(iterator.next()), "9");
Modified: magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java 2013-05-19 14:12:47 UTC (rev 4241)
+++ magnoliamodules/trunk/openutils-mgnlcriteria/src/test/java/net/sourceforge/openutils/mgnlcriteria/tests/CriteriaTestUtils.java 2013-05-19 14:48:28 UTC (rev 4242)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlcriteria.tests;
+import info.magnolia.jcr.util.NodeUtil;
+import info.magnolia.jcr.util.PropertyUtil;
import info.magnolia.repository.RepositoryConstants;
import java.io.StringWriter;
@@ -28,6 +30,8 @@
import java.util.Collections;
import java.util.List;
+import javax.jcr.Node;
+
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResult;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.AdvancedResultItem;
import net.sourceforge.openutils.mgnlcriteria.jcr.query.Criteria;
@@ -51,12 +55,12 @@
public class CriteriaTestUtils
{
- public static void assertNumOfResults(int expected, Collection<AdvancedResultItem> result, String search)
+ public static void assertNumOfResults(int expected, Collection<Node> result, String search)
{
if (result.size() != expected)
{
List<String> titles = new ArrayList<String>();
- for (AdvancedResultItem content : result)
+ for (Node content : result)
{
titles.add(title(content));
}
@@ -72,13 +76,13 @@
}
}
- public static void assertUnsortedResults(String[] expected, Collection<AdvancedResultItem> result, String search)
+ public static void assertUnsortedResults(String[] expected, Collection<Node> result, String search)
{
Arrays.sort(expected);
List<String> titles = new ArrayList<String>();
- for (AdvancedResultItem content : result)
+ for (Node content : result)
{
titles.add(title(content));
}
@@ -102,10 +106,10 @@
}
- public static void assertSortedResults(String[] expected, Collection<AdvancedResultItem> result, String search)
+ public static void assertSortedResults(String[] expected, Collection<Node> result, String search)
{
List<String> titles = new ArrayList<String>();
- for (AdvancedResultItem content : result)
+ for (Node content : result)
{
titles.add(title(content));
}
@@ -199,28 +203,28 @@
return criteria;
}
- public static Collection<AdvancedResultItem> collectCollectionFromResult(AdvancedResult result)
+ public static Collection<Node> collectCollectionFromResult(AdvancedResult result)
{
- ResultIterator<AdvancedResultItem> items = result.getItems();
- ArrayList<AdvancedResultItem> list = new ArrayList<AdvancedResultItem>();
+ ResultIterator<? extends Node> items = result.getItems();
+ ArrayList<Node> list = new ArrayList<Node>();
CollectionUtils.addAll(list, items);
return list;
}
- public static String title(AdvancedResultItem item)
+ public static String title(Node item)
{
- return item.getTitle();
+ return PropertyUtil.getString(item, "title");
}
- public static String name(AdvancedResultItem item)
+ public static String name(Node item)
{
- return item.getName();
+ return NodeUtil.getName(item);
}
- public static String path(AdvancedResultItem item)
+ public static String path(Node item)
{
- return item.getHandle();
+ return NodeUtil.getPathIfPossible(item);
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
