diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java index 9fcb07b8b610..f0d165f166e7 100644 --- a/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java +++ b/spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java @@ -81,8 +81,6 @@ void verifyTransactionSynchronizationManagerState() { @Test void testTransactionCommit() { - given(manager.getTransaction()).willReturn(tx); - final List l = new ArrayList<>(); l.add("test"); @@ -106,7 +104,6 @@ void testTransactionCommit() { @Test void testTransactionCommitWithRollbackException() { - given(manager.getTransaction()).willReturn(tx); given(tx.getRollbackOnly()).willReturn(true); willThrow(new RollbackException()).given(tx).commit(); @@ -138,7 +135,6 @@ void testTransactionCommitWithRollbackException() { @Test void testTransactionRollback() { - given(manager.getTransaction()).willReturn(tx); given(tx.isActive()).willReturn(true); final List l = new ArrayList<>(); @@ -163,8 +159,6 @@ void testTransactionRollback() { @Test void testTransactionRollbackWithAlreadyRolledBack() { - given(manager.getTransaction()).willReturn(tx); - final List l = new ArrayList<>(); l.add("test"); @@ -186,7 +180,6 @@ void testTransactionRollbackWithAlreadyRolledBack() { @Test void testTransactionRollbackOnly() { - given(manager.getTransaction()).willReturn(tx); given(tx.isActive()).willReturn(true); final List l = new ArrayList<>(); @@ -214,8 +207,6 @@ void testTransactionRollbackOnly() { @Test void testParticipatingTransactionWithCommit() { - given(manager.getTransaction()).willReturn(tx); - final List l = new ArrayList<>(); l.add("test"); @@ -241,7 +232,6 @@ void testParticipatingTransactionWithCommit() { @Test void testParticipatingTransactionWithRollback() { - given(manager.getTransaction()).willReturn(tx); given(tx.isActive()).willReturn(true); final List l = new ArrayList<>(); @@ -269,7 +259,6 @@ void testParticipatingTransactionWithRollback() { @Test void testParticipatingTransactionWithRollbackOnly() { - given(manager.getTransaction()).willReturn(tx); given(tx.isActive()).willReturn(true); given(tx.getRollbackOnly()).willReturn(true); willThrow(new RollbackException()).given(tx).commit(); @@ -304,10 +293,6 @@ void testParticipatingTransactionWithRollbackOnly() { void testParticipatingTransactionWithRequiresNew() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); - given(factory.createEntityManager()).willReturn(manager); - given(manager.getTransaction()).willReturn(tx); - given(manager.isOpen()).willReturn(true); - final List l = new ArrayList<>(); l.add("test"); @@ -335,7 +320,6 @@ void testParticipatingTransactionWithRequiresNew() { void testParticipatingTransactionWithRequiresNewAndPrebound() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW); - given(manager.getTransaction()).willReturn(tx); final List l = new ArrayList<>(); l.add("test"); @@ -374,8 +358,6 @@ void testParticipatingTransactionWithRequiresNewAndPrebound() { void testPropagationSupportsAndRequiresNew() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); - given(manager.getTransaction()).willReturn(tx); - final List l = new ArrayList<>(); l.add("test"); @@ -405,10 +387,6 @@ void testPropagationSupportsAndRequiresNew() { void testPropagationSupportsAndRequiresNewAndEarlyAccess() { tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); - given(factory.createEntityManager()).willReturn(manager); - given(manager.getTransaction()).willReturn(tx); - given(manager.isOpen()).willReturn(true); - final List l = new ArrayList<>(); l.add("test"); @@ -443,7 +421,6 @@ void testTransactionWithRequiresNewInAfterCompletion() { EntityManager manager2 = mock(); EntityTransaction tx2 = mock(); - given(manager.getTransaction()).willReturn(tx); given(factory.createEntityManager()).willReturn(manager, manager2); given(manager2.getTransaction()).willReturn(tx2); given(manager2.isOpen()).willReturn(true); @@ -479,8 +456,6 @@ public void afterCompletion(int status) { @Test void testTransactionCommitWithPropagationSupports() { - given(manager.isOpen()).willReturn(true); - final List l = new ArrayList<>(); l.add("test"); @@ -507,8 +482,6 @@ void testTransactionCommitWithPropagationSupports() { @Test void testTransactionRollbackWithPropagationSupports() { - given(manager.isOpen()).willReturn(true); - tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -532,8 +505,6 @@ void testTransactionRollbackWithPropagationSupports() { @Test void testTransactionCommitWithPrebound() { - given(manager.getTransaction()).willReturn(tx); - final List l = new ArrayList<>(); l.add("test"); @@ -563,7 +534,6 @@ void testTransactionCommitWithPrebound() { @Test void testTransactionRollbackWithPrebound() { - given(manager.getTransaction()).willReturn(tx); given(tx.isActive()).willReturn(true); assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); @@ -655,8 +625,6 @@ void testTransactionRollbackWithPreboundAndPropagationSupports() { void testInvalidIsolation() { tt.setIsolationLevel(TransactionDefinition.ISOLATION_SERIALIZABLE); - given(manager.isOpen()).willReturn(true); - assertThatExceptionOfType(InvalidIsolationLevelException.class).isThrownBy(() -> tt.execute(new TransactionCallbackWithoutResult() { @Override @@ -669,8 +637,6 @@ protected void doInTransactionWithoutResult(TransactionStatus status) { @Test void testTransactionFlush() { - given(manager.getTransaction()).willReturn(tx); - assertThat(TransactionSynchronizationManager.hasResource(factory)).isFalse(); assertThat(TransactionSynchronizationManager.isSynchronizationActive()).isFalse();