Author: bdelacretaz
Date: Wed Jun 18 07:23:40 2008
New Revision: 669180
URL: http://svn.apache.org/viewvc?rev=669180&view=rev
Log:
SLING-466 - improve mocks to use in scripting/jst testing
Modified:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNodeIterator.java
Modified:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java?rev=669180&r1=669179&r2=669180&view=diff
==============================================================================
---
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java
(original)
+++
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNode.java
Wed Jun 18 07:23:40 2008
@@ -158,11 +158,11 @@
}
public NodeIterator getNodes() {
- return null;
+ return new MockNodeIterator();
}
public NodeIterator getNodes(String namePattern) {
- return null;
+ return new MockNodeIterator();
}
public Item getPrimaryItem() {
@@ -178,7 +178,7 @@
}
public Property getProperty(String relPath) {
- return null;
+ return properties.get(relPath);
}
public PropertyIterator getReferences() {
@@ -206,7 +206,7 @@
}
public boolean hasProperty(String relPath) {
- return false;
+ return properties.containsKey(relPath);
}
public boolean holdsLock() {
Modified:
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNodeIterator.java
URL:
http://svn.apache.org/viewvc/incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNodeIterator.java?rev=669180&r1=669179&r2=669180&view=diff
==============================================================================
---
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNodeIterator.java
(original)
+++
incubator/sling/trunk/commons/testing/src/main/java/org/apache/sling/commons/testing/jcr/MockNodeIterator.java
Wed Jun 18 07:23:40 2008
@@ -27,7 +27,12 @@
private Node[] nodes;
private int idx;
+ private static final Node [] EMPTY_NODE_ARRAY = {};
+ public MockNodeIterator() {
+ this(EMPTY_NODE_ARRAY);
+ }
+
public MockNodeIterator(Node[] nodes) {
this.nodes = (nodes != null) ? nodes : new Node[0];
this.idx = 0;