[exo-jcr-commits] exo-jcr SVN: r533 - jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache.

[do-not-reply at jboss.org]

Author: tolusha
Date: 2009-11-10 03:12:16 -0500 (Tue, 10 Nov 2009)
New Revision: 533

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
Log:
EXOJCR-205: test fix

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-10 07:53:00 UTC (rev 532)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/AbstractCacheLoaderTest.java	2009-11-10 08:12:16 UTC (rev 533)
@@ -135,14 +135,12 @@
       // add UserID by the key USER_ID
       list.add(new Modification(ModificationType.PUT_KEY_VALUE, Fqn.fromString("/" + JBossCacheStorage.SESSION),
          JBossCacheStorage.USER_ID, userId));
-      // remove all the attributes from /$SESSION
-      list.add(new Modification(ModificationType.REMOVE_DATA, Fqn.fromString("/" + JBossCacheStorage.SESSION)));
       // return
       return list;
    }
 
    public Modification removeSession()
    {
-      return new Modification(ModificationType.REMOVE_DATA, Fqn.fromString("/" + JBossCacheStorage.SESSION));
+      return new Modification(ModificationType.REMOVE_NODE, 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-10 07:53:00 UTC (rev 532)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/LockCacheLoaderTest.java	2009-11-10 08:12:16 UTC (rev 533)
@@ -51,7 +51,6 @@
 
    public void setUp() throws Exception
    {
-
       this.lockManager = new TesterLockManagerImpl();
       this.lockCacheLoader = new LockCacheLoader(lockManager);
    }
@@ -63,13 +62,13 @@
       String sessionId = "session1";
 
       TransientPropertyData lockIsDeepData =
-         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKISDEEP), IdGenerator.generate(), 1,
+         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKISDEEP), "prop1", 1,
             PropertyType.BOOLEAN, nodeIdentifier, false);
       TransientValueData lockIsDeepValue = new TransientValueData(false);
       lockIsDeepData.setValue(lockIsDeepValue);
 
       TransientPropertyData lockOwnerData =
-         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKOWNER), IdGenerator.generate(), 1,
+         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKOWNER), "prop2", 1,
             PropertyType.BOOLEAN, nodeIdentifier, false);
       TransientValueData lockOwner = new TransientValueData("__system");
       lockOwnerData.setValue(lockOwner);
@@ -90,13 +89,13 @@
       String sessionId = "session1";
 
       TransientPropertyData lockIsDeepData =
-         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKISDEEP), IdGenerator.generate(), 1,
+         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKISDEEP), "prop1", 1,
             PropertyType.BOOLEAN, nodeIdentifier, false);
       TransientValueData lockIsDeepValue = new TransientValueData(false);
       lockIsDeepData.setValue(lockIsDeepValue);
 
       TransientPropertyData lockOwnerData =
-         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKOWNER), IdGenerator.generate(), 1,
+         new TransientPropertyData(QPath.makeChildPath(testRoot, Constants.JCR_LOCKOWNER), "prop2", 1,
             PropertyType.BOOLEAN, nodeIdentifier, false);
       TransientValueData lockOwner = new TransientValueData("__system");
       lockOwnerData.setValue(lockOwner);