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.
This commit is contained in:
Oscar Gonzalez Fernandez 2013-06-01 20:24:12 +02:00
parent 48c3b1093e
commit 05a9767477

View file

@ -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());