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

Merge pull request #12 in ST/ch.psi.daq.queryrest from ATEST-206 to master

Browse Source 
# By Fabian Märki
# Via Fabian Märki
* commit 'cc0639432ac80a75791454b787bad640dd662f9b':
  ATEST-206
This commit is contained in:
Märki Fabian
2015-09-30 11:16:58 +02:00
parent 010c818f21 cc0639432a
commit e9a60664de
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,7 @@ public class DaqRestControllerTest extends AbstractDaqRestTest {
private static final boolean initialized = false; private static final boolean initialized = false;
private static final int DATA_REPLICATION = 1; private static final int DATA_KEYSPACE = 1;
public static final String[] TEST_CHANNEL_NAMES = new String[]{"testChannel1", "testChannel2"}; public static final String[] TEST_CHANNEL_NAMES = new String[]{"testChannel1", "testChannel2"};
@Before @Before
@@ -41,7 +41,7 @@ public class DaqRestControllerTest extends AbstractDaqRestTest {
if (!initialized) { if (!initialized) {
cassandraTestAdmin.truncateAll(); cassandraTestAdmin.truncateAll();
dataGen.writeData(DATA_REPLICATION, 100, 2, TEST_CHANNEL_NAMES); dataGen.writeData(DATA_KEYSPACE, 100, 2, TEST_CHANNEL_NAMES);
} }
} }