You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by md...@apache.org on 2010/02/02 17:43:58 UTC
svn commit: r905699 [3/3] - in /jackrabbit/trunk/jackrabbit-jcr2spi/src:
main/java/org/apache/jackrabbit/jcr2spi/
main/java/org/apache/jackrabbit/jcr2spi/hierarchy/
main/java/org/apache/jackrabbit/jcr2spi/nodetype/
main/java/org/apache/jackrabbit/jcr2s...
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshFalseTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshFalseTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshFalseTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshFalseTest.java Tue Feb 2 16:41:59 2010
@@ -16,18 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
+import javax.jcr.InvalidItemStateException;
import javax.jcr.Property;
-import javax.jcr.Value;
import javax.jcr.RepositoryException;
-import javax.jcr.InvalidItemStateException;
-import javax.jcr.version.VersionException;
-import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.Value;
import javax.jcr.lock.LockException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>RefreshFalseTest</code>...
@@ -38,6 +38,7 @@
private Value testValue;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -52,6 +53,7 @@
}
}
+ @Override
protected void tearDown() throws Exception {
testValue = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshMovedTest.java Tue Feb 2 16:41:59 2010
@@ -16,14 +16,14 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-
+import javax.jcr.InvalidItemStateException;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.jcr.InvalidItemStateException;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>RefreshMovedTest</code>...
@@ -36,6 +36,7 @@
protected String srcPath;
protected String destinationPath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -52,6 +53,7 @@
destinationPath = destParentNode.getPath() + "/" + nodeName2;
}
+ @Override
protected void tearDown() throws Exception {
moveNode = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshTrueTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshTrueTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshTrueTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RefreshTrueTest.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.jcr.InvalidItemStateException;
import javax.jcr.Node;
import javax.jcr.Property;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>RefreshTrue</code>...
*/
@@ -36,6 +36,7 @@
private Value testValue;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -45,6 +46,7 @@
}
}
+ @Override
protected void tearDown() throws Exception {
testValue = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveItemTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveItemTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveItemTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveItemTest.java Tue Feb 2 16:41:59 2010
@@ -16,20 +16,20 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
+import javax.jcr.InvalidItemStateException;
import javax.jcr.Item;
import javax.jcr.ItemExistsException;
-import javax.jcr.RepositoryException;
-import javax.jcr.InvalidItemStateException;
import javax.jcr.PathNotFoundException;
-import javax.jcr.version.VersionException;
+import javax.jcr.RepositoryException;
+import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.lock.LockException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>RemoveItemTest</code>...
@@ -41,6 +41,7 @@
protected Item removeItem;
protected String removePath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -48,6 +49,7 @@
removePath = removeItem.getPath();
}
+ @Override
protected void tearDown() throws Exception {
removeItem = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveMovedNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveMovedNodeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveMovedNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveMovedNodeTest.java Tue Feb 2 16:41:59 2010
@@ -16,24 +16,27 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.RepositoryException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.RepositoryException;
-
/** <code>RemoveMovedNodeTest</code>... */
public class RemoveMovedNodeTest extends AbstractMoveTest {
private static Logger log = LoggerFactory.getLogger(RemoveMovedNodeTest.class);
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNewNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNewNodeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNewNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNewNodeTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.InvalidItemStateException;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
import org.apache.jackrabbit.test.AbstractJCRTest;
import org.apache.jackrabbit.test.NotExecutableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.Node;
-import javax.jcr.RepositoryException;
-import javax.jcr.PathNotFoundException;
-import javax.jcr.InvalidItemStateException;
-
/**
* <code>RemoveNodeTest</code>...
*/
@@ -35,6 +35,7 @@
protected Node removeNode;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -44,6 +45,7 @@
removeNode = testRootNode.addNode(nodeName1, testNodeType);
}
+ @Override
protected void tearDown() throws Exception {
removeNode = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveNodeTest.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Node;
-import javax.jcr.PathNotFoundException;
import javax.jcr.InvalidItemStateException;
import javax.jcr.Item;
+import javax.jcr.Node;
+import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>RemoveNodeTest</code>...
*/
@@ -34,6 +34,7 @@
private static Logger log = LoggerFactory.getLogger(RemoveNodeTest.class);
+ @Override
protected Item createRemoveItem() throws NotExecutableException, RepositoryException {
if (testRootNode.hasNode(nodeName1)) {
throw new NotExecutableException("Parent node must not yet contain a child node '" + nodeName1 + "'.");
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveReferenceableNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveReferenceableNodeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveReferenceableNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveReferenceableNodeTest.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,15 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.Item;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
import org.apache.jackrabbit.test.NotExecutableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.RepositoryException;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.Item;
-import javax.jcr.Node;
-
/**
* <code>RemoveNodeTest</code>...
*/
@@ -34,6 +34,7 @@
private String uuid;
+ @Override
protected Item createRemoveItem() throws NotExecutableException, RepositoryException {
Node removeItem = (Node) super.createRemoveItem();
// assert removeNode is referenceable
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveSNSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveSNSTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveSNSTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RemoveSNSTest.java Tue Feb 2 16:41:59 2010
@@ -16,14 +16,14 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.NotExecutableException;
-
import javax.jcr.Item;
-import javax.jcr.RepositoryException;
import javax.jcr.Node;
import javax.jcr.PathNotFoundException;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>RemoveSNSTest</code> (Implementation specific tests. JSR170 only
@@ -37,11 +37,13 @@
private Node firstSiblingNode;
private String firstSiblingPath;
+ @Override
protected void tearDown() throws Exception {
firstSiblingNode = null;
super.tearDown();
}
+ @Override
protected Item createRemoveItem() throws NotExecutableException, RepositoryException {
if (testRootNode.hasNode(nodeName1)) {
fail("Setup: Parent node must not yet contain a child node '" + nodeName1 + "'.");
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RenameTest.java Tue Feb 2 16:41:59 2010
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.RepositoryException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.RepositoryException;
-
/**
* <code>RenameTest</code>...
*/
@@ -31,6 +31,7 @@
private String renamedName;
private String renamePath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -38,6 +39,7 @@
renamePath = srcParentNode.getPath() + "/" + renamedName;
}
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMixedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMixedTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMixedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMixedTest.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,15 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
import javax.jcr.ItemExistsException;
-import javax.jcr.version.VersionException;
+import javax.jcr.RepositoryException;
+import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.lock.LockException;
+import javax.jcr.version.VersionException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>ReorderMixedTest</code>...
@@ -33,6 +33,7 @@
private static Logger log = LoggerFactory.getLogger(ReorderMixedTest.class);
+ @Override
protected void createOrderableChildren() throws RepositoryException, LockException, ConstraintViolationException, NoSuchNodeTypeException, ItemExistsException, VersionException {
child1 = testRootNode.addNode(nodeName2, testNodeType);
child2 = testRootNode.addNode(nodeName4, testNodeType);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderMoveTest.java Tue Feb 2 16:41:59 2010
@@ -16,6 +16,11 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.ItemNotFoundException;
+import javax.jcr.Node;
+import javax.jcr.NodeIterator;
+import javax.jcr.RepositoryException;
+
import org.apache.jackrabbit.spi.Path;
import org.apache.jackrabbit.test.AbstractJCRTest;
import org.apache.jackrabbit.test.NotExecutableException;
@@ -23,11 +28,6 @@
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.ItemNotFoundException;
-import javax.jcr.Node;
-import javax.jcr.NodeIterator;
-import javax.jcr.RepositoryException;
-
/**
* <code>ReorderMoveTest</code> testing various combinations of move/rename
* and reorder with and without intermediate save, revert and other transient
@@ -41,6 +41,7 @@
private Node srcParent;
private String destPath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
if (!testRootNode.getPrimaryNodeType().hasOrderableChildNodes()) {
@@ -55,6 +56,7 @@
testRootNode.save();
}
+ @Override
protected void tearDown() throws Exception {
destParent = null;
srcParent = null;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewAndSavedTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewAndSavedTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewAndSavedTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewAndSavedTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
import javax.jcr.ItemExistsException;
import javax.jcr.Node;
-import javax.jcr.version.VersionException;
+import javax.jcr.RepositoryException;
+import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.lock.LockException;
+import javax.jcr.version.VersionException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>ReorderNewAndSavedTest</code>...
@@ -34,6 +34,7 @@
private static Logger log = LoggerFactory.getLogger(ReorderNewAndSavedTest.class);
+ @Override
protected void createOrderableChildren() throws RepositoryException, LockException, ConstraintViolationException, NoSuchNodeTypeException, ItemExistsException, VersionException {
child1 = testRootNode.addNode(nodeName1, testNodeType);
child2 = testRootNode.addNode(nodeName2, testNodeType);
@@ -43,6 +44,7 @@
child4 = testRootNode.addNode(nodeName4, testNodeType);
}
+ @Override
public void testRevertReorder() throws RepositoryException {
testRootNode.orderBefore(getRelPath(child4), getRelPath(child2));
testOrder(testRootNode, new Node[] { child1, child4, child2, child3});
@@ -51,6 +53,7 @@
testOrder(testRootNode, new Node[] { child1, child2 });
}
+ @Override
public void testRevertReorderToEnd() throws RepositoryException {
testRootNode.orderBefore(getRelPath(child1), null);
testOrder(testRootNode, new Node[] { child2, child3, child4, child1});
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewSNSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewSNSTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewSNSTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewSNSTest.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
import javax.jcr.ItemExistsException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
-import javax.jcr.version.VersionException;
+import javax.jcr.RepositoryException;
+import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.lock.LockException;
+import javax.jcr.version.VersionException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>ReorderNewSNSTest</code>...
@@ -35,6 +35,7 @@
private static Logger log = LoggerFactory.getLogger(ReorderNewSNSTest.class);
+ @Override
protected void createOrderableChildren() throws RepositoryException, LockException, ConstraintViolationException, NoSuchNodeTypeException, ItemExistsException, VersionException {
child1 = testRootNode.addNode(nodeName2, testNodeType);
child2 = testRootNode.addNode(nodeName2, testNodeType);
@@ -42,6 +43,7 @@
child4 = testRootNode.addNode(nodeName2, testNodeType);
}
+ @Override
public void testRevertReorder() throws RepositoryException {
testRootNode.orderBefore(getRelPath(child4), getRelPath(child2));
testOrder(testRootNode, new Node[] { child1, child4, child2, child3});
@@ -54,6 +56,7 @@
}
}
+ @Override
public void testRevertReorderToEnd() throws RepositoryException {
testRootNode.orderBefore(getRelPath(child1), null);
testOrder(testRootNode, new Node[] { child2, child3, child4, child1});
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderNewTest.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
import javax.jcr.ItemExistsException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
-import javax.jcr.version.VersionException;
+import javax.jcr.RepositoryException;
+import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.lock.LockException;
+import javax.jcr.version.VersionException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>ReorderNewTest</code>...
@@ -35,6 +35,7 @@
private static Logger log = LoggerFactory.getLogger(ReorderNewTest.class);
+ @Override
protected void createOrderableChildren() throws RepositoryException, LockException, ConstraintViolationException, NoSuchNodeTypeException, ItemExistsException, VersionException {
child1 = testRootNode.addNode(nodeName1, testNodeType);
child2 = testRootNode.addNode(nodeName2, testNodeType);
@@ -42,6 +43,7 @@
child4 = testRootNode.addNode(nodeName4, testNodeType);
}
+ @Override
public void testRevertReorder() throws RepositoryException {
testRootNode.orderBefore(getRelPath(child4), getRelPath(child2));
testOrder(testRootNode, new Node[] { child1, child4, child2, child3});
@@ -54,6 +56,7 @@
}
}
+ @Override
public void testRevertReorderToEnd() throws RepositoryException {
testRootNode.orderBefore(getRelPath(child1), null);
testOrder(testRootNode, new Node[] { child2, child3, child4, child1});
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderReferenceableSNSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderReferenceableSNSTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderReferenceableSNSTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderReferenceableSNSTest.java Tue Feb 2 16:41:59 2010
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.test.NotExecutableException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Node;
/**
* <code>ReorderSNSTest</code>...
@@ -30,6 +30,7 @@
private static Logger log = LoggerFactory.getLogger(ReorderReferenceableSNSTest.class);
+ @Override
protected void createOrderableChildren() throws RepositoryException, NotExecutableException {
child1 = testRootNode.addNode(nodeName2, testNodeType);
child2 = testRootNode.addNode(nodeName2, testNodeType);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderSNSTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderSNSTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderSNSTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderSNSTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,16 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.ItemExistsException;
import javax.jcr.Item;
-import javax.jcr.version.VersionException;
+import javax.jcr.ItemExistsException;
+import javax.jcr.RepositoryException;
+import javax.jcr.lock.LockException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
-import javax.jcr.lock.LockException;
+import javax.jcr.version.VersionException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>ReorderSNSTest</code>...
@@ -34,6 +34,7 @@
private static Logger log = LoggerFactory.getLogger(ReorderSNSTest.class);
+ @Override
protected void createOrderableChildren() throws RepositoryException, LockException, ConstraintViolationException, NoSuchNodeTypeException, ItemExistsException, VersionException {
child1 = testRootNode.addNode(nodeName2, testNodeType);
child2 = testRootNode.addNode(nodeName2, testNodeType);
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReorderTest.java Tue Feb 2 16:41:59 2010
@@ -16,21 +16,21 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
+import javax.jcr.ItemExistsException;
import javax.jcr.Node;
import javax.jcr.NodeIterator;
-import javax.jcr.UnsupportedRepositoryOperationException;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import javax.jcr.ItemExistsException;
+import javax.jcr.UnsupportedRepositoryOperationException;
import javax.jcr.lock.LockException;
-import javax.jcr.version.VersionException;
import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.nodetype.NoSuchNodeTypeException;
+import javax.jcr.version.VersionException;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>ReorderTest</code>...
@@ -44,6 +44,7 @@
protected Node child3;
protected Node child4;
+ @Override
protected void setUp() throws Exception {
super.setUp();
if (!testRootNode.getPrimaryNodeType().hasOrderableChildNodes()) {
@@ -56,6 +57,7 @@
createOrderableChildren();
}
+ @Override
protected void tearDown() throws Exception {
child1 = null;
child2 = null;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReplaceNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReplaceNodeTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReplaceNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/ReplaceNodeTest.java Tue Feb 2 16:41:59 2010
@@ -16,15 +16,15 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
import javax.jcr.Node;
+import javax.jcr.RepositoryException;
import javax.jcr.UnsupportedRepositoryOperationException;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>ReplaceNodeTest</code>
*/
@@ -35,6 +35,7 @@
private Node removeNode;
private String uuid;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -55,6 +56,7 @@
uuid = removeNode.getUUID();
}
+ @Override
protected void tearDown() throws Exception {
removeNode = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/RevertMoveTest.java Tue Feb 2 16:41:59 2010
@@ -16,12 +16,12 @@
*/
package org.apache.jackrabbit.jcr2spi;
+import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.jcr.RepositoryException;
-import javax.jcr.Node;
-
/**
* <code>RevertMove</code>...
*/
@@ -29,6 +29,7 @@
private static Logger log = LoggerFactory.getLogger(RevertMoveTest.class);
+ @Override
protected boolean isSessionMove() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/SNSIndexTest.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.apache.jackrabbit.spi.Path;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.jcr.Node;
import javax.jcr.NodeIterator;
import javax.jcr.PathNotFoundException;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
+import org.apache.jackrabbit.spi.Path;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>SNSIndexTest</code>...
*/
@@ -45,6 +45,7 @@
private String snsPath;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -62,6 +63,7 @@
snsPath = testRootNode.getPath() + "/" + nodeName1 + "/" + snsName;
}
+ @Override
protected void tearDown() throws Exception {
parent = null;
sns1 = null;
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/UpdateTest.java Tue Feb 2 16:41:59 2010
@@ -42,6 +42,7 @@
private String currentWorkspace;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -51,7 +52,7 @@
public void testInvalidSrcWorkspace() throws RepositoryException {
String nonExistingWorkspace = "nonExistingWorkspace";
String[] accessibleWorkspaces = testRootNode.getSession().getWorkspace().getAccessibleWorkspaceNames();
- List l = Arrays.asList(accessibleWorkspaces);
+ List<String> l = Arrays.asList(accessibleWorkspaces);
while (l.contains(nonExistingWorkspace)) {
nonExistingWorkspace = nonExistingWorkspace + "_";
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/WorkspaceMoveTest.java Tue Feb 2 16:41:59 2010
@@ -16,22 +16,24 @@
*/
package org.apache.jackrabbit.jcr2spi;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.RepositoryException;
-import javax.jcr.Property;
import javax.jcr.ItemExistsException;
+import javax.jcr.Property;
import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+
+import org.apache.jackrabbit.test.NotExecutableException;
/**
* <code>WorkspaceMoveTest</code>...
*/
public class WorkspaceMoveTest extends MoveTest {
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected boolean isSessionMove() {
return false;
}
@@ -46,6 +48,7 @@
* the expected behaviour depends on the
* {@link Repository#OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED} descriptor.
*/
+ @Override
public void testMovePropertyExists() throws RepositoryException, NotExecutableException {
// try to create a property with the name of the node to be moved
// to the destination parent
@@ -82,7 +85,7 @@
throw new NotExecutableException("Cannot create property with name '" +nodeName2+ "' and value 'anyString' at move destination.");
}
- // TODO: fix 2.0 behaviour according to the OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED descriptor
+ // TODO: fix 2.0 behaviour according to the OPTION_NODE_AND_PROPERTY_WITH_SAME_NAME_SUPPORTED descriptor
// workspace-move the node (must succeed)
doMove(moveNode.getPath(), destProperty.getPath());
if ("1.0".equals(getHelper().getRepository().getDescriptor(Repository.SPEC_VERSION_DESC))) {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/AbstractLockTest.java Tue Feb 2 16:41:59 2010
@@ -16,18 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi.lock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.Session;
-import javax.jcr.RepositoryException;
import javax.jcr.Node;
import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
import javax.jcr.lock.Lock;
import javax.jcr.lock.LockException;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>AbstractLockTest</code>...
*/
@@ -43,6 +43,7 @@
abstract boolean isSessionScoped();
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -56,6 +57,7 @@
lock = lockedNode.lock(false, isSessionScoped());
}
+ @Override
protected void tearDown() throws Exception {
// make sure all locks are removed
try {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/DeepLockTest.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,17 @@
*/
package org.apache.jackrabbit.jcr2spi.lock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.lock.Lock;
import javax.jcr.lock.LockException;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
/**
* <code>DeepLockTest</code>...
*/
@@ -34,13 +34,14 @@
private static Logger log = LoggerFactory.getLogger(DeepLockTest.class);
- private boolean isSessionScoped = false;
- private boolean isDeep = true;
+ private final boolean isSessionScoped = false;
+ private final boolean isDeep = true;
private Node lockedNode;
private Node childNode;
private Lock lock;
+ @Override
protected void setUp() throws Exception {
super.setUp();
@@ -52,6 +53,7 @@
lock = lockedNode.lock(isDeep, isSessionScoped);
}
+ @Override
protected void tearDown() throws Exception {
try {
lockedNode.unlock();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/OpenScopedLockTest.java Tue Feb 2 16:41:59 2010
@@ -16,13 +16,13 @@
*/
package org.apache.jackrabbit.jcr2spi.lock;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import javax.jcr.Node;
import javax.jcr.RepositoryException;
-import javax.jcr.lock.LockException;
import javax.jcr.lock.Lock;
+import javax.jcr.lock.LockException;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>OpenScopedLockTest</code>...
@@ -31,6 +31,7 @@
private static Logger log = LoggerFactory.getLogger(OpenScopedLockTest.class);
+ @Override
boolean isSessionScoped() {
return false;
}
@@ -83,7 +84,7 @@
// lock token not present within tokens returned by Session.getLockTokens.
fail("Upon successful call to Node.lock, the lock token must automatically be added to the set of tokens held by the Session.");
}
-
+
public void testTokenTransfer() throws Exception {
String lockToken = lock.getLockToken();
try {
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/SessionScopedLockTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/SessionScopedLockTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/SessionScopedLockTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/lock/SessionScopedLockTest.java Tue Feb 2 16:41:59 2010
@@ -26,6 +26,7 @@
private static Logger log = LoggerFactory.getLogger(SessionScopedLockTest.class);
+ @Override
boolean isSessionScoped() {
return true;
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/name/NamespaceRegistryTest.java Tue Feb 2 16:41:59 2010
@@ -16,19 +16,20 @@
*/
package org.apache.jackrabbit.jcr2spi.name;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Set;
-import javax.jcr.RepositoryException;
-import javax.jcr.NamespaceRegistry;
import javax.jcr.NamespaceException;
+import javax.jcr.NamespaceRegistry;
import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
import javax.jcr.Session;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.Arrays;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>NamespaceRegistryTest</code>...
@@ -47,6 +48,7 @@
private String testPrefix;
private String testURI;
+ @Override
protected void setUp() throws Exception {
super.setUp();
nsRegistry = superuser.getWorkspace().getNamespaceRegistry();
@@ -60,6 +62,7 @@
}
}
+ @Override
protected void tearDown() throws Exception {
nsRegistry = null;
super.tearDown();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/AddMixinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/AddMixinTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/AddMixinTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/AddMixinTest.java Tue Feb 2 16:41:59 2010
@@ -16,17 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi.nodetype;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
+import java.util.Arrays;
+import java.util.List;
import javax.jcr.Node;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
-import java.util.List;
-import java.util.Arrays;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>AddMixinTest</code>...
@@ -37,12 +38,14 @@
private NodeTypeManager ntMgr;
+ @Override
protected void setUp() throws Exception {
super.setUp();
ntMgr = testRootNode.getSession().getWorkspace().getNodeTypeManager();
}
+ @Override
protected void tearDown() throws Exception {
testRootNode.refresh(false);
ntMgr = null;
@@ -138,7 +141,7 @@
throw new NotExecutableException();
}
- List mixins = Arrays.asList(node.getMixinNodeTypes());
+ List<NodeType> mixins = Arrays.asList(node.getMixinNodeTypes());
assertTrue("Adding 2 mixins at once -> both must be present.", mixins.contains(ntMgr.getNodeType(mixReferenceable)) && mixins.contains(ntMgr.getNodeType(mixLockable)));
}
@@ -162,7 +165,7 @@
}
assertTrue("Adding 2 mixins at once -> both must be present.", node.isNodeType(mixReferenceable) && node.isNodeType(mixLockable));
- List mixins = Arrays.asList(node.getMixinNodeTypes());
+ List<NodeType> mixins = Arrays.asList(node.getMixinNodeTypes());
assertTrue("Adding 2 mixins at once -> both must be present.", mixins.contains(ntMgr.getNodeType(mixReferenceable)) && mixins.contains(ntMgr.getNodeType(mixLockable)));
}
}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/MandatoryItemTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/MandatoryItemTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/MandatoryItemTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/MandatoryItemTest.java Tue Feb 2 16:41:59 2010
@@ -16,18 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi.nodetype;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
-import javax.jcr.nodetype.NodeType;
-import javax.jcr.nodetype.NodeDefinition;
-import javax.jcr.nodetype.PropertyDefinition;
-import javax.jcr.nodetype.ConstraintViolationException;
import javax.jcr.Node;
-import javax.jcr.RepositoryException;
import javax.jcr.Property;
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.ConstraintViolationException;
+import javax.jcr.nodetype.NodeDefinition;
+import javax.jcr.nodetype.NodeType;
+import javax.jcr.nodetype.PropertyDefinition;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/** <code>MandatoryItemTest</code>... */
public class MandatoryItemTest extends AbstractJCRTest {
@@ -37,6 +37,7 @@
private NodeDefinition childNodeDef;
private PropertyDefinition childPropDef;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImplTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImplTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImplTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/NodeTypeImplTest.java Tue Feb 2 16:41:59 2010
@@ -16,14 +16,14 @@
*/
package org.apache.jackrabbit.jcr2spi.nodetype;
-import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
+import org.apache.jackrabbit.spi.commons.conversion.NameResolver;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+
/**
* <code>NodeTypeImplTest</code>...
*/
@@ -33,6 +33,7 @@
private NodeTypeImpl nodeType;
private NameResolver resolver;
+ @Override
protected void setUp() throws Exception {
super.setUp();
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/RemoveMixinTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/RemoveMixinTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/RemoveMixinTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/nodetype/RemoveMixinTest.java Tue Feb 2 16:41:59 2010
@@ -16,16 +16,18 @@
*/
package org.apache.jackrabbit.jcr2spi.nodetype;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
+import java.util.Arrays;
+import java.util.List;
-import javax.jcr.RepositoryException;
import javax.jcr.Node;
+import javax.jcr.RepositoryException;
+import javax.jcr.nodetype.NodeType;
import javax.jcr.nodetype.NodeTypeManager;
-import java.util.List;
-import java.util.Arrays;
+
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* <code>RemoveMixinTest</code>...
@@ -36,11 +38,13 @@
private NodeTypeManager ntMgr;
+ @Override
protected void setUp() throws Exception {
super.setUp();
ntMgr = testRootNode.getSession().getWorkspace().getNodeTypeManager();
}
+ @Override
protected void tearDown() throws Exception {
ntMgr = null;
super.tearDown();
@@ -65,7 +69,7 @@
node.removeMixin(mixReferenceable);
assertTrue("Removing Mixin must not take effect but after Node has been saved.", node.isNodeType(mixReferenceable));
- List mixins = Arrays.asList(node.getMixinNodeTypes());
+ List<NodeType> mixins = Arrays.asList(node.getMixinNodeTypes());
assertTrue("Removing Mixin must not take effect but after Node has been saved.", mixins.contains(ntMgr.getNodeType(mixReferenceable)));
}
@@ -88,7 +92,7 @@
testRootNode.save();
assertFalse("Adding + Removing a mixin within the same batch must have not effect.", node.isNodeType(mixReferenceable));
- List mixins = Arrays.asList(node.getMixinNodeTypes());
+ List<NodeType> mixins = Arrays.asList(node.getMixinNodeTypes());
assertFalse("Adding + Removing a mixin within the same batch must have not effect.", mixins.contains(ntMgr.getNodeType(mixReferenceable)));
}
@@ -112,7 +116,7 @@
testRootNode.save();
assertFalse("Adding + Removing a mixin within the same batch must have not effect.", node.isNodeType(mixReferenceable));
- List mixins = Arrays.asList(node.getMixinNodeTypes());
+ List<NodeType> mixins = Arrays.asList(node.getMixinNodeTypes());
assertFalse("Adding + Removing a mixin within the same batch must have not effect.", mixins.contains(ntMgr.getNodeType(mixReferenceable)));
}
}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/version/LabelTest.java Tue Feb 2 16:41:59 2010
@@ -16,20 +16,21 @@
*/
package org.apache.jackrabbit.jcr2spi.version;
-import org.apache.jackrabbit.test.api.version.VersionLabelTest;
-
import java.util.Arrays;
import java.util.List;
+
import javax.jcr.RepositoryException;
import javax.jcr.version.Version;
+import org.apache.jackrabbit.test.api.version.VersionLabelTest;
+
public class LabelTest extends VersionLabelTest {
public void testRemovedLabel2() throws RepositoryException {
vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
vHistory.removeVersionLabel(versionLabel);
- List labels = Arrays.asList(vHistory.getVersionLabels());
+ List<String> labels = Arrays.asList(vHistory.getVersionLabels());
assertFalse("VersionHistory.getVersionLabels() must not return a removed label.",labels.contains(versionLabel));
}
@@ -37,7 +38,7 @@
vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
vHistory.removeVersionLabel(versionLabel);
- List labels = Arrays.asList(vHistory.getVersionLabels(rootVersion));
+ List<String> labels = Arrays.asList(vHistory.getVersionLabels(rootVersion));
assertFalse("VersionHistory.getVersionLabels(Version) must not return a removed label.",labels.contains(versionLabel));
}
@@ -48,7 +49,7 @@
Version v = versionableNode.checkin();
vHistory.addVersionLabel(v.getName(), versionLabel, true);
- List labels = Arrays.asList(vHistory.getVersionLabels(v));
+ List<String> labels = Arrays.asList(vHistory.getVersionLabels(v));
assertTrue(labels.contains(versionLabel));
}
@@ -59,7 +60,7 @@
vHistory.addVersionLabel(rootVersion.getName(), versionLabel, false);
vHistory.addVersionLabel(v.getName(), versionLabel, true);
- List labels = Arrays.asList(vHistory.getVersionLabels(rootVersion));
+ List<String> labels = Arrays.asList(vHistory.getVersionLabels(rootVersion));
assertFalse(labels.contains(versionLabel));
}
Modified: jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/xml/SessionImportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/xml/SessionImportTest.java?rev=905699&r1=905698&r2=905699&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/xml/SessionImportTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr2spi/src/test/java/org/apache/jackrabbit/jcr2spi/xml/SessionImportTest.java Tue Feb 2 16:41:59 2010
@@ -16,13 +16,12 @@
*/
package org.apache.jackrabbit.jcr2spi.xml;
-import org.apache.jackrabbit.JcrConstants;
-import org.apache.jackrabbit.spi.Name;
-import org.apache.jackrabbit.test.AbstractJCRTest;
-import org.apache.jackrabbit.test.NotExecutableException;
-import org.xml.sax.ContentHandler;
-import org.xml.sax.SAXException;
-import org.xml.sax.helpers.AttributesImpl;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.List;
+import java.util.UUID;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Item;
@@ -31,24 +30,28 @@
import javax.jcr.RepositoryException;
import javax.jcr.Session;
import javax.jcr.nodetype.ConstraintViolationException;
-import javax.jcr.nodetype.NodeTypeIterator;
import javax.jcr.nodetype.NodeType;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import javax.jcr.nodetype.NodeTypeIterator;
+
+import org.apache.jackrabbit.JcrConstants;
+import org.apache.jackrabbit.spi.Name;
+import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.AttributesImpl;
/**
* <code>SessionImportTest</code>...
*/
public class SessionImportTest extends AbstractJCRTest {
+ @Override
protected void setUp() throws Exception {
super.setUp();
}
+ @Override
protected void tearDown() throws Exception {
super.tearDown();
}