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

ATEST-128

Browse Source
This commit is contained in:
Fabian Märki
2015-07-31 12:50:29 +02:00
parent 2f24e95303
commit 47d921e1a4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/test/java/ch/psi/daq/test/queryrest/controller/DaqRestControllerTest.java
View File

@ -17,7 +17,7 @@ import ch.psi.daq.query.model.PulseRangeQuery;
import ch.psi.daq.query.model.TimeRangeQuery; import ch.psi.daq.query.model.TimeRangeQuery;
import ch.psi.daq.query.model.TimeRangeQueryDate; import ch.psi.daq.query.model.TimeRangeQueryDate;
import ch.psi.daq.queryrest.controller.QueryRestController; import ch.psi.daq.queryrest.controller.QueryRestController;
import ch.psi.daq.test.cassandra.admin.CassandraAdmin; import ch.psi.daq.test.cassandra.admin.CassandraTestAdmin;
import ch.psi.daq.test.queryrest.AbstractDaqRestTest; import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
/** /**
@ -26,7 +26,7 @@ import ch.psi.daq.test.queryrest.AbstractDaqRestTest;
public class DaqRestControllerTest extends AbstractDaqRestTest { public class DaqRestControllerTest extends AbstractDaqRestTest {
@Resource @Resource
private CassandraAdmin cassandraAdmin; private CassandraTestAdmin cassandraTestAdmin;
@Resource @Resource
private CassandraDataGen dataGen; private CassandraDataGen dataGen;
@ -39,7 +39,7 @@ public class DaqRestControllerTest extends AbstractDaqRestTest {
@Before @Before
public void setUp() throws Exception { public void setUp() throws Exception {
if (!initialized) { if (!initialized) {
cassandraAdmin.truncateAll(); cassandraTestAdmin.truncateAll();
dataGen.writeData(DATA_REPLICATION, 100, 2, TEST_CHANNEL_NAMES); dataGen.writeData(DATA_REPLICATION, 100, 2, TEST_CHANNEL_NAMES);
} }