Spring/spring-integration
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #633 from garyrussell/INT-2759

Browse Source 
* INT-2759:
  INT-2759 Fix Failing JPA Test
This commit is contained in:
Oleg Zhurakousky
2012-09-20 12:08:55 -04:00
parent 52d042eadc f73522d5d0
commit 9e8d1c83f8
1 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-integration-jpa/src/test/java/org/springframework/integration/jpa/inbound/JpaPollingChannelAdapterTests.java
View File

@@ -19,6 +19,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.ArrayList;
import java.util.Collection;
@@ -50,6 +51,7 @@ import org.springframework.test.context.transaction.TransactionConfiguration;
* Integration tests for the Jpa Polling Channel Adapter {@link JpaPollingChannelAdapter}.
*
* @author Gunnar Hillert
* @author Gary Russell
* @since 2.2
*
*/
@@ -270,6 +272,7 @@ public class JpaPollingChannelAdapterTests {
final JpaExecutor jpaExecutor = new JpaExecutor(entityManager);
jpaExecutor.setJpaQuery("from Student s");
jpaExecutor.setDeleteAfterPoll(true);
jpaExecutor.setDeleteInBatch(true);
final JpaPollingChannelAdapter jpaPollingChannelAdapter = new JpaPollingChannelAdapter(jpaExecutor);
@@ -297,12 +300,29 @@ public class JpaPollingChannelAdapterTests {
assertTrue(students.size() == 3);
Long studentCount = entityManager.createQuery("select count(*) from Student", Long.class).getSingleResult();
Long studentCount = waitForDeletes(students);
assertEquals(Long.valueOf(0), studentCount);
}
private Long waitForDeletes(Collection<?> students) throws InterruptedException {
Long studentCount = Long.valueOf(students.size());
int n = 0;
while (studentCount > 0) {
studentCount = entityManager.createQuery("select count(*) from Student", Long.class).getSingleResult();
if (studentCount > 0) {
Thread.sleep(100);
if (n++ > 100) {
fail("Failed to delete after poll");
}
}
}
return studentCount;
}
@Test
@DirtiesContext
public void testWithJpaQueryButNoResultsAndDelete() throws Exception {
@@ -377,7 +397,7 @@ public class JpaPollingChannelAdapterTests {
assertTrue(students.size() == 3);
final Long studentCount = entityManager.createQuery("select count(*) from Student", Long.class).getSingleResult();
Long studentCount = waitForDeletes(students);
assertEquals(Long.valueOf(0), studentCount);