[exo-jcr-commits] exo-jcr SVN: r585 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Nov 12 04:09:43 EST 2009
Author: tolusha
Date: 2009-11-12 04:09:42 -0500 (Thu, 12 Nov 2009)
New Revision: 585
Modified:
jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.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
Log:
EXOJCR-205: remove unecessary code, rename methods
Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java 2009-11-12 09:07:00 UTC (rev 584)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java 2009-11-12 09:09:42 UTC (rev 585)
@@ -39,8 +39,6 @@
public abstract class AbstractCacheLoaderTest extends TestCase
{
- protected static boolean addPUTDATA = true;
-
public void setUp() throws Exception
{
super.setUp();
@@ -70,16 +68,14 @@
"/" + JBossCacheStorage.NODES + "/" + data.getParentIdentifier() + "/"
+ data.getQPath().getEntries()[data.getQPath().getEntries().length - 1].getAsString();
// Fire modification child added
- if (addPUTDATA)
- list.add(new Modification(ModificationType.PUT_DATA, Fqn.fromString(childFqn)));
+ list.add(new Modification(ModificationType.PUT_DATA, Fqn.fromString(childFqn)));
// add modification that value is written by key ITEM_ID
list.add(new Modification(ModificationType.PUT_KEY_VALUE, Fqn.fromString(childFqn), JBossCacheStorage.ITEM_ID,
data.getIdentifier()));
}
String nodeFqn = "/" + JBossCacheStorage.NODES + "/" + data.getIdentifier();
// add PUT_DATA modification
- if (addPUTDATA)
- list.add(new Modification(ModificationType.PUT_DATA, Fqn.fromString(nodeFqn)));
+ list.add(new Modification(ModificationType.PUT_DATA, Fqn.fromString(nodeFqn)));
list.add(new Modification(ModificationType.PUT_KEY_VALUE, Fqn.fromString(nodeFqn), JBossCacheStorage.ITEM_DATA,
data));
@@ -133,8 +129,7 @@
String fqn = "/" + JBossCacheStorage.PROPS + "/" + data.getIdentifier();
// add modification PUT_DATA if enabled
- if (addPUTDATA)
- list.add(new Modification(ModificationType.PUT_DATA, Fqn.fromString(fqn)));
+ list.add(new Modification(ModificationType.PUT_DATA, Fqn.fromString(fqn)));
// put property data
list
.add(new Modification(ModificationType.PUT_KEY_VALUE, Fqn.fromString(fqn), JBossCacheStorage.ITEM_DATA, data));
@@ -201,7 +196,7 @@
* @param userId
* @return
*/
- public List<Modification> setSession(String sessionId, String userId)
+ public List<Modification> addSessionInfo(String sessionId, String userId)
{
List<Modification> list = new ArrayList<Modification>();
// add SessionID by the key SESSION_ID
@@ -221,7 +216,7 @@
*
* @return
*/
- public List<Modification> removeSession()
+ public List<Modification> removeSessionInfo()
{
List<Modification> list = new ArrayList<Modification>();
list.add(new Modification(ModificationType.REMOVE_DATA, Fqn.fromString("/" + JBossCacheStorage.SESSION)));
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-12 09:07:00 UTC (rev 584)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java 2009-11-12 09:09:42 UTC (rev 585)
@@ -105,10 +105,10 @@
lockManager.addPendingLock(nodeIdentifier, new LockData(nodeIdentifier, "token", false, false, "__system", -1));
- modifications.addAll(setSession(sessionId, "userId"));
+ modifications.addAll(addSessionInfo(sessionId, "userId"));
modifications.addAll(addProperty(lockIsDeepData));
modifications.addAll(addProperty(lockOwnerData));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
lockCacheLoader.put(modifications);
assertEquals(nodeIdentifier, lockManager.getNodeIdentifier());
@@ -132,10 +132,10 @@
TransientValueData lockOwner = new TransientValueData("__system");
lockOwnerData.setValue(lockOwner);
- modifications.addAll(setSession(sessionId, "userId"));
+ modifications.addAll(addSessionInfo(sessionId, "userId"));
modifications.addAll(removeProperty(lockIsDeepData));
modifications.addAll(removeProperty(lockOwnerData));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
lockCacheLoader.put(modifications);
assertEquals(nodeIdentifier, lockManager.getNodeIdentifier());
@@ -153,9 +153,9 @@
lockManager.addLock(nodeIdentifier, new LockData(nodeIdentifier, "token", false, false, "__system", -1));
- modifications.addAll(setSession(sessionId, "userId"));
+ modifications.addAll(addSessionInfo(sessionId, "userId"));
modifications.addAll(addNode(node));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
lockCacheLoader.put(modifications);
assertNull(lockManager.getNodeIdentifier());
@@ -173,9 +173,9 @@
lockManager.addLock(nodeIdentifier, new LockData(nodeIdentifier, "token", false, false, "__system", -1));
- modifications.addAll(setSession(sessionId, "userId"));
+ modifications.addAll(addSessionInfo(sessionId, "userId"));
modifications.addAll(removeNode(node));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
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-12 09:07:00 UTC (rev 584)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/ObservationCacheLoaderTest.java 2009-11-12 09:09:42 UTC (rev 585)
@@ -130,9 +130,9 @@
registry.addEventListener(listener, new ListenerCriteria(Event.NODE_ADDED, null, true,
new String[]{Constants.ROOT_UUID}, null, false, "session1"));
- List<Modification> modifications = new ArrayList<Modification>(setSession("session1", "admin"));
+ List<Modification> modifications = new ArrayList<Modification>(addSessionInfo("session1", "admin"));
modifications.addAll(addNode(newNode));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
loader.put(modifications);
assertEquals(1, listener.eventList.size());
Event event = listener.eventList.get(0);
@@ -151,9 +151,9 @@
registry.addEventListener(listener, new ListenerCriteria(Event.NODE_ADDED,
lf.parseAbsPath("/").getInternalPath(), true, null, null, false, "session1"));
- List<Modification> modifications = new ArrayList<Modification>(setSession("session1", "admin"));
+ List<Modification> modifications = new ArrayList<Modification>(addSessionInfo("session1", "admin"));
modifications.addAll(addNode(newNode));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
loader.put(modifications);
assertEvent(Event.NODE_ADDED, node1path, listener, "admin");
@@ -169,9 +169,9 @@
registry.addEventListener(listener, new ListenerCriteria(Event.NODE_REMOVED, lf.parseAbsPath("/")
.getInternalPath(), true, null, null, false, "session1"));
- List<Modification> modifications = new ArrayList<Modification>(setSession("session1", "admin"));
+ List<Modification> modifications = new ArrayList<Modification>(addSessionInfo("session1", "admin"));
modifications.addAll(removeNode(newNode));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
loader.put(modifications);
assertEvent(Event.NODE_REMOVED, node1path, listener, "admin");
@@ -187,9 +187,9 @@
registry.addEventListener(listener, new ListenerCriteria(Event.PROPERTY_ADDED, lf.parseAbsPath("/")
.getInternalPath(), true, null, null, false, "session1"));
- List<Modification> modifications = new ArrayList<Modification>(setSession("session1", "admin"));
+ List<Modification> modifications = new ArrayList<Modification>(addSessionInfo("session1", "admin"));
modifications.addAll(addProperty(newProperty));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
loader.put(modifications);
assertEvent(Event.PROPERTY_ADDED, prop1path, listener, "admin");
@@ -205,9 +205,9 @@
registry.addEventListener(listener, new ListenerCriteria(Event.PROPERTY_CHANGED, lf.parseAbsPath("/")
.getInternalPath(), true, null, null, false, "session1"));
- List<Modification> modifications = new ArrayList<Modification>(setSession("session1", "admin"));
+ List<Modification> modifications = new ArrayList<Modification>(addSessionInfo("session1", "admin"));
modifications.addAll(updateProperty(newProperty));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
loader.put(modifications);
assertEvent(Event.PROPERTY_CHANGED, prop1path, listener, "admin");
@@ -223,9 +223,9 @@
registry.addEventListener(listener, new ListenerCriteria(Event.PROPERTY_REMOVED, lf.parseAbsPath("/")
.getInternalPath(), true, null, null, false, "session1"));
- List<Modification> modifications = new ArrayList<Modification>(setSession("session1", "admin"));
+ List<Modification> modifications = new ArrayList<Modification>(addSessionInfo("session1", "admin"));
modifications.addAll(removeProperty(newProperty));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
loader.put(modifications);
assertEvent(Event.PROPERTY_REMOVED, prop1path, listener, "admin");
@@ -274,10 +274,10 @@
lf.parseAbsPath("/").getInternalPath(), true, null, new InternalQName[]{Constants.NT_RESOURCE}, false,
"session1"));
- List<Modification> modifications = new ArrayList<Modification>(setSession("session1", "admin"));
+ List<Modification> modifications = new ArrayList<Modification>(addSessionInfo("session1", "admin"));
modifications.addAll(addNode(childNode1));
modifications.addAll(addNode(childNode2));
- modifications.addAll(removeSession());
+ modifications.addAll(removeSessionInfo());
loader.put(modifications);
// one event expected
assertEvent(Event.NODE_ADDED, child2path, listener, "admin");
More information about the exo-jcr-commits
mailing list