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

Remove unneeded dependencies.

Browse Source
This commit is contained in:
Fabian Märki
2016-04-11 14:54:53 +02:00
parent 6a87141f9b
commit ecc4909bc9
3 changed files with 12 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/test/java/ch/psi/daq/test/queryrest/DaqWebMvcConfig.java
View File

@ -11,12 +11,12 @@ import org.springframework.web.servlet.config.annotation.EnableWebMvc;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
import ch.psi.daq.cassandra.reader.CassandraReader;
import ch.psi.daq.cassandra.util.test.CassandraDataGen;
import ch.psi.daq.domain.reader.DataReader;
import ch.psi.daq.query.config.QueryConfig;
import ch.psi.daq.query.processor.QueryProcessor;
import ch.psi.daq.query.processor.QueryProcessorLocal;
import ch.psi.daq.test.cassandra.admin.CassandraTestAdmin;
import ch.psi.daq.test.cassandra.admin.CassandraTestAdminImpl;
import ch.psi.daq.test.query.config.LocalQueryTestConfig;
import ch.psi.daq.test.queryrest.query.DummyArchiverApplianceReader;
import ch.psi.daq.test.queryrest.query.DummyCassandraReader;
@Configuration
@ -33,39 +33,21 @@ public class DaqWebMvcConfig extends WebMvcConfigurationSupport {
static class InnerConfiguration {
}
@Bean
@Bean(name = QueryConfig.BEAN_NAME_CASSANDRA_QUERY_PROCESSOR)
@Lazy
public QueryProcessor cassandraQueryProcessorLocal() {
public QueryProcessor cassandraQueryProcessor() {
return new QueryProcessorLocal(cassandraReader());
}
@Bean
@Lazy
CassandraReader cassandraReader() {
public CassandraReader cassandraReader() {
return new DummyCassandraReader();
}
// @Bean
// @Lazy
// public DataReader archiverApplianceReader() {
// return new DummyArchiverApplianceReader();
// }
//
// @Bean
// @Lazy
// public QueryProcessor archiverApplianceQueryProcessor() {
// return new QueryProcessorLocal(archiverApplianceReader());
// }
@Bean
@Lazy
public CassandraTestAdmin testAdmin() {
return new CassandraTestAdminImpl();
}
@Bean
@Lazy
public CassandraDataGen cassandraDataGen() {
return new CassandraDataGen();
public DataReader archiverApplianceReader() {
return new DummyArchiverApplianceReader();
}
}

10
src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
View File

@ -9,8 +9,6 @@ import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
import org.junit.After;
import org.junit.Test;
import org.springframework.http.MediaType;
@ -27,7 +25,6 @@ import org.supercsv.prefs.CsvPreference;
import ch.psi.daq.cassandra.request.range.RequestRangeDate;
import ch.psi.daq.cassandra.request.range.RequestRangePulseId;
import ch.psi.daq.cassandra.request.range.RequestRangeTime;
import ch.psi.daq.cassandra.util.test.CassandraDataGen;
import ch.psi.daq.common.ordering.Ordering;
import ch.psi.daq.common.time.TimeUtils;
import ch.psi.daq.domain.test.TestTimeUtils;
@ -40,7 +37,6 @@ import ch.psi.daq.query.model.impl.DAQQueries;
import ch.psi.daq.query.model.impl.DAQQuery;
import ch.psi.daq.query.model.impl.DAQQueryElement;
import ch.psi.daq.queryrest.controller.QueryRestController;
import ch.psi.daq.test.cassandra.admin.CassandraTestAdmin;
import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
/**
@ -48,12 +44,6 @@ import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
*/
public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
@Resource
private CassandraTestAdmin testAdmin;
@Resource
private CassandraDataGen dataGen;
public static final String TEST_CHANNEL = "testChannel";
public static final String TEST_CHANNEL_01 = TEST_CHANNEL + "1";
public static final String TEST_CHANNEL_02 = TEST_CHANNEL + "2";

11
src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerJsonTest.java
View File

@ -1,7 +1,5 @@
package ch.psi.daq.test.queryrest.controller;
import javax.annotation.Resource;
import org.junit.After;
import org.junit.Test;
import org.springframework.http.MediaType;
@ -13,7 +11,6 @@ import org.springframework.test.web.servlet.setup.MockMvcBuilders;
import ch.psi.daq.cassandra.request.range.RequestRangeDate;
import ch.psi.daq.cassandra.request.range.RequestRangePulseId;
import ch.psi.daq.cassandra.request.range.RequestRangeTime;
import ch.psi.daq.cassandra.util.test.CassandraDataGen;
import ch.psi.daq.common.ordering.Ordering;
import ch.psi.daq.common.time.TimeUtils;
import ch.psi.daq.domain.json.ChannelName;
@ -27,7 +24,6 @@ import ch.psi.daq.query.model.impl.DAQQuery;
import ch.psi.daq.query.model.impl.DAQQueryElement;
import ch.psi.daq.query.request.ChannelsRequest;
import ch.psi.daq.queryrest.controller.QueryRestController;
import ch.psi.daq.test.cassandra.admin.CassandraTestAdmin;
import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
/**
@ -35,13 +31,6 @@ import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
*/
public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
@Resource
private CassandraTestAdmin testAdmin;
@Resource
private CassandraDataGen dataGen;
public static final String TEST_CHANNEL_01 = "testChannel1";
public static final String TEST_CHANNEL_02 = "testChannel2";
public static final String[] TEST_CHANNEL_NAMES = new String[] {TEST_CHANNEL_01, TEST_CHANNEL_02};