Fixed UpsertTest by running DB setup in a separate transaction so tha…

…t records are committed to the database before the upsert operation begins.
OpenNMS · Mar 14, 2014 · 66c34d2 · 66c34d2
1 parent 84ca85e
commit 66c34d2
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/opennms-dao/src/test/java/org/opennms/netmgt/dao/UpsertTest.java b/opennms-dao/src/test/java/org/opennms/netmgt/dao/UpsertTest.java
@@ -47,6 +47,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.context.ContextConfiguration;
+import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.support.TransactionCallbackWithoutResult;
@@ -98,6 +99,7 @@ public void afterPropertiesSet() throws Exception {
 
     @Before
     public void setUp() {
+        m_transTemplate.setPropagationBehavior(TransactionDefinition.PROPAGATION_REQUIRES_NEW);
         m_transTemplate.execute(new TransactionCallbackWithoutResult() {
             @Override
             protected void doInTransactionWithoutResult(TransactionStatus status) {