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 2011/12/28 16:32:46 UTC
svn commit: r1225207 [3/3] - in
/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api:
./ lock/ observation/ query/ retention/ security/ version/
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/SaveTest.java Wed Dec 28 15:32:44 2011
@@ -134,7 +134,7 @@ public class SaveTest extends AbstractJC
Node versionable = testRootNode.addNode(nodeName1, testNodeType);
// or try to make it versionable if it is not
ensureMixinType(versionable, mixVersionable);
- testRootNode.save();
+ testRootNode.getSession().save();
versionable.checkin();
try {
@@ -186,7 +186,7 @@ public class SaveTest extends AbstractJC
Node lockable = testRootNode.addNode(nodeName1, testNodeType);
// or try to make it lockable if it is not
ensureMixinType(lockable, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
lockable.lock(false, true);
Session readWrite = getHelper().getReadWriteSession();
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/query/TextNodeTest.java Wed Dec 28 15:32:44 2011
@@ -64,7 +64,7 @@ public class TextNodeTest extends Abstra
public void testTextNodeTest() throws RepositoryException, NotExecutableException {
Node text1 = testRootNode.addNode(jcrXMLText);
text1.setProperty(jcrXMLCharacters, "foo");
- testRootNode.save();
+ testRootNode.getSession().save();
String xpath = "/" + jcrRoot + testRoot + "/text()";
executeXPathQuery(superuser, xpath, new Node[]{text1});
}
@@ -79,7 +79,7 @@ public class TextNodeTest extends Abstra
text1.setProperty(jcrXMLCharacters, "foo");
Node text2 = testRootNode.addNode(nodeName1, testNodeType).addNode(jcrXMLText);
text2.setProperty(jcrXMLCharacters, "foo");
- testRootNode.save();
+ testRootNode.getSession().save();
String xpath = "/" + jcrRoot + testRoot + "//text()";
executeXPathQuery(superuser, xpath, new Node[]{text1, text2});
}
@@ -94,7 +94,7 @@ public class TextNodeTest extends Abstra
text1.setProperty(jcrXMLCharacters, "the quick brown fox jumps over the lazy dog.");
Node text2 = testRootNode.addNode(nodeName1, testNodeType).addNode(jcrXMLText);
text2.setProperty(jcrXMLCharacters, "java content repository");
- testRootNode.save();
+ testRootNode.getSession().save();
String xpath = "/" + jcrRoot + testRoot + "//text()[" + jcrContains + "(., 'fox')]";
executeXPathQuery(superuser, xpath, new Node[]{text1});
}
@@ -118,7 +118,7 @@ public class TextNodeTest extends Abstra
testRootNode.addNode(nodeName1, testNodeType);
Node text2 = testRootNode.addNode(jcrXMLText);
text2.setProperty(jcrXMLCharacters, "foo");
- testRootNode.save();
+ testRootNode.getSession().save();
String xpath = "/" + jcrRoot + testRoot + "/text()[2]";
executeXPathQuery(superuser, xpath, new Node[]{text2});
xpath = "/" + jcrRoot + testRoot + "/text()[last()]";
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/HoldTest.java Wed Dec 28 15:32:44 2011
@@ -282,7 +282,7 @@ public class HoldTest extends AbstractRe
public void testRemoveHoldOnLockedNode() throws NotExecutableException, RepositoryException {
Node child = getLockedChildNode();
Hold h = retentionMgr.addHold(child.getPath(), getHoldName(), false);
- testRootNode.save();
+ testRootNode.getSession().save();
javax.jcr.Session otherS = getHelper().getSuperuserSession();
try {
@@ -313,7 +313,7 @@ public class HoldTest extends AbstractRe
checkSupportedOption(Repository.OPTION_LOCKING_SUPPORTED);
Node child = testRootNode.addNode(nodeName2, testNodeType);
ensureMixinType(child, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
child.lock(false, true); // session-scoped lock clean upon superuser-logout.
return child;
}
@@ -386,7 +386,7 @@ public class HoldTest extends AbstractRe
checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
Node child = testRootNode.addNode(nodeName2, testNodeType);
ensureMixinType(child, mixVersionable);
- testRootNode.save();
+ testRootNode.getSession().save();
return child;
}
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/retention/RetentionPolicyTest.java Wed Dec 28 15:32:44 2011
@@ -280,7 +280,7 @@ public class RetentionPolicyTest extends
public void testRemoveRetentionPolicyOnLockedNode() throws NotExecutableException, RepositoryException {
String childPath = getLockedChildNode().getPath();
retentionMgr.setRetentionPolicy(childPath, getApplicableRetentionPolicy());
- testRootNode.save();
+ testRootNode.getSession().save();
Session otherS = getHelper().getSuperuserSession();
try {
@@ -306,7 +306,7 @@ public class RetentionPolicyTest extends
checkSupportedOption(Repository.OPTION_LOCKING_SUPPORTED);
Node child = testRootNode.addNode(nodeName2, testNodeType);
ensureMixinType(child, mixLockable);
- testRootNode.save();
+ testRootNode.getSession().save();
child.lock(false, true); // session-scoped lock clean upon superuser-logout.
return child;
}
@@ -373,7 +373,7 @@ public class RetentionPolicyTest extends
checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
Node child = testRootNode.addNode(nodeName2, testNodeType);
ensureMixinType(child, mixVersionable);
- testRootNode.save();
+ testRootNode.getSession().save();
return child;
}
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/security/RSessionAccessControlTest.java Wed Dec 28 15:32:44 2011
@@ -44,7 +44,7 @@ public class RSessionAccessControlTest e
Value v = getJcrValue(superuser, RepositoryStub.PROP_PROP_VALUE1, RepositoryStub.PROP_PROP_TYPE1, "test");
Property p = n.setProperty(propertyName1, v);
testPropertyPath = p.getPath();
- testRootNode.save();
+ testRootNode.getSession().save();
readOnlySession = getHelper().getReadOnlySession();
}
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractOnParentVersionTest.java Wed Dec 28 15:32:44 2011
@@ -50,7 +50,7 @@ public abstract class AbstractOnParentVe
if (pd.getOnParentVersion() != OPVAction) {
fail("JCR Property at '"+p.getPath()+"' does not have the required OnParentVersion "+OnParentVersionAction.nameFromValue(OPVAction)+" definition.");
}
- testRootNode.save();
+ testRootNode.getSession().save();
}
protected void tearDown() throws Exception {
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/GetReferencesNodeTest.java Wed Dec 28 15:32:44 2011
@@ -78,13 +78,13 @@ public class GetReferencesNodeTest exten
ensureCanSetProperty(testNode, propertyName1, PropertyType.REFERENCE, false);
testNode.setProperty(propertyName1, nodeToBeReferenced);
- testRootNode.save();
+ testRootNode.getSession().save();
testNode.checkin();
// create a version 1.1 and remove reference
testNode.checkout();
testNode.getProperty(propertyName1).remove();
- testRootNode.save();
+ testRootNode.getSession().save();
testNode.checkin();
// check if reference is returned
@@ -107,6 +107,6 @@ public class GetReferencesNodeTest exten
// node to be referenced, does not have to be versionable
nodeToBeReferenced = testRootNode.addNode(nodeName2, versionableNodeType);
- testRootNode.save();
+ testRootNode.getSession().save();
}
}
\ No newline at end of file
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeSubNodeTest.java Wed Dec 28 15:32:44 2011
@@ -130,7 +130,7 @@ public class MergeSubNodeTest extends Ab
originalNode.checkout();
originalNode.checkin();
- testRootNode.save();
+ testRootNode.getSession().save();
// "merge" the clonedNode with the newNode from the default workspace
// besteffort set to false to stop at the first failure
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/OnParentVersionAbortTest.java Wed Dec 28 15:32:44 2011
@@ -80,7 +80,7 @@ public class OnParentVersionAbortTest ex
public void testRestoreNode() throws RepositoryException, NotExecutableException {
// create child node with OPV-ABORT behaviour
addChildNode(OPVAction);
- testRootNode.save();
+ testRootNode.getSession().save();
try {
versionableNode.checkin();
fail("On checkin of N which has a child node with OnParentVersion ABORT defined, an UnsupportedRepositoryOperationException must be thrown.");
Modified: jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java?rev=1225207&r1=1225206&r2=1225207&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/RemoveVersionTest.java Wed Dec 28 15:32:44 2011
@@ -209,7 +209,7 @@ public class RemoveVersionTest extends A
Value refValue = superuser.getValueFactory().createValue(version);
ensureCanSetProperty(n1, propertyName1, refValue);
n1.setProperty(propertyName1, refValue);
- testRootNode.save();
+ testRootNode.getSession().save();
try {
vHistory.removeVersion(version.getName());