diff --git a/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java b/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java index f2537d5..0ed239a 100644 --- a/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java +++ b/src/test/java/ch/psi/daq/test/rest/AbstractDaqRestTest.java @@ -1,6 +1,5 @@ package ch.psi.daq.test.rest; -import org.cassandraunit.spring.EmbeddedCassandra; import org.junit.Before; import org.junit.runner.RunWith; 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.web.context.WebApplicationContext; +import com.fasterxml.jackson.databind.ObjectMapper; + import ch.psi.daq.rest.RestApplication; import ch.psi.daq.test.cassandra.CassandraDaqUnitDependencyInjectionTestExecutionListener; -import com.fasterxml.jackson.databind.ObjectMapper; - -@SpringApplicationConfiguration(classes = {RestApplication.class, DaqWebMvcConfiguration.class}) @TestExecutionListeners({ - CassandraDaqUnitDependencyInjectionTestExecutionListener.class, - DependencyInjectionTestExecutionListener.class}) -@EmbeddedCassandra + CassandraDaqUnitDependencyInjectionTestExecutionListener.class, + DependencyInjectionTestExecutionListener.class}) +@SpringApplicationConfiguration(classes = {RestApplication.class, DaqWebMvcConfiguration.class}) +//@EmbeddedCassandra @DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD) @WebAppConfiguration @RunWith(SpringJUnit4ClassRunner.class)