You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2009/06/08 16:29:21 UTC
svn commit: r782646 - in /jackrabbit/trunk:
jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/
jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/
Author: reschke
Date: Mon Jun 8 14:29:21 2009
New Revision: 782646
URL: http://svn.apache.org/viewvc?rev=782646&view=rev
Log:
JCR-1104: remove workarounds for broken query constants in JCR 2.0 PFD
Modified:
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractJoinTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractQOMTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/BindVariableValueTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/ChildNodeJoinConditionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/DescendantNodeJoinConditionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/LengthTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeLocalNameTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeNameTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/QueryObjectModelFactoryTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/SameNodeJoinConditionTest.java
jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/UpperLowerCaseTest.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinType.java
jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/Operator.java
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractJoinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractJoinTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractJoinTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractJoinTest.java Mon Jun 8 14:29:21 2009
@@ -23,6 +23,7 @@
import javax.jcr.query.qom.Join;
import javax.jcr.query.qom.JoinCondition;
import javax.jcr.query.qom.QueryObjectModel;
+import javax.jcr.query.qom.QueryObjectModelConstants;
/**
* <code>AbstractJoinTest</code> provides utility methods for join related
@@ -44,11 +45,6 @@
* The selector names for the join.
*/
protected static final String[] SELECTOR_NAMES = new String[]{LEFT, RIGHT};
-
- // Constants broken in JCR 2.0 PFD
- // TODO remove when API is fixed
- protected static String JCR_JOIN_TYPE_LEFT_OUTER = "{http://www.jcp.org/jcr/1.0}joinTypeLeftOuter";
- protected static String JCR_JOIN_TYPE_RIGHT_OUTER = "{http://www.jcp.org/jcr/1.0}joinTypeRightOuter";
//--------------------------< utilities >-----------------------------------
@@ -70,7 +66,7 @@
throws RepositoryException {
// only consider nodes under test root
Constraint constraint;
- if (JCR_JOIN_TYPE_LEFT_OUTER.equals(joinType)) {
+ if (QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER.equals(joinType)) {
constraint = qomFactory.descendantNode(LEFT, testRoot);
} else {
constraint = qomFactory.descendantNode(RIGHT, testRoot);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractQOMTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractQOMTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractQOMTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/AbstractQOMTest.java Mon Jun 8 14:29:21 2009
@@ -37,11 +37,6 @@
*/
public class AbstractQOMTest extends AbstractQueryTest {
- // Constants broken in JCR 2.0 PFD
- // TODO remove when API is fixed
- protected static String JCR_OPERATOR_EQUAL_TO = "{http://www.jcp.org/jcr/1.0}operatorEqualTo";
- protected static String JCR_OPERATOR_NOT_EQUAL_TO = "{http://www.jcp.org/jcr/1.0}operatorNotEqualTo";
-
protected QueryObjectModelFactory qomFactory;
protected void setUp() throws Exception {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/BindVariableValueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/BindVariableValueTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/BindVariableValueTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/BindVariableValueTest.java Mon Jun 8 14:29:21 2009
@@ -23,6 +23,7 @@
import javax.jcr.Value;
import javax.jcr.ValueFactory;
import javax.jcr.query.Query;
+import javax.jcr.query.qom.QueryObjectModelConstants;
/**
* <code>BindVariableValueTest</code>...
@@ -52,7 +53,7 @@
qomFactory.childNode("s", testRoot),
qomFactory.comparison(
qomFactory.propertyValue("s", propertyName1),
- AbstractQOMTest.JCR_OPERATOR_EQUAL_TO,
+ QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
qomFactory.bindVariable("v")
)
), null, null);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/ChildNodeJoinConditionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/ChildNodeJoinConditionTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/ChildNodeJoinConditionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/ChildNodeJoinConditionTest.java Mon Jun 8 14:29:21 2009
@@ -51,13 +51,13 @@
public void testRightOuterJoin() throws RepositoryException {
JoinCondition c = qomFactory.childNodeJoinCondition(LEFT, RIGHT);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_RIGHT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER, c);
checkResult(qom.execute(), new Node[][]{{n2, n1}, {null, n2}});
}
public void testLeftOuterJoin() throws RepositoryException {
JoinCondition c = qomFactory.childNodeJoinCondition(LEFT, RIGHT);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_LEFT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER, c);
List result = new ArrayList();
result.add(new Node[]{n2, n1});
if (testRootNode.isNodeType(testNodeType)) {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/DescendantNodeJoinConditionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/DescendantNodeJoinConditionTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/DescendantNodeJoinConditionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/DescendantNodeJoinConditionTest.java Mon Jun 8 14:29:21 2009
@@ -51,13 +51,13 @@
public void testRightOuterJoin() throws RepositoryException {
JoinCondition c = qomFactory.descendantNodeJoinCondition(LEFT, RIGHT);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_RIGHT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER, c);
checkResult(qom.execute(), new Node[][]{{n2, n1}, {null, n2}});
}
public void testLeftOuterJoin() throws RepositoryException {
JoinCondition c = qomFactory.descendantNodeJoinCondition(LEFT, RIGHT);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_LEFT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER, c);
List result = new ArrayList();
result.add(new Node[]{n2, n1});
// for each ancestor-or-self of testRootNode check
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/EquiJoinConditionTest.java Mon Jun 8 14:29:21 2009
@@ -62,21 +62,21 @@
public void testRightOuterJoin1() throws RepositoryException {
JoinCondition c = qomFactory.equiJoinCondition(
LEFT, propertyName1, RIGHT, propertyName2);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_RIGHT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER, c);
checkResult(qom.execute(), new Node[][]{{null, n1}, {n1, n2}, {n2, n2}});
}
public void testRightOuterJoin2() throws RepositoryException {
JoinCondition c = qomFactory.equiJoinCondition(
LEFT, propertyName2, RIGHT, propertyName1);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_RIGHT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER, c);
checkResult(qom.execute(), new Node[][]{{n2, n1}, {n2, n2}});
}
public void testLeftOuterJoin1() throws RepositoryException {
JoinCondition c = qomFactory.equiJoinCondition(
LEFT, propertyName1, RIGHT, propertyName2);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_LEFT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER, c);
checkResult(qom.execute(), new Node[][]{{n1, n2}, {n2, n2}});
}
@@ -84,7 +84,7 @@
public void testLeftOuterJoin2() throws RepositoryException {
JoinCondition c = qomFactory.equiJoinCondition(
LEFT, propertyName2, RIGHT, propertyName1);
- QueryObjectModel qom = createQuery(AbstractJoinTest.JCR_JOIN_TYPE_LEFT_OUTER, c);
+ QueryObjectModel qom = createQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER, c);
checkResult(qom.execute(), new Node[][]{{n1, null}, {n2, n1}, {n2, n2}});
}
}
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/LengthTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/LengthTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/LengthTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/LengthTest.java Mon Jun 8 14:29:21 2009
@@ -132,7 +132,7 @@
node.save();
String length = String.valueOf(node.getProperty(propertyName1).getLength());
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(length));
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(length));
}
public void testLengthBinaryLiteral() throws RepositoryException {
@@ -141,7 +141,7 @@
String length = String.valueOf(node.getProperty(propertyName1).getLength());
InputStream in = new ByteArrayInputStream(length.getBytes());
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(in));
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(in));
}
public void testLengthDoubleLiteral() throws RepositoryException {
@@ -149,7 +149,7 @@
node.save();
double length = node.getProperty(propertyName1).getLength();
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(length));
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(length));
}
public void testLengthDateLiteral() throws RepositoryException {
@@ -158,12 +158,12 @@
Calendar length = Calendar.getInstance();
length.setTimeInMillis(node.getProperty(propertyName1).getLength());
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(length));
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(length));
}
public void testLengthBooleanLiteral() throws RepositoryException {
try {
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(false));
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(false));
fail("Boolean literal cannot be converted to long");
} catch (InvalidQueryException e) {
// expected
@@ -172,7 +172,7 @@
public void testLengthNameLiteral() throws RepositoryException {
try {
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(
propertyName1, PropertyType.NAME));
fail("Name literal cannot be converted to long");
} catch (InvalidQueryException e) {
@@ -182,7 +182,7 @@
public void testLengthPathLiteral() throws RepositoryException {
try {
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(
node.getPath(), PropertyType.PATH));
fail("Path literal cannot be converted to long");
} catch (InvalidQueryException e) {
@@ -200,7 +200,7 @@
throw new NotExecutableException("Cannot add mix:referenceable to node");
}
try {
- executeQuery(propertyName1, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, vf.createValue(node));
+ executeQuery(propertyName1, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, vf.createValue(node));
fail("Reference literal cannot be converted to long");
} catch (InvalidQueryException e) {
// expected
@@ -223,8 +223,8 @@
private void checkOperators(String propertyName,
long length) throws RepositoryException {
- checkLength(propertyName, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, length, true);
- checkLength(propertyName, AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, length - 1, false);
+ checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, length, true);
+ checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, length - 1, false);
checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN, length - 1, true);
checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN, length, false);
@@ -238,8 +238,8 @@
checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO, length, true);
checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO, length - 1, false);
- checkLength(propertyName, AbstractQOMTest.JCR_OPERATOR_NOT_EQUAL_TO, length - 1, true);
- checkLength(propertyName, AbstractQOMTest.JCR_OPERATOR_NOT_EQUAL_TO, length, false);
+ checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO, length - 1, true);
+ checkLength(propertyName, QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO, length, false);
}
private void checkLength(String propertyName,
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeLocalNameTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeLocalNameTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeLocalNameTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeLocalNameTest.java Mon Jun 8 14:29:21 2009
@@ -55,32 +55,32 @@
public void testStringLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(nodeLocalName);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
}
public void testStringLiteralInvalidName() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue("[" + nodeLocalName);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
}
public void testBinaryLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(
nodeLocalName, PropertyType.BINARY);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
}
public void testDateLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(Calendar.getInstance());
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
}
public void testDoubleLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(Math.PI);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
}
@@ -90,37 +90,37 @@
public void testLongLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(283);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
}
public void testBooleanLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(true);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
}
public void testNameLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(
nodeLocalName, PropertyType.NAME);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
}
public void testPathLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(
nodeLocalName, PropertyType.PATH);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
literal = superuser.getValueFactory().createValue(
node1.getPath(), PropertyType.PATH);
- q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
literal = superuser.getValueFactory().createValue(
nodeName1 + "/" + nodeName1, PropertyType.PATH);
- q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
}
@@ -130,7 +130,7 @@
}
node1.save();
Value literal = superuser.getValueFactory().createValue(node1);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{});
}
@@ -143,7 +143,7 @@
}
public void testEqualTo() throws RepositoryException {
- checkOperator(AbstractQOMTest.JCR_OPERATOR_EQUAL_TO, false, true, false);
+ checkOperator(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, false, true, false);
}
public void testGreaterThan() throws RepositoryException {
@@ -167,7 +167,7 @@
}
public void testNotEqualTo() throws RepositoryException {
- checkOperator(AbstractQOMTest.JCR_OPERATOR_NOT_EQUAL_TO, true, false, true);
+ checkOperator(QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO, true, false, true);
}
//------------------------------< helper >----------------------------------
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeNameTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeNameTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeNameTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/NodeNameTest.java Mon Jun 8 14:29:21 2009
@@ -22,6 +22,8 @@
import javax.jcr.PropertyType;
import javax.jcr.query.Query;
import javax.jcr.query.InvalidQueryException;
+import javax.jcr.query.qom.QueryObjectModelConstants;
+
import java.util.Calendar;
/**
@@ -45,14 +47,14 @@
public void testStringLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(nodeName1);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
}
public void testStringLiteralInvalidName() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue("[" + nodeName1);
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with STRING that cannot be converted to NAME must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -62,14 +64,14 @@
public void testBinaryLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(
nodeName1, PropertyType.BINARY);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
}
public void testDateLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(Calendar.getInstance());
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with DATE must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -79,7 +81,7 @@
public void testDoubleLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(Math.PI);
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with DOUBLE must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -93,7 +95,7 @@
public void testLongLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(283);
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with LONG must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -103,7 +105,7 @@
public void testBooleanLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(true);
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with BOOLEAN must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -113,20 +115,20 @@
public void testNameLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(
nodeName1, PropertyType.NAME);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
}
public void testPathLiteral() throws RepositoryException {
Value literal = superuser.getValueFactory().createValue(
nodeName1, PropertyType.PATH);
- Query q = createQuery(JCR_OPERATOR_EQUAL_TO, literal);
+ Query q = createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal);
checkResult(q.execute(), new Node[]{node1});
literal = superuser.getValueFactory().createValue(
node1.getPath(), PropertyType.PATH);
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with absolute PATH must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -135,7 +137,7 @@
literal = superuser.getValueFactory().createValue(
nodeName1 + "/" + nodeName1, PropertyType.PATH);
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with PATH length >1 must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -149,7 +151,7 @@
node1.save();
Value literal = superuser.getValueFactory().createValue(node1);
try {
- createQuery(JCR_OPERATOR_EQUAL_TO, literal).execute();
+ createQuery(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, literal).execute();
fail("NodeName comparison with REFERENCE must fail with InvalidQueryException");
} catch (InvalidQueryException e) {
// expected
@@ -174,11 +176,11 @@
}
public void testEqualTo() throws RepositoryException {
- checkOperator(JCR_OPERATOR_EQUAL_TO, false, true, false);
+ checkOperator(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, false, true, false);
}
public void testNotEqualTo() throws RepositoryException {
- checkOperator(JCR_OPERATOR_NOT_EQUAL_TO, true, false, true);
+ checkOperator(QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO, true, false, true);
}
//------------------------------< helper >----------------------------------
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/QueryObjectModelFactoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/QueryObjectModelFactoryTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/QueryObjectModelFactoryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/QueryObjectModelFactoryTest.java Mon Jun 8 14:29:21 2009
@@ -97,17 +97,17 @@
private static final Set JOIN_TYPES = new HashSet();
static {
- OPERATORS.add(AbstractQOMTest.JCR_OPERATOR_EQUAL_TO);
+ OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO);
OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN);
OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN_OR_EQUAL_TO);
OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN);
OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_LESS_THAN_OR_EQUAL_TO);
OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_LIKE);
- OPERATORS.add(AbstractQOMTest.JCR_OPERATOR_NOT_EQUAL_TO);
+ OPERATORS.add(QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO);
JOIN_TYPES.add(QueryObjectModelConstants.JCR_JOIN_TYPE_INNER);
- JOIN_TYPES.add(AbstractJoinTest.JCR_JOIN_TYPE_LEFT_OUTER);
- JOIN_TYPES.add(AbstractJoinTest.JCR_JOIN_TYPE_RIGHT_OUTER);
+ JOIN_TYPES.add(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER);
+ JOIN_TYPES.add(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER);
}
/**
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/SameNodeJoinConditionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/SameNodeJoinConditionTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/SameNodeJoinConditionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/SameNodeJoinConditionTest.java Mon Jun 8 14:29:21 2009
@@ -58,7 +58,7 @@
qomFactory.join(
qomFactory.selector(testNodeType, LEFT),
qomFactory.selector(mixReferenceable, RIGHT),
- AbstractJoinTest.JCR_JOIN_TYPE_LEFT_OUTER,
+ QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER,
qomFactory.sameNodeJoinCondition(LEFT, RIGHT, ".")),
qomFactory.descendantNode(LEFT, testRoot),
null, null);
@@ -68,7 +68,7 @@
}
public void testLeftOuterJoinWithPath() throws RepositoryException {
- QueryObjectModel qom = createQomQuery(AbstractJoinTest.JCR_JOIN_TYPE_LEFT_OUTER, nodeName2);
+ QueryObjectModel qom = createQomQuery(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER, nodeName2);
QueryResult result = qom.execute();
checkResult(result, new Node[][]{{n1, null}, {n2, n1}});
}
@@ -78,7 +78,7 @@
qomFactory.join(
qomFactory.selector(mixReferenceable, LEFT),
qomFactory.selector(testNodeType, RIGHT),
- AbstractJoinTest.JCR_JOIN_TYPE_RIGHT_OUTER,
+ QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER,
qomFactory.sameNodeJoinCondition(LEFT, RIGHT, ".")),
qomFactory.descendantNode(RIGHT, testRoot),
null, null);
@@ -92,7 +92,7 @@
qomFactory.join(
qomFactory.selector(mixReferenceable, LEFT),
qomFactory.selector(testNodeType, RIGHT),
- AbstractJoinTest.JCR_JOIN_TYPE_RIGHT_OUTER,
+ QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER,
qomFactory.sameNodeJoinCondition(LEFT, RIGHT, nodeName2)),
qomFactory.descendantNode(RIGHT, testRoot),
null, null);
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/UpperLowerCaseTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/UpperLowerCaseTest.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/UpperLowerCaseTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/qom/UpperLowerCaseTest.java Mon Jun 8 14:29:21 2009
@@ -23,6 +23,7 @@
import javax.jcr.ValueFactory;
import javax.jcr.query.Query;
import javax.jcr.query.qom.DynamicOperand;
+import javax.jcr.query.qom.QueryObjectModelConstants;
/**
* <code>UpperLowerCaseTest</code> performs tests with upper- and lower-case
@@ -68,26 +69,26 @@
// upper case
checkQueries(qomFactory.propertyValue("s", propertyName1),
- true, JCR_OPERATOR_EQUAL_TO,
+ true, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.NAME,
new boolean[]{false, false, false, false, true});
checkQueries(qomFactory.propertyValue("s", propertyName2),
- true, JCR_OPERATOR_EQUAL_TO,
+ true, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.NAME,
new boolean[]{false, false, false, false, true});
// lower case
checkQueries(qomFactory.propertyValue("s", propertyName1),
- false, JCR_OPERATOR_EQUAL_TO,
+ false, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.NAME,
new boolean[]{true, false, false, false, false});
checkQueries(qomFactory.propertyValue("s", propertyName2),
- false, JCR_OPERATOR_EQUAL_TO,
+ false, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.NAME,
new boolean[]{true, false, false, false, false});
@@ -96,26 +97,26 @@
public void testPropertyValue() throws RepositoryException {
// upper case
checkQueries(qomFactory.propertyValue("s", propertyName1),
- true, JCR_OPERATOR_EQUAL_TO,
+ true, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{false, false, false, false, true});
checkQueries(qomFactory.propertyValue("s", propertyName2),
- true, JCR_OPERATOR_EQUAL_TO,
+ true, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{false, false, false, false, true});
// lower case
checkQueries(qomFactory.propertyValue("s", propertyName1),
- false, JCR_OPERATOR_EQUAL_TO,
+ false, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{true, false, false, false, false});
checkQueries(qomFactory.propertyValue("s", propertyName2),
- false, JCR_OPERATOR_EQUAL_TO,
+ false, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{true, false, false, false, false});
@@ -124,7 +125,7 @@
public void testUpperLowerCase() throws RepositoryException {
// first upper case, then lower case again
checkQueries(qomFactory.upperCase(qomFactory.propertyValue("s", propertyName1)),
- false, JCR_OPERATOR_EQUAL_TO,
+ false, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{true, false, false, false, false});
@@ -133,7 +134,7 @@
public void testUpperCaseTwice() throws RepositoryException {
// upper case twice
checkQueries(qomFactory.upperCase(qomFactory.propertyValue("s", propertyName1)),
- true, JCR_OPERATOR_EQUAL_TO,
+ true, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{false, false, false, false, true});
@@ -142,7 +143,7 @@
public void testLowerUpperCase() throws RepositoryException {
// first lower case, then upper case again
checkQueries(qomFactory.lowerCase(qomFactory.propertyValue("s", propertyName1)),
- true, JCR_OPERATOR_EQUAL_TO,
+ true, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{false, false, false, false, true});
@@ -151,7 +152,7 @@
public void testLowerCaseTwice() throws RepositoryException {
// lower case twice
checkQueries(qomFactory.lowerCase(qomFactory.propertyValue("s", propertyName1)),
- false, JCR_OPERATOR_EQUAL_TO,
+ false, QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO,
new String[]{"abc", "Abc", "aBc", "abC", "ABC"},
PropertyType.STRING,
new boolean[]{true, false, false, false, false});
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinType.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinType.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinType.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/JoinType.java Mon Jun 8 14:29:21 2009
@@ -32,11 +32,9 @@
INNER(QueryObjectModelConstants.JCR_JOIN_TYPE_INNER),
- LEFT("{http://www.jcp.org/jcr/1.0}joinTypeLeftOuter"),
- // LEFT(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER),
+ LEFT(QueryObjectModelConstants.JCR_JOIN_TYPE_LEFT_OUTER),
- RIGHT("{http://www.jcp.org/jcr/1.0}joinTypeRightOuter");
- // RIGHT(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER);
+ RIGHT(QueryObjectModelConstants.JCR_JOIN_TYPE_RIGHT_OUTER);
/**
* JCR name of this join type.
Modified: jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/Operator.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/Operator.java?rev=782646&r1=782645&r2=782646&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/Operator.java (original)
+++ jackrabbit/trunk/jackrabbit-spi-commons/src/main/java/org/apache/jackrabbit/spi/commons/query/qom/Operator.java Mon Jun 8 14:29:21 2009
@@ -30,11 +30,9 @@
*/
public enum Operator {
- EQ("{http://www.jcp.org/jcr/1.0}operatorEqualTo", "="),
- // EQ(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, "="),
+ EQ(QueryObjectModelConstants.JCR_OPERATOR_EQUAL_TO, "="),
- NE("{http://www.jcp.org/jcr/1.0}operatorNotEqualTo", "!=", "<>"),
- // NE(QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO, "!=", "<>"),
+ NE(QueryObjectModelConstants.JCR_OPERATOR_NOT_EQUAL_TO, "!=", "<>"),
GT(QueryObjectModelConstants.JCR_OPERATOR_GREATER_THAN, ">"),