Project

General

Profile

« Previous | Next » 

Revision a735bbbf

Added by Andreas Kohlbecker about 7 years ago

  • ID a735bbbfccc284e24f355551d2496cd15e790243
  • Parent a1dac6b2

ref #5285 attempt to avoid using the CdmSpringContextHelper
using DI to get rid of CdmSpringContextHelper, but got stuck due to the complexity and variety of the 'design patterns' that have been used.

View differences:

src/test/java/eu/etaxonomy/cdm/vaadin/CdmVaadinBaseTest.java
7 7
import org.easymock.EasyMock;
8 8
import org.junit.Assert;
9 9
import org.junit.BeforeClass;
10
import org.junit.Ignore;
11 10
import org.springframework.mock.web.MockServletConfig;
12 11
import org.springframework.mock.web.MockServletContext;
13 12
import org.springframework.web.context.ContextLoaderListener;
......
15 14
import org.unitils.database.DatabaseUnitils;
16 15
import org.unitils.database.annotations.Transactional;
17 16
import org.unitils.database.util.TransactionMode;
17
import org.unitils.spring.annotation.SpringApplicationContext;
18 18

  
19 19
import com.vaadin.data.util.sqlcontainer.query.generator.filter.QueryBuilder;
20 20
import com.vaadin.server.DeploymentConfiguration;
......
26 26

  
27 27
import eu.etaxonomy.cdm.vaadin.util.CdmSQLStringDecorator;
28 28

  
29
@Ignore
30 29
@Transactional(TransactionMode.DISABLED)
31
public class CdmVaadinBaseTest extends UnitilsJUnit4 {
30
@SpringApplicationContext("file:./src/test/resources/webapp/WEB-INF/applicationContext.xml")
31
//@SpringApplicationContext("file:./src/test/resources/eu/etaxonomy/cdm/applicationContext-test.xml")
32
public abstract class CdmVaadinBaseTest extends UnitilsJUnit4 {
32 33

  
33 34
    private static MockServletContext servletContext;
34 35
    private static VaadinServlet vaadinServlet;

Also available in: Unified diff