Author: areshetnyak Date: 2009-11-19 04:25:25 -0500 (Thu, 19 Nov 2009) New Revision: 763 Modified: jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java Log: EXOJCR-248 : The test JCRStorageConnectionTest 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-19 09:22:38 UTC (rev 762) +++ jcr/branches/1.12.0-JBC/component/core/src/test/java/org/exoplatform/services/jcr/impl/storage/JDBCStorageConnectionTest.java 2009-11-19 09:25:25 UTC (rev 763) @@ -22,6 +22,7 @@ import org.exoplatform.services.jcr.access.AccessControlEntry; import org.exoplatform.services.jcr.access.PermissionType; import org.exoplatform.services.jcr.access.SystemIdentity; +import org.exoplatform.services.jcr.config.WorkspaceEntry; import org.exoplatform.services.jcr.dataflow.DataManager; import org.exoplatform.services.jcr.dataflow.ItemState; import org.exoplatform.services.jcr.dataflow.PlainChangesLogImpl; @@ -38,8 +39,15 @@ import org.exoplatform.services.jcr.impl.dataflow.TransientValueData; import org.exoplatform.services.jcr.impl.dataflow.persistent.WorkspacePersistentDataManager; import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCStorageConnection; +import org.exoplatform.services.jcr.impl.storage.jdbc.JDBCWorkspaceDataContainer; import org.exoplatform.services.jcr.storage.WorkspaceDataContainer; +import org.exoplatform.services.jcr.storage.value.ValueStoragePluginProvider; +import org.exoplatform.services.naming.InitialContextInitializer; +import java.io.IOException; +import java.io.InputStream; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.ArrayList; import java.util.List; @@ -264,9 +272,19 @@ public void testDeleteItemsById() throws Exception { - WorkspaceDataContainer dataContainer = - (WorkspaceDataContainer) session.getContainer().getComponentInstanceOfType(WorkspaceDataContainer.class); + WorkspaceEntry we = null; + + for (WorkspaceEntry wsConfig : repository.getConfiguration().getWorkspaceEntries()) + if (wsConfig.getName().equals(session.getWorkspace().getName())) + we = wsConfig; + + InitialContextInitializer contextInit = (InitialContextInitializer) session.getContainer().getComponentInstanceOfType(InitialContextInitializer.class); + ValueStoragePluginProvider valueStorageProvider = (ValueStoragePluginProvider) session.getContainer().getComponentInstanceOfType(ValueStoragePluginProvider.class); + + JDBCWorkspaceDataContainer dataContainer = new JDBCWorkspaceDataContainer(we, repository.getConfiguration(), contextInit, valueStorageProvider); + + // create node with property primary type. TransientNodeData troot = TransientNodeData.createNodeData(root, InternalQName.parse("[]node_to_delete_by_id"), @@ -276,14 +294,14 @@ TransientPropertyData.createPropertyData(troot, Constants.JCR_PRIMARYTYPE, PropertyType.NAME, false, new TransientValueData(Constants.NT_UNSTRUCTURED)); - PlainChangesLogImpl chlog = new PlainChangesLogImpl(); - chlog.add(ItemState.createAddedState(troot)); - chlog.add(ItemState.createAddedState(pt)); + JDBCStorageConnection connection = (JDBCStorageConnection) dataContainer.openConnection(); - dataManager.save(new TransactionChangesLog(chlog)); - + connection.add(troot); + connection.add(pt); + connection.commit(); + // Delete node and property by ID. - JDBCStorageConnection connection = (JDBCStorageConnection) dataContainer.openConnection(); + connection = (JDBCStorageConnection) dataContainer.openConnection(); connection.deleteProperty(pt.getIdentifier()); connection.deleteNode(troot.getIdentifier());