root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Ported test adaptations to JPA 2.1 variant 

Issue: SPR-13243
This commit is contained in:
Juergen Hoeller 2015-07-17 18:52:02 +02:00
parent 8e55ad1c08
commit fca33f53e3
1 changed files with 39 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
spring-orm-hibernate4/src/test/java/org/springframework/orm/jpa/jpa21/PersistenceContextTransactionTests.java
View File

@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2014 the original author or authors. * Copyright 2002-2015 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -30,8 +30,6 @@ import org.junit.Test;
import org.springframework.orm.jpa.JpaTransactionManager; import org.springframework.orm.jpa.JpaTransactionManager;
import org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor; import org.springframework.orm.jpa.support.PersistenceAnnotationBeanPostProcessor;
import org.springframework.transaction.TransactionDefinition; import org.springframework.transaction.TransactionDefinition;
import org.springframework.transaction.TransactionStatus;
import org.springframework.transaction.support.TransactionCallback;
import org.springframework.transaction.support.TransactionSynchronizationManager; import org.springframework.transaction.support.TransactionSynchronizationManager;
import org.springframework.transaction.support.TransactionTemplate; import org.springframework.transaction.support.TransactionTemplate;
@ -99,12 +97,9 @@ public class PersistenceContextTransactionTests {
public void testTransactionCommitWithSharedEntityManager() { public void testTransactionCommitWithSharedEntityManager() {
given(manager.getTransaction()).willReturn(tx); given(manager.getTransaction()).willReturn(tx);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.sharedEntityManager.flush(); bean.sharedEntityManager.flush();
return null; return null;
}
}); });
verify(tx).commit(); verify(tx).commit();
@ -118,15 +113,12 @@ public class PersistenceContextTransactionTests {
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override bean.sharedEntityManager.clear();
public Object doInTransaction(TransactionStatus status) {
bean.sharedEntityManager.flush();
return null; return null;
}
}); });
verify(manager).flush(); verify(manager).clear();
verify(manager).close(); verify(manager).close();
} }
@ -134,12 +126,9 @@ public class PersistenceContextTransactionTests {
public void testTransactionCommitWithExtendedEntityManager() { public void testTransactionCommitWithExtendedEntityManager() {
given(manager.getTransaction()).willReturn(tx); given(manager.getTransaction()).willReturn(tx);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.extendedEntityManager.flush(); bean.extendedEntityManager.flush();
return null; return null;
}
}); });
verify(tx, times(2)).commit(); verify(tx, times(2)).commit();
@ -153,12 +142,9 @@ public class PersistenceContextTransactionTests {
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.extendedEntityManager.flush(); bean.extendedEntityManager.flush();
return null; return null;
}
}); });
verify(manager).flush(); verify(manager).flush();
@ -168,12 +154,9 @@ public class PersistenceContextTransactionTests {
public void testTransactionCommitWithSharedEntityManagerUnsynchronized() { public void testTransactionCommitWithSharedEntityManagerUnsynchronized() {
given(manager.getTransaction()).willReturn(tx); given(manager.getTransaction()).willReturn(tx);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.sharedEntityManagerUnsynchronized.flush(); bean.sharedEntityManagerUnsynchronized.flush();
return null; return null;
}
}); });
verify(tx).commit(); verify(tx).commit();
@ -187,15 +170,12 @@ public class PersistenceContextTransactionTests {
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override bean.sharedEntityManagerUnsynchronized.clear();
public Object doInTransaction(TransactionStatus status) {
bean.sharedEntityManagerUnsynchronized.flush();
return null; return null;
}
}); });
verify(manager).flush(); verify(manager).clear();
verify(manager).close(); verify(manager).close();
} }
@ -203,12 +183,9 @@ public class PersistenceContextTransactionTests {
public void testTransactionCommitWithExtendedEntityManagerUnsynchronized() { public void testTransactionCommitWithExtendedEntityManagerUnsynchronized() {
given(manager.getTransaction()).willReturn(tx); given(manager.getTransaction()).willReturn(tx);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.extendedEntityManagerUnsynchronized.flush(); bean.extendedEntityManagerUnsynchronized.flush();
return null; return null;
}
}); });
verify(tx).commit(); verify(tx).commit();
@ -222,12 +199,9 @@ public class PersistenceContextTransactionTests {
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.extendedEntityManagerUnsynchronized.flush(); bean.extendedEntityManagerUnsynchronized.flush();
return null; return null;
}
}); });
verify(manager).flush(); verify(manager).flush();
@ -237,13 +211,10 @@ public class PersistenceContextTransactionTests {
public void testTransactionCommitWithSharedEntityManagerUnsynchronizedJoined() { public void testTransactionCommitWithSharedEntityManagerUnsynchronizedJoined() {
given(manager.getTransaction()).willReturn(tx); given(manager.getTransaction()).willReturn(tx);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.sharedEntityManagerUnsynchronized.joinTransaction(); bean.sharedEntityManagerUnsynchronized.joinTransaction();
bean.sharedEntityManagerUnsynchronized.flush(); bean.sharedEntityManagerUnsynchronized.flush();
return null; return null;
}
}); });
verify(tx).commit(); verify(tx).commit();
@ -251,36 +222,14 @@ public class PersistenceContextTransactionTests {
verify(manager, times(2)).close(); verify(manager, times(2)).close();
} }
@Test
public void testTransactionCommitWithSharedEntityManagerUnsynchronizedJoinedAndPropagationSupports() {
given(manager.isOpen()).willReturn(true);
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
tt.execute(new TransactionCallback() {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.sharedEntityManagerUnsynchronized.joinTransaction();
bean.sharedEntityManagerUnsynchronized.flush();
return null;
}
});
verify(manager).flush();
verify(manager).close();
}
@Test @Test
public void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoined() { public void testTransactionCommitWithExtendedEntityManagerUnsynchronizedJoined() {
given(manager.getTransaction()).willReturn(tx); given(manager.getTransaction()).willReturn(tx);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.extendedEntityManagerUnsynchronized.joinTransaction(); bean.extendedEntityManagerUnsynchronized.joinTransaction();
bean.extendedEntityManagerUnsynchronized.flush(); bean.extendedEntityManagerUnsynchronized.flush();
return null; return null;
}
}); });
verify(tx, times(2)).commit(); verify(tx, times(2)).commit();
@ -294,13 +243,10 @@ public class PersistenceContextTransactionTests {
tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS); tt.setPropagationBehavior(TransactionDefinition.PROPAGATION_SUPPORTS);
tt.execute(new TransactionCallback() { tt.execute(status -> {
@Override
public Object doInTransaction(TransactionStatus status) {
bean.extendedEntityManagerUnsynchronized.joinTransaction(); bean.extendedEntityManagerUnsynchronized.joinTransaction();
bean.extendedEntityManagerUnsynchronized.flush(); bean.extendedEntityManagerUnsynchronized.flush();
return null; return null;
}
}); });
verify(manager).flush(); verify(manager).flush();