From 98eeed0801999f1a0481eb4e16035a613ef9ea59 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Wed, 7 Nov 2012 11:39:46 +0100
Subject: [PATCH] Fix remove order elements service test in MySQL

It was working properly in PostgreSQL but not in MySQL. Now it is passing in both.

FEA: ItEr77S13AllowDeleteOrderElements
---
 .../ws/orders/OrderElementServiceTest.java    | 42 +++++++++++--------
 1 file changed, 25 insertions(+), 17 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 bc4ad34c6..9ae89c8a2 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
@@ -576,9 +576,9 @@ public class OrderElementServiceTest {
 
     @Test
     public void removeOrderElement() {
-        String code = UUID.randomUUID().toString();
+        final String code = UUID.randomUUID().toString();
 
-        OrderDTO orderDTO = createOrderDTOWithChildren(code);
+        final OrderDTO orderDTO = createOrderDTOWithChildren(code);
 
         OrderListDTO orderListDTO = createOrderListDTO(orderDTO);
         List<InstanceConstraintViolationsDTO> instanceConstraintViolationsList = orderElementService
@@ -588,23 +588,31 @@ public class OrderElementServiceTest {
 
         checkIfExistsByCodeInAnotherTransaction(code);
 
-        String codeToRemove = orderDTO.children.get(0).code;
-        Response response = orderElementService
-                .removeOrderElement(codeToRemove);
-        assertThat(response.getStatus(), equalTo(Status.OK.getStatusCode()));
+        transactionService.runOnAnotherTransaction(new IOnTransaction<Void>() {
 
-        try {
-            orderElementDAO.findByCode(codeToRemove);
-        } catch (InstanceNotFoundException e) {
-            assertTrue(true);
-        }
+            @Override
+            public Void execute() {
+                String codeToRemove = orderDTO.children.get(0).code;
+                Response response = orderElementService
+                        .removeOrderElement(codeToRemove);
+                assertThat(response.getStatus(),
+                        equalTo(Status.OK.getStatusCode()));
 
-        try {
-            OrderElement order = orderElementDAO.findByCode(code);
-            assertTrue(order.getChildren().isEmpty());
-        } catch (InstanceNotFoundException e) {
-            fail();
-        }
+                try {
+                    orderElementDAO.findByCode(codeToRemove);
+                } catch (InstanceNotFoundException e) {
+                    assertTrue(true);
+                }
+
+                try {
+                    OrderElement order = orderElementDAO.findByCode(code);
+                    assertTrue(order.getChildren().isEmpty());
+                } catch (InstanceNotFoundException e) {
+                    fail();
+                }
+                return null;
+            }
+        });
     }
 
     @Test