From ce7fd3704f6792fd5a6567ad45230351f710e3a8 Mon Sep 17 00:00:00 2001 From: Mattias Arthursson Date: Sat, 6 Jan 2007 16:53:36 +0000 Subject: [PATCH] Compensating rollback operations are now not stored until the target operation has been successfully performed. --- ...urceTransactionManagerIntegrationTest.java | 1 - ...ompensatingTransactionDataManagerTest.java | 163 ------------------ 2 files changed, 164 deletions(-) delete mode 100644 sandbox/src/test/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionDataManagerTest.java diff --git a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java index 4fd1b0ed..04b02baf 100644 --- a/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java +++ b/sandbox/src/itest/java/org/springframework/ldap/support/transaction/ContextSourceTransactionManagerIntegrationTest.java @@ -8,7 +8,6 @@ import org.apache.commons.logging.LogFactory; import org.springframework.ldap.EntryNotFoundException; import org.springframework.ldap.LdapServerManager; import org.springframework.ldap.core.AttributesMapper; -import org.springframework.ldap.core.LdapOperations; import org.springframework.ldap.core.LdapTemplate; import org.springframework.test.AbstractDependencyInjectionSpringContextTests; diff --git a/sandbox/src/test/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionDataManagerTest.java b/sandbox/src/test/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionDataManagerTest.java deleted file mode 100644 index 35aee4fd..00000000 --- a/sandbox/src/test/java/org/springframework/ldap/support/transaction/LdapCompensatingTransactionDataManagerTest.java +++ /dev/null @@ -1,163 +0,0 @@ -package org.springframework.ldap.support.transaction; - -import java.util.Stack; - -import junit.framework.TestCase; - -import org.easymock.MockControl; -import org.springframework.ldap.core.LdapOperations; -import org.springframework.ldap.support.transaction.CompensatingTransactionRecordingOperation; -import org.springframework.ldap.support.transaction.CompensatingTransactionRollbackOperation; -import org.springframework.ldap.support.transaction.LdapCompensatingTransactionDataManager; - -public class LdapCompensatingTransactionDataManagerTest extends TestCase { - - private MockControl recordingOperationControl; - - private CompensatingTransactionRecordingOperation recordingOperationMock; - - private MockControl rollbackOperationControl; - - private CompensatingTransactionRollbackOperation rollbackOperationMock; - - private MockControl ldapOperationsControl; - - private LdapOperations ldapOperationsMock; - - protected void setUp() throws Exception { - super.setUp(); - recordingOperationControl = MockControl - .createControl(CompensatingTransactionRecordingOperation.class); - recordingOperationMock = (CompensatingTransactionRecordingOperation) recordingOperationControl - .getMock(); - - rollbackOperationControl = MockControl - .createControl(CompensatingTransactionRollbackOperation.class); - rollbackOperationMock = (CompensatingTransactionRollbackOperation) rollbackOperationControl - .getMock(); - - ldapOperationsControl = MockControl.createControl(LdapOperations.class); - ldapOperationsMock = (LdapOperations) ldapOperationsControl.getMock(); - } - - protected void tearDown() throws Exception { - super.tearDown(); - recordingOperationControl = null; - recordingOperationMock = null; - - rollbackOperationControl = null; - rollbackOperationMock = null; - - ldapOperationsControl = null; - ldapOperationsMock = null; - } - - protected void replay() { - recordingOperationControl.replay(); - rollbackOperationControl.replay(); - ldapOperationsControl.replay(); - } - - protected void verify() { - recordingOperationControl.verify(); - rollbackOperationControl.verify(); - ldapOperationsControl.verify(); - } - - public void testOperationPerformed() { - AbstractCompensatingTransactionDataManager tested = new LdapCompensatingTransactionDataManager( - null) { - protected CompensatingTransactionRecordingOperation getRecordingOperation( - String operation) { - assertEquals("bind", operation); - return recordingOperationMock; - } - }; - - Object[] expectedParams = new Object[0]; - recordingOperationControl.expectAndReturn(recordingOperationMock - .performOperation(expectedParams), rollbackOperationMock); - - replay(); - tested.operationPerformed("bind", expectedParams); - verify(); - - Stack result = tested.getRollbackOperations(); - assertFalse(result.isEmpty()); - assertSame(rollbackOperationMock, result.peek()); - } - - public void testRollback() { - AbstractCompensatingTransactionDataManager tested = new LdapCompensatingTransactionDataManager( - null); - tested.getRollbackOperations().push(rollbackOperationMock); - - rollbackOperationMock.rollback(); - - replay(); - tested.rollback(); - verify(); - } - - public void testGetRecordingOperation_Bind() throws Exception { - LdapCompensatingTransactionDataManager tested = new LdapCompensatingTransactionDataManager( - null); - tested.setLdapOperations(ldapOperationsMock); - - CompensatingTransactionRecordingOperation result = tested - .getRecordingOperation("bind"); - assertTrue(result instanceof BindRecordingOperation); - BindRecordingOperation bindRecordingOperation = (BindRecordingOperation) result; - assertSame(ldapOperationsMock, bindRecordingOperation - .getLdapOperations()); - } - - public void testGetRecordingOperation_Rebind() throws Exception { - LdapCompensatingTransactionDataManager tested = new LdapCompensatingTransactionDataManager( - null); - tested.setLdapOperations(ldapOperationsMock); - - CompensatingTransactionRecordingOperation result = tested - .getRecordingOperation("rebind"); - assertTrue(result instanceof RebindRecordingOperation); - RebindRecordingOperation rebindRecordingOperation = (RebindRecordingOperation) result; - assertSame(ldapOperationsMock, rebindRecordingOperation - .getLdapOperations()); - } - - public void testGetRecordingOperation_Rename() throws Exception { - LdapCompensatingTransactionDataManager tested = new LdapCompensatingTransactionDataManager( - null); - tested.setLdapOperations(ldapOperationsMock); - - CompensatingTransactionRecordingOperation result = tested - .getRecordingOperation("rename"); - assertTrue(result instanceof RenameRecordingOperation); - RenameRecordingOperation recordingOperation = (RenameRecordingOperation) result; - assertSame(ldapOperationsMock, recordingOperation.getLdapOperations()); - } - - public void testGetRecordingOperation_ModifyAttributes() throws Exception { - LdapCompensatingTransactionDataManager tested = new LdapCompensatingTransactionDataManager( - null); - tested.setLdapOperations(ldapOperationsMock); - - CompensatingTransactionRecordingOperation result = tested - .getRecordingOperation("modifyAttributes"); - assertTrue(result instanceof ModifyAttributesRecordingOperation); - ModifyAttributesRecordingOperation recordingOperation = (ModifyAttributesRecordingOperation) result; - assertSame(ldapOperationsMock, recordingOperation.getLdapOperations()); - } - - public void testGetRecordingOperation_Unbind() throws Exception { - LdapCompensatingTransactionDataManager tested = new LdapCompensatingTransactionDataManager( - null); - tested.setLdapOperations(ldapOperationsMock); - - CompensatingTransactionRecordingOperation result = tested - .getRecordingOperation("unbind"); - assertTrue(result instanceof UnbindRecordingOperation); - UnbindRecordingOperation recordingOperation = (UnbindRecordingOperation) result; - assertSame(ldapOperationsMock, recordingOperation.getLdapOperations()); - } -}