[exo-jcr-commits] exo-jcr SVN: r609 - 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: areshetnyak
Date: 2009-11-12 10:46:23 -0500 (Thu, 12 Nov 2009)
New Revision: 609

Modified:
   jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
Log:
EXOJCR-201 : The JDBCCacheLoaderTest was changed.

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java	2009-11-12 15:46:07 UTC (rev 608)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/jbosscache/JDBCCacheLoaderTest.java	2009-11-12 15:46:23 UTC (rev 609)
@@ -487,8 +487,28 @@
    {
 
       // prepare
-
+      WorkspaceStorageConnection conn = persistentContainer.openConnection();
+      
+      String nodeId = IdGenerator.generate();
+      addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null);
+      conn.commit();
+      
+      List<Modification> modifications = new ArrayList<Modification>();
+      
+      conn = persistentContainer.openConnection();
+      
+      NodeData nodeData = (NodeData) conn.getItemData(nodeId);
+      
+      modifications.addAll(removeNode(nodeData));
+      
+      loader.put(modifications);
+      
       // tests it
+      conn = persistentContainer.openConnection();
+      
+      NodeData removedNodeData = (NodeData) conn.getItemData(nodeData.getIdentifier()); 
+      
+      assertNull(removedNodeData);
 
    }
 
@@ -524,28 +544,9 @@
    {
 
       // prepare
-      WorkspaceStorageConnection conn = persistentContainer.openConnection();
       
-      String nodeId = IdGenerator.generate();
-      addDbNode(conn, QPath.makeChildPath(Constants.ROOT_PATH, InternalQName.parse("[]node")), nodeId, Constants.NT_UNSTRUCTURED, null);
-      conn.commit();
-      
-      List<Modification> modifications = new ArrayList<Modification>();
-      
-      conn = persistentContainer.openConnection();
-      
-      NodeData nodeData = (NodeData) conn.getItemData(nodeId);
-      
-      modifications.addAll(removeNode(nodeData));
-      
-      loader.put(modifications);
-      
       // tests it
-      conn = persistentContainer.openConnection();
       
-      NodeData removedNodeData = (NodeData) conn.getItemData(nodeData.getIdentifier()); 
-      
-      assertNull(removedNodeData);
    }
 
    public void testUpdateProperty() throws Exception