GitHub-Spring
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Remove duplicated setup 

See gh-34807

Signed-off-by: hgh1472 <hgh1472@naver.com>
pull/35037/head
hgh1472 8 months ago committed by rstoyanchev
parent
8f3ca49bc4
commit
9d3de4ff68
1 changed files with 0 additions and 34 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 34
      spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java

34
spring-orm/src/test/java/org/springframework/orm/jpa/JpaTransactionManagerTests.java
Unescape View File

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

Write Preview
Loading…
Cancel
Save