ITQC/gls_docs
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ATEST-81:

Browse Source 
- fixing tests using updated Cassandra startup routine
This commit is contained in:
Zellweger Christof Ralf
2015-06-26 13:33:40 +02:00
parent 899d50492c
commit fad99c2ac3
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java
View File

@ -1,6 +1,5 @@
package ch.psi.daq.test.rest; package ch.psi.daq.test.rest;
import org.cassandraunit.spring.EmbeddedCassandra;
import org.junit.Before; import org.junit.Before;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations; import org.mockito.MockitoAnnotations;
@ -16,17 +15,17 @@ import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.setup.MockMvcBuilders; import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.WebApplicationContext;
import com.fasterxml.jackson.databind.ObjectMapper;
import ch.psi.daq.rest.RestApplication; import ch.psi.daq.rest.RestApplication;
import ch.psi.daq.test.cassandra.CassandraDaqUnitDependencyInjectionTestExecutionListener; import ch.psi.daq.test.cassandra.CassandraDaqUnitDependencyInjectionTestExecutionListener;
import com.fasterxml.jackson.databind.ObjectMapper;
@SpringApplicationConfiguration(classes = {RestApplication.class, DaqWebMvcConfiguration.class})
@TestExecutionListeners({ @TestExecutionListeners({
CassandraDaqUnitDependencyInjectionTestExecutionListener.class, CassandraDaqUnitDependencyInjectionTestExecutionListener.class,
DependencyInjectionTestExecutionListener.class}) DependencyInjectionTestExecutionListener.class})
@EmbeddedCassandra @SpringApplicationConfiguration(classes = {RestApplication.class, DaqWebMvcConfiguration.class})
//@EmbeddedCassandra
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
@WebAppConfiguration @WebAppConfiguration
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)