From 05a9767477f059c9965a5f1f3d549a0a053e1c45 Mon Sep 17 00:00:00 2001
From: Oscar Gonzalez Fernandez <ogfernandez@gmail.com>
Date: Sat, 1 Jun 2013 20:24:12 +0200
Subject: [PATCH] Fix execution order depending error in test

Since the scenario was created in the same transaction (due to using
@Before annotation) was not visible in givenOrderFromPrepareForCreate.
Now use a @BeforeTransaction instead so it's visible before.
---
 .../test/java/org/libreplan/web/orders/OrderModelTest.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderModelTest.java b/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderModelTest.java
index 2e54907a6..4973c9991 100644
--- a/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderModelTest.java
+++ b/libreplan-webapp/src/test/java/org/libreplan/web/orders/OrderModelTest.java
@@ -43,7 +43,6 @@ import javax.annotation.Resource;
 
 import org.easymock.EasyMock;
 import org.hibernate.SessionFactory;
-import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -83,6 +82,7 @@ import org.springframework.test.annotation.NotTransactional;
 import org.springframework.test.annotation.Rollback;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
+import org.springframework.test.context.transaction.BeforeTransaction;
 import org.springframework.transaction.annotation.Transactional;
 import org.zkoss.zk.ui.Desktop;
 
@@ -116,7 +116,7 @@ public class OrderModelTest {
     @Resource
     private IDataBootstrap scenariosBootstrap;
 
-    @Before
+    @BeforeTransaction
     public void loadRequiredaData() {
         defaultAdvanceTypesBootstrapListener.loadRequiredData();
         configurationBootstrap.loadRequiredData();
@@ -238,7 +238,7 @@ public class OrderModelTest {
                         return null;
                     }
                 });
-        Order order = (Order) orderModel.getOrder();
+        Order order = orderModel.getOrder();
         order.setName("name");
         order.setCode("code");
         order.setInitDate(new Date());