From 6f453f3558111702250e1926b43f98faa082ce7d Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Tue, 22 Nov 2011 13:29:19 +0100
Subject: [PATCH] Fix OrderElementServiceTest to pass tests in MySQL

FEA: ItEr75S04BugFixing
---
 .../ws/orders/OrderElementServiceTest.java    | 27 ++++++-------------
 1 file changed, 8 insertions(+), 19 deletions(-)

diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
index 0b23b9a15..3d9b610b4 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/test/ws/orders/OrderElementServiceTest.java
@@ -444,12 +444,7 @@ public class OrderElementServiceTest {
                 .addOrders(orderListDTO).instanceConstraintViolationsList;
         assertThat(instanceConstraintViolationsList.size(), equalTo(0));
 
-        try {
-            orderElementDAO.findByCode(code);
-            assertTrue(true);
-        } catch (InstanceNotFoundException e) {
-            fail();
-        }
+        checkIfExistsByCodeInAnotherTransaction(code);
     }
 
     @Test
@@ -569,12 +564,7 @@ public class OrderElementServiceTest {
         assertTrue(instanceConstraintViolationsList.toString(),
                 instanceConstraintViolationsList.size() == 0);
 
-        try {
-            orderElementDAO.findByCode(code);
-            assertTrue(true);
-        } catch (InstanceNotFoundException e) {
-            fail();
-        }
+        checkIfExistsByCodeInAnotherTransaction(code);
     }
 
     @Test
@@ -657,12 +647,7 @@ public class OrderElementServiceTest {
         assertTrue(instanceConstraintViolationsList.toString(),
                 instanceConstraintViolationsList.size() == 0);
 
-        try {
-            orderElementDAO.findByCode(code);
-            assertTrue(true);
-        } catch (InstanceNotFoundException e) {
-            fail();
-        }
+        checkIfExistsByCodeInAnotherTransaction(code);
     }
 
     @Test
@@ -716,7 +701,11 @@ public class OrderElementServiceTest {
                 .addOrders(orderListDTO).instanceConstraintViolationsList;
         assertThat(instanceConstraintViolationsList.size(), equalTo(0));
 
-        transactionService.runOnTransaction(new IOnTransaction<Void>() {
+        checkIfExistsByCodeInAnotherTransaction(code);
+    }
+
+    private void checkIfExistsByCodeInAnotherTransaction(final String code) {
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
             @Override
             public Void execute() {
                 try {