Author: tolusha Date: 2011-05-10 09:03:07 -0400 (Tue, 10 May 2011) New Revision: 4358 Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImportVersionedChild.java Log: EXOJCR-1250: FUNCTIONAL testing: on configuration multi, cache is turned off there're tests in error and in failure Modified: jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImportVersionedChild.java =================================================================== --- jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImportVersionedChild.java 2011-05-10 13:02:49 UTC (rev 4357) +++ jcr/trunk/exo.jcr.component.core/src/test/java/org/exoplatform/services/jcr/api/importing/TestImportVersionedChild.java 2011-05-10 13:03:07 UTC (rev 4358) @@ -266,15 +266,17 @@ assertTrue(vhPicture.isNodeType("nt:versionedChild")); PlainChangesLog changesLogDelete = new PlainChangesLogImpl(); + changesLogDelete.add(ItemState.createDeletedState(((PropertyImpl)vhPicture + .getProperty("jcr:childVersionHistory")).getData())); changesLogDelete.add(ItemState.createDeletedState(((PropertyImpl)vhPicture.getProperty("jcr:primaryType")) .getData())); - changesLogDelete.add(ItemState.createDeletedState(((PropertyImpl)vhPicture - .getProperty("jcr:childVersionHistory")).getData())); - for (ItemState itemState : changesLogDelete.getAllStates()) - { - dataManager.delete(itemState.getData(), itemState.getAncestorToSave()); - } - session.save(); + changesLogDelete.add(ItemState.createDeletedState((vhPicture.getData()))); + + picture = wc1.getNode("medias").getNode("picture"); + changesLogDelete.add(ItemState.createDeletedState(((PropertyImpl)picture.getProperty("jcr:mixinTypes")) + .getData())); + + dataManager.getTransactManager().save(changesLogDelete); } } @@ -1039,13 +1041,13 @@ .getData())); changesLogDelete.add(ItemState.createDeletedState(((PropertyImpl)vhPicture .getProperty("jcr:childVersionHistory")).getData())); + changesLogDelete.add(ItemState.createDeletedState((vhPicture.getData()))); - for (ItemState itemState : changesLogDelete.getAllStates()) - { - dataManager.delete(itemState.getData(), itemState.getAncestorToSave()); - } + picture = wc1.getNode("medias").getNode("picture"); + changesLogDelete.add(ItemState.createDeletedState(((PropertyImpl)picture.getProperty("jcr:mixinTypes")) + .getData())); - session.save(); + dataManager.getTransactManager().save(changesLogDelete); } }