From 1c2c5a801c6c4a4e62abebe324ce3578b7f34f40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Tue, 19 Apr 2016 08:24:17 +0200 Subject: [PATCH] ATEST-316 --- .../daq/test/queryrest/query/DummyCassandraReader.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java index 69a3177..3468f1e 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java +++ b/src/test/java/ch/psi/daq/test/queryrest/query/DummyCassandraReader.java @@ -35,7 +35,7 @@ import ch.psi.daq.domain.cassandra.query.TimeRangeQuery; import ch.psi.daq.domain.cassandra.querying.ChannelEventQuery; import ch.psi.daq.domain.cassandra.querying.EventQuery; import ch.psi.daq.domain.cassandra.querying.MetaChannelEvent; -import ch.psi.daq.domain.cassandra.utils.TablePropertiesUtils; +import ch.psi.daq.domain.cassandra.utils.PropertiesUtils; import ch.psi.daq.domain.reader.Backend; public class DummyCassandraReader implements CassandraReader { @@ -158,14 +158,14 @@ public class DummyCassandraReader implements CassandraReader { BigDecimal iocTime = (columns == null || columns.length == 0 || ArrayUtils.contains(columns, FieldNames.FIELD_IOC_TIME)) ? TimeUtils.getTimeFromMillis(i * 10, 0) - : TablePropertiesUtils.DEFAULT_VALUE_DECIMAL; + : PropertiesUtils.DEFAULT_VALUE_DECIMAL; BigDecimal globalTime = (columns == null || columns.length == 0 || ArrayUtils.contains(columns, FieldNames.FIELD_GLOBAL_TIME)) ? TimeUtils.getTimeFromMillis(i * 10, 0) - : TablePropertiesUtils.DEFAULT_VALUE_DECIMAL; + : PropertiesUtils.DEFAULT_VALUE_DECIMAL; long pulseId = (columns == null || columns.length == 0 || ArrayUtils.contains(columns, - FieldNames.FIELD_PULSE_ID)) ? i : TablePropertiesUtils.DEFAULT_VALUE_BIGINT_PRIMITIVE; + FieldNames.FIELD_PULSE_ID)) ? i : PropertiesUtils.DEFAULT_VALUE_BIGINT_PRIMITIVE; if (channelLower.contains("waveform")) { long[] value = random.longs(2048).toArray();