[exo-jcr-commits] exo-jcr SVN: r536 - in jcr/branches/1.12.0-JBC/component/core/src: test/java/org/exoplatform/services/jcr/impl/storage/jbosscache and 1 other directory.
do-not-reply at jboss.org
do-not-reply at jboss.org
Tue Nov 10 04:00:00 EST 2009
Author: tolusha
Date: 2009-11-10 04:00:00 -0500 (Tue, 10 Nov 2009)
New Revision: 536
Modified:
jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java
Log:
EXOJCR-205: test fix
Modified: jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2009-11-10 08:56:46 UTC (rev 535)
+++ jcr/branches/1.12.0-JBC/component/core/src/main/java/org/exoplatform/services/jcr/impl/core/lock/LockManagerImpl.java 2009-11-10 09:00:00 UTC (rev 536)
@@ -117,8 +117,10 @@
/**
* Map NodeIdentifier -- lockData
+ *
+ * TODO: changed from private to protected
*/
- private final Map<String, LockData> pendingLocks;
+ protected final Map<String, LockData> pendingLocks;
/**
* Map lockToken --lockData
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java 2009-11-10 08:56:46 UTC (rev 535)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/IndexerCacheLoaderTest.java 2009-11-10 09:00:00 UTC (rev 536)
@@ -85,8 +85,8 @@
List<Modification> modification = new ArrayList<Modification>();
- modification.add(addNode(newNode));
- modification.add(addProperty(newProperty));
+ modification.addAll(addNode(newNode));
+ modification.addAll(addProperty(newProperty));
indexerCacheLoader.put(modification);
assertNotNull(searchManager.getAddedNodes());
assertNotNull(searchManager.getRemovedNodes());
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java 2009-11-10 08:56:46 UTC (rev 535)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java 2009-11-10 09:00:00 UTC (rev 536)
@@ -17,9 +17,13 @@
package org.exoplatform.services.jcr.impl.storage.jbosscache;
import org.exoplatform.services.jcr.datamodel.InternalQName;
+import org.exoplatform.services.jcr.datamodel.NodeData;
import org.exoplatform.services.jcr.datamodel.QPath;
import org.exoplatform.services.jcr.impl.Constants;
+import org.exoplatform.services.jcr.impl.core.NodeImpl;
+import org.exoplatform.services.jcr.impl.core.lock.LockData;
import org.exoplatform.services.jcr.impl.core.value.ValueFactoryImpl;
+import org.exoplatform.services.jcr.impl.dataflow.TransientNodeData;
import org.exoplatform.services.jcr.impl.dataflow.TransientPropertyData;
import org.exoplatform.services.jcr.impl.dataflow.TransientValueData;
import org.exoplatform.services.jcr.util.IdGenerator;
@@ -73,10 +77,12 @@
TransientValueData lockOwner = new TransientValueData("__system");
lockOwnerData.setValue(lockOwner);
+ lockManager.addPendingLock(nodeIdentifier, new LockData(nodeIdentifier, "token", false, false, "__system", -1));
+
modifications.addAll(setSession(sessionId, "userId"));
- modifications.add(addProperty(lockIsDeepData));
- modifications.add(addProperty(lockOwnerData));
- modifications.add(removeSession());
+ modifications.addAll(addProperty(lockIsDeepData));
+ modifications.addAll(addProperty(lockOwnerData));
+ modifications.addAll(removeSession());
lockCacheLoader.put(modifications);
assertEquals(nodeIdentifier, lockManager.getNodeIdentifier());
@@ -101,9 +107,9 @@
lockOwnerData.setValue(lockOwner);
modifications.addAll(setSession(sessionId, "userId"));
- modifications.add(removeProperty(lockIsDeepData));
- modifications.add(removeProperty(lockOwnerData));
- modifications.add(removeSession());
+ modifications.addAll(removeProperty(lockIsDeepData));
+ modifications.addAll(removeProperty(lockOwnerData));
+ modifications.addAll(removeSession());
lockCacheLoader.put(modifications);
assertEquals(nodeIdentifier, lockManager.getNodeIdentifier());
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-10 08:56:46 UTC (rev 535)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-10 09:00:00 UTC (rev 536)
@@ -106,7 +106,7 @@
new String[]{Constants.ROOT_UUID}, null, false, "asd"));
List<Modification> modifications = new ArrayList<Modification>();
- modifications.add(addNode(newNode));
+ modifications.addAll(addNode(newNode));
loader.put(modifications);
assertEquals(1, listener.eventList.size());
Event event = listener.eventList.get(0);
@@ -125,7 +125,7 @@
lf.parseAbsPath("/").getInternalPath(), true, null, null, false, "asd"));
List<Modification> modifications = new ArrayList<Modification>();
- modifications.add(addNode(newNode));
+ modifications.addAll(addNode(newNode));
loader.put(modifications);
assertEquals(1, listener.eventList.size());
Event event = listener.eventList.get(0);
@@ -144,7 +144,7 @@
.getInternalPath(), true, null, null, false, "asd"));
List<Modification> modifications = new ArrayList<Modification>();
- modifications.add(removeNode(newNode));
+ modifications.addAll(removeNode(newNode));
loader.put(modifications);
assertEquals(1, listener.eventList.size());
Event event = listener.eventList.get(0);
@@ -163,7 +163,7 @@
.getInternalPath(), true, null, null, false, "asd"));
List<Modification> modifications = new ArrayList<Modification>();
- modifications.add(addProperty(newProperty));
+ modifications.addAll(addProperty(newProperty));
loader.put(modifications);
assertEquals(1, listener.eventList.size());
Event event = listener.eventList.get(0);
@@ -182,7 +182,7 @@
.getInternalPath(), true, null, null, false, "asd"));
List<Modification> modifications = new ArrayList<Modification>();
- modifications.add(updateProperty(newProperty));
+ modifications.addAll(updateProperty(newProperty));
loader.put(modifications);
assertEquals(1, listener.eventList.size());
Event event = listener.eventList.get(0);
@@ -201,7 +201,7 @@
.getInternalPath(), true, null, null, false, "asd"));
List<Modification> modifications = new ArrayList<Modification>();
- modifications.add(removeProperty(newProperty));
+ modifications.addAll(removeProperty(newProperty));
loader.put(modifications);
assertEquals(1, listener.eventList.size());
Event event = listener.eventList.get(0);
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java 2009-11-10 08:56:46 UTC (rev 535)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/TesterLockManagerImpl.java 2009-11-10 09:00:00 UTC (rev 536)
@@ -16,10 +16,15 @@
*/
package org.exoplatform.services.jcr.impl.storage.jbosscache;
+import sun.security.util.PendingException;
+
import org.exoplatform.services.jcr.config.WorkspaceEntry;
+import org.exoplatform.services.jcr.impl.core.lock.LockData;
import org.exoplatform.services.jcr.impl.core.lock.LockManagerImpl;
import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager;
+import java.util.Map;
+
import javax.jcr.lock.LockException;
/**
@@ -74,4 +79,9 @@
return sessionId;
}
+ public void addPendingLock(String nodeIdentifier, LockData lData)
+ {
+ pendingLocks.put(nodeIdentifier, lData);
+ }
+
}
More information about the exo-jcr-commits
mailing list