ATEST-81:
- removing ComponentScan
This commit is contained in:
@@ -24,7 +24,7 @@ import ch.psi.daq.test.cassandra.CassandraDaqUnitDependencyInjectionTestExecutio
|
||||
@TestExecutionListeners({
|
||||
CassandraDaqUnitDependencyInjectionTestExecutionListener.class,
|
||||
DependencyInjectionTestExecutionListener.class})
|
||||
@SpringApplicationConfiguration(classes = {RestApplication.class, DaqWebMvcConfiguration.class})
|
||||
@SpringApplicationConfiguration(classes = {RestApplication.class, DaqWebMvcConfig.class})
|
||||
//@EmbeddedCassandra
|
||||
@DirtiesContext(classMode = ClassMode.AFTER_EACH_TEST_METHOD)
|
||||
@WebAppConfiguration
|
||||
|
||||
+1
-8
@@ -9,16 +9,9 @@ import ch.psi.daq.rest.config.RestConfig;
|
||||
import ch.psi.daq.test.cassandra.LocalCassandraTestConfig;
|
||||
|
||||
@Configuration
|
||||
//@ComponentScan(basePackages = {
|
||||
// "ch.psi.daq.rest",
|
||||
// "ch.psi.daq.cassandra.config", // define the package name with the CassandraConfig
|
||||
// // configuration, or @Import it (see above)
|
||||
// "ch.psi.daq.cassandra.reader",
|
||||
// "ch.psi.daq.cassandra.writer"
|
||||
//})
|
||||
@Import(value = {LocalCassandraTestConfig.class, RestConfig.class})
|
||||
@EnableWebMvc
|
||||
public class DaqWebMvcConfiguration extends WebMvcConfigurationSupport {
|
||||
public class DaqWebMvcConfig extends WebMvcConfigurationSupport {
|
||||
|
||||
// add test-specific beans and configurations here
|
||||
}
|
||||
Reference in New Issue
Block a user