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

[do-not-reply at jboss.org]

Author: areshetnyak
Date: 2009-11-17 11:42:18 -0500 (Tue, 17 Nov 2009)
New Revision: 729

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

Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java
===================================================================
--- jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java	2009-11-17 16:35:30 UTC (rev 728)
+++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java	2009-11-17 16:42:18 UTC (rev 729)
@@ -267,21 +267,31 @@
       WorkspaceDataContainer dataContainer =
                (WorkspaceDataContainer) session.getContainer().getComponentInstanceOfType(WorkspaceDataContainer.class);
 
-      List<PropertyData> propertysData = dataManager.getChildPropertiesData(testRoot);
+      // create node with property primary type.
+      TransientNodeData troot =
+         TransientNodeData.createNodeData(root, InternalQName.parse("[]node_to_delete_by_id"),
+            Constants.NT_UNSTRUCTURED);
 
-      assertNotNull(propertysData);
-      assertEquals(1, propertysData.size());
+      TransientPropertyData pt =
+         TransientPropertyData.createPropertyData(troot, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false,
+            new TransientValueData(Constants.NT_UNSTRUCTURED));
 
-      PropertyData primaryTypeData = propertysData.get(0);
+      PlainChangesLogImpl chlog = new PlainChangesLogImpl();
+      chlog.add(ItemState.createAddedState(troot));
+      chlog.add(ItemState.createAddedState(pt));
 
+      dataManager.save(new TransactionChangesLog(chlog));
+
+      // Delete node and property by ID.
       JDBCStorageConnection connection = (JDBCStorageConnection) dataContainer.openConnection();
 
-      connection.deleteProperty(primaryTypeData.getIdentifier());
-      connection.deleteNode(testRoot.getIdentifier());
+      connection.deleteProperty(pt.getIdentifier());
+      connection.deleteNode(troot.getIdentifier());
       connection.commit();
 
-      assertNull(dataManager.getItemData(testRoot.getIdentifier()));
-      assertNull(dataManager.getItemData(primaryTypeData.getIdentifier()));
+      //check
+      assertNull(dataManager.getItemData(troot.getIdentifier()));
+      assertNull(dataManager.getItemData(pt.getIdentifier()));
    }
 
 }