You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by ju...@apache.org on 2009/04/22 10:26:57 UTC
svn commit: r767407 -
/jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
Author: jukka
Date: Wed Apr 22 08:26:57 2009
New Revision: 767407
URL: http://svn.apache.org/viewvc?rev=767407&view=rev
Log:
1.5: Merged revision 761715 (JCR-2048)
Modified:
jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
Modified: jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java?rev=767407&r1=767406&r2=767407&view=diff
==============================================================================
--- jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java (original)
+++ jackrabbit/branches/1.5/jackrabbit-core/src/test/java/org/apache/jackrabbit/core/data/PersistenceManagerIteratorTest.java Wed Apr 22 08:26:57 2009
@@ -67,64 +67,69 @@
}
for (int i = 0; i < names.length; i++) {
- Method m = r.getClass().getDeclaredMethod("getWorkspaceInfo", new Class[] { String.class });
- m.setAccessible(true);
- Object info = m.invoke(r, new String[] { names[i] });
- m = info.getClass().getDeclaredMethod("getPersistenceManager", new Class[0]);
- m.setAccessible(true);
- PersistenceManager pm = (PersistenceManager) m.invoke(info, new Object[0]);
- if (!(pm instanceof AbstractBundlePersistenceManager)) {
- log("PM skipped: " + pm.getClass());
- continue;
- }
- AbstractBundlePersistenceManager apm = (AbstractBundlePersistenceManager) pm;
- log("PM: " + pm.getClass().getName());
-
- log("All nodes in one step");
- NodeIdIterator it = apm.getAllNodeIds(null, 0);
- NodeId after = null;
- NodeId first = null;
- while (it.hasNext()) {
- NodeId id = it.nextNodeId();
- log(" " + id.toString());
- if (first == null) {
- // initialize first node id
- first = id;
- }
- if (after != null) {
- assertFalse(id.getUUID().compareTo(after.getUUID()) == 0);
+ Session s = helper.getSuperuserSession(names[i]);
+ try {
+ Method m = r.getClass().getDeclaredMethod("getWorkspaceInfo", new Class[] { String.class });
+ m.setAccessible(true);
+ Object info = m.invoke(r, new String[] { names[i] });
+ m = info.getClass().getDeclaredMethod("getPersistenceManager", new Class[0]);
+ m.setAccessible(true);
+ PersistenceManager pm = (PersistenceManager) m.invoke(info, new Object[0]);
+ if (!(pm instanceof AbstractBundlePersistenceManager)) {
+ log("PM skipped: " + pm.getClass());
+ continue;
}
- after = id;
- }
+ AbstractBundlePersistenceManager apm = (AbstractBundlePersistenceManager) pm;
+ log("PM: " + pm.getClass().getName());
- // start with first
- after = first;
- log("All nodes using batches");
- while (true) {
- log(" bigger than: " + after);
- it = apm.getAllNodeIds(after, 2);
- if (!it.hasNext()) {
- break;
- }
+ log("All nodes in one step");
+ NodeIdIterator it = apm.getAllNodeIds(null, 0);
+ NodeId after = null;
+ NodeId first = null;
while (it.hasNext()) {
NodeId id = it.nextNodeId();
- log(" " + id.toString());
- assertFalse(id.getUUID().compareTo(after.getUUID()) == 0);
+ log(" " + id.toString());
+ if (first == null) {
+ // initialize first node id
+ first = id;
+ }
+ if (after != null) {
+ assertFalse(id.getUUID().compareTo(after.getUUID()) == 0);
+ }
after = id;
}
- }
- log("Random access");
- for (int j = 0; j < 50; j++) {
- after = new NodeId(UUID.randomUUID());
- log(" bigger than: " + after);
- it = apm.getAllNodeIds(after, 2);
- while (it.hasNext()) {
- NodeId id = it.nextNodeId();
- log(" " + id.toString());
- assertFalse(id.getUUID().compareTo(after.getUUID()) == 0);
- after = id;
+ // start with first
+ after = first;
+ log("All nodes using batches");
+ while (true) {
+ log(" bigger than: " + after);
+ it = apm.getAllNodeIds(after, 2);
+ if (!it.hasNext()) {
+ break;
+ }
+ while (it.hasNext()) {
+ NodeId id = it.nextNodeId();
+ log(" " + id.toString());
+ assertFalse(id.getUUID().compareTo(after.getUUID()) == 0);
+ after = id;
+ }
+ }
+
+ log("Random access");
+ for (int j = 0; j < 50; j++) {
+ after = new NodeId(UUID.randomUUID());
+ log(" bigger than: " + after);
+ it = apm.getAllNodeIds(after, 2);
+ while (it.hasNext()) {
+ NodeId id = it.nextNodeId();
+ log(" " + id.toString());
+ assertFalse(id.getUUID().compareTo(after.getUUID()) == 0);
+ after = id;
+ }
}
+ } finally {
+ s.logout();
}
}
}