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

Many many changes (e.g. Time)

Browse Source
This commit is contained in:
Fabian Märki
2018-03-15 15:32:21 +01:00
parent 8d0acaccb4
commit 1cc6cc573b
7 changed files with 54 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/ch/psi/daq/queryrest/controller/validator/ConfigQueryValidator.java
View File

@@ -1,6 +1,5 @@
package ch.psi.daq.queryrest.controller.validator; package ch.psi.daq.queryrest.controller.validator;
import java.math.BigDecimal;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
@@ -11,6 +10,7 @@ import org.springframework.validation.Errors;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;
import ch.psi.daq.common.ordering.Ordering; import ch.psi.daq.common.ordering.Ordering;
import ch.psi.daq.common.time.Time;
import ch.psi.daq.domain.backend.Backend; import ch.psi.daq.domain.backend.Backend;
import ch.psi.daq.domain.config.DomainConfig; import ch.psi.daq.domain.config.DomainConfig;
import ch.psi.daq.domain.query.DAQConfigQuery; import ch.psi.daq.domain.query.DAQConfigQuery;
@@ -22,7 +22,7 @@ public class ConfigQueryValidator implements Validator, ApplicationContextAware
private Set<ConfigField> queryResponseFields; private Set<ConfigField> queryResponseFields;
private long maxPulseRange; private long maxPulseRange;
private BigDecimal maxTimeRange; private Time maxTimeRange;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
@@ -33,7 +33,7 @@ public class ConfigQueryValidator implements Validator, ApplicationContextAware
queryResponseFields = context.getBean(QueryRestConfig.BEAN_NAME_CONFIG_RESPONSE_FIELDS_QUERY, Set.class); queryResponseFields = context.getBean(QueryRestConfig.BEAN_NAME_CONFIG_RESPONSE_FIELDS_QUERY, Set.class);
maxPulseRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_PULSE_RANGE, Long.class); maxPulseRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_PULSE_RANGE, Long.class);
maxTimeRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_TIME_RANGE, BigDecimal.class); maxTimeRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_TIME_RANGE, Time.class);
} }
@Override @Override

6
src/main/java/ch/psi/daq/queryrest/controller/validator/EventQueryValidator.java
View File

@@ -1,6 +1,5 @@
package ch.psi.daq.queryrest.controller.validator; package ch.psi.daq.queryrest.controller.validator;
import java.math.BigDecimal;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Set; import java.util.Set;
@@ -12,6 +11,7 @@ import org.springframework.validation.Errors;
import org.springframework.validation.Validator; import org.springframework.validation.Validator;
import ch.psi.daq.common.ordering.Ordering; import ch.psi.daq.common.ordering.Ordering;
import ch.psi.daq.common.time.Time;
import ch.psi.daq.domain.backend.Backend; import ch.psi.daq.domain.backend.Backend;
import ch.psi.daq.domain.config.DomainConfig; import ch.psi.daq.domain.config.DomainConfig;
import ch.psi.daq.domain.query.DAQQueries; import ch.psi.daq.domain.query.DAQQueries;
@@ -29,7 +29,7 @@ public class EventQueryValidator implements Validator, ApplicationContextAware {
private Set<EventField> defaultResponseFields; private Set<EventField> defaultResponseFields;
private Set<Aggregation> defaultResponseAggregations; private Set<Aggregation> defaultResponseAggregations;
private long maxPulseRange; private long maxPulseRange;
private BigDecimal maxTimeRange; private Time maxTimeRange;
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
@Override @Override
@@ -42,7 +42,7 @@ public class EventQueryValidator implements Validator, ApplicationContextAware {
context.getBean(QueryRestConfig.BEAN_NAME_DEFAULT_EVENT_RESPONSE_AGGREGATIONS, Set.class); context.getBean(QueryRestConfig.BEAN_NAME_DEFAULT_EVENT_RESPONSE_AGGREGATIONS, Set.class);
maxPulseRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_PULSE_RANGE, Long.class); maxPulseRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_PULSE_RANGE, Long.class);
maxTimeRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_TIME_RANGE, BigDecimal.class); maxTimeRange = context.getBean(DomainConfig.BEAN_NAME_QUERY_MAX_TIME_RANGE, Time.class);
} }
@Override @Override

3
src/main/java/ch/psi/daq/queryrest/response/raw/event/RawEventResponseFormatter.java
View File

@@ -13,7 +13,6 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import ch.psi.bsread.common.allocator.ByteBufferAllocator; import ch.psi.bsread.common.allocator.ByteBufferAllocator;
import ch.psi.bsread.message.Type; import ch.psi.bsread.message.Type;
import ch.psi.daq.common.time.TimeUtils;
import ch.psi.daq.domain.DataEvent; import ch.psi.daq.domain.DataEvent;
import ch.psi.daq.domain.config.DomainConfig; import ch.psi.daq.domain.config.DomainConfig;
import ch.psi.daq.domain.events.ChannelConfiguration; import ch.psi.daq.domain.events.ChannelConfiguration;
@@ -61,7 +60,7 @@ public class RawEventResponseFormatter extends AbstractRawResponseFormatter impl
EventConfig.getEncoding(getEncoding(latestEvent)), EventConfig.getEncoding(getEncoding(latestEvent)),
getCompression(latestEvent), getCompression(latestEvent),
config.getPulseId(), config.getPulseId(),
TimeUtils.getUnscaledTime(config.getGlobalTime()), config.getGlobalTime().getUnscaled(),
config.getSource(), config.getSource(),
config.getPrecision(), config.getPrecision(),
config.getUnit(), config.getUnit(),

10
src/main/java/ch/psi/daq/queryrest/response/raw/event/serialize/StandardEventDeSerializer.java
View File

@@ -4,7 +4,7 @@ import java.nio.ByteBuffer;
import java.util.Collection; import java.util.Collection;
import java.util.function.IntFunction; import java.util.function.IntFunction;
import ch.psi.daq.common.time.TimeUtils; import ch.psi.daq.common.time.Time;
import ch.psi.daq.domain.ByteValue; import ch.psi.daq.domain.ByteValue;
import ch.psi.daq.domain.DataEvent; import ch.psi.daq.domain.DataEvent;
import ch.psi.daq.domain.DataHelper; import ch.psi.daq.domain.DataHelper;
@@ -95,9 +95,9 @@ public class StandardEventDeSerializer
metaBuffer.putInt(POS_META_BLOB_SIZE, metaBuffer.putInt(POS_META_BLOB_SIZE,
metaBuffer.remaining() - META_VALUE_BLOB_SIZE_LENGTH metaBuffer.remaining() - META_VALUE_BLOB_SIZE_LENGTH
+ valueBuffer.remaining()); + valueBuffer.remaining());
metaBuffer.putLong(POS_META_IOC_TIME, TimeUtils.getUnscaledTime(event.getIocTime())); metaBuffer.putLong(POS_META_IOC_TIME, event.getIocTime().getUnscaled());
metaBuffer.putLong(POS_META_PULSE_ID, event.getPulseId()); metaBuffer.putLong(POS_META_PULSE_ID, event.getPulseId());
metaBuffer.putLong(POS_META_GLOBAL_TIME, TimeUtils.getUnscaledTime(event.getGlobalTime())); metaBuffer.putLong(POS_META_GLOBAL_TIME, event.getGlobalTime().getUnscaled());
metaBuffer.put(POS_META_STATUS, status.getDBKey()); metaBuffer.put(POS_META_STATUS, status.getDBKey());
metaBuffer.put(POS_META_SEVERITY, severity.getDBKey()); metaBuffer.put(POS_META_SEVERITY, severity.getDBKey());
@@ -146,9 +146,9 @@ public class StandardEventDeSerializer
new ProcessingEvent( new ProcessingEvent(
config.getName(), config.getName(),
Backend.byName(config.getBackend()), Backend.byName(config.getBackend()),
TimeUtils.getTimeFromUnscaled(iocTime), new Time(iocTime),
pulseId, pulseId,
TimeUtils.getTimeFromUnscaled(globalTime), new Time(globalTime),
config.getType().getKey(), config.getType().getKey(),
config.getShape(), config.getShape(),
status, status,

18
src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTableTest.java
View File

@@ -17,7 +17,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import ch.psi.daq.common.time.TimeUtils; import ch.psi.daq.common.time.Time;
import ch.psi.daq.domain.DataEvent; import ch.psi.daq.domain.DataEvent;
import ch.psi.daq.domain.backend.Backend; import ch.psi.daq.domain.backend.Backend;
import ch.psi.daq.domain.config.DomainConfig; import ch.psi.daq.domain.config.DomainConfig;
@@ -89,15 +89,15 @@ public abstract class AbstractQueryRestControllerTableTest extends AbstractDaqRe
assertEquals(TEST_CHANNEL_01, event.getChannel()); assertEquals(TEST_CHANNEL_01, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(new Time(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(new Time(1, 0), event.getIocTime());
assertEquals(100, event.getValue(Number.class).longValue()); assertEquals(100, event.getValue(Number.class).longValue());
event = events.get(1); event = events.get(1);
assertEquals(TEST_CHANNEL_02, event.getChannel()); assertEquals(TEST_CHANNEL_02, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(new Time(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(new Time(1, 0), event.getIocTime());
assertEquals(100, event.getValue(Number.class).longValue()); assertEquals(100, event.getValue(Number.class).longValue());
events = table.getEvents(1).collect(Collectors.toList()); events = table.getEvents(1).collect(Collectors.toList());
@@ -106,15 +106,15 @@ public abstract class AbstractQueryRestControllerTableTest extends AbstractDaqRe
assertEquals(TEST_CHANNEL_01, event.getChannel()); assertEquals(TEST_CHANNEL_01, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(new Time(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(new Time(1, 10000000), event.getIocTime());
assertEquals(101, event.getValue(Number.class).longValue()); assertEquals(101, event.getValue(Number.class).longValue());
event = events.get(1); event = events.get(1);
assertEquals(TEST_CHANNEL_02, event.getChannel()); assertEquals(TEST_CHANNEL_02, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(new Time(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(new Time(1, 10000000), event.getIocTime());
assertEquals(101, event.getValue(Number.class).longValue()); assertEquals(101, event.getValue(Number.class).longValue());
} }
} }

18
src/test/java/ch/psi/daq/test/queryrest/controller/AbstractQueryRestControllerTest.java
View File

@@ -17,7 +17,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import ch.psi.daq.common.time.TimeUtils; import ch.psi.daq.common.time.Time;
import ch.psi.daq.domain.DataEvent; import ch.psi.daq.domain.DataEvent;
import ch.psi.daq.domain.backend.Backend; import ch.psi.daq.domain.backend.Backend;
import ch.psi.daq.domain.config.DomainConfig; import ch.psi.daq.domain.config.DomainConfig;
@@ -90,15 +90,15 @@ public abstract class AbstractQueryRestControllerTest extends AbstractDaqRestTes
assertEquals(TEST_CHANNEL_01, event.getChannel()); assertEquals(TEST_CHANNEL_01, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(new Time(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(new Time(1, 0), event.getIocTime());
assertEquals(100, event.getValue(Number.class).longValue()); assertEquals(100, event.getValue(Number.class).longValue());
event = events.get(1); event = events.get(1);
assertEquals(TEST_CHANNEL_01, event.getChannel()); assertEquals(TEST_CHANNEL_01, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(new Time(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(new Time(1, 10000000), event.getIocTime());
assertEquals(101, event.getValue(Number.class).longValue()); assertEquals(101, event.getValue(Number.class).longValue());
chEvents = eventsList.get(1); chEvents = eventsList.get(1);
@@ -110,15 +110,15 @@ public abstract class AbstractQueryRestControllerTest extends AbstractDaqRestTes
assertEquals(TEST_CHANNEL_02, event.getChannel()); assertEquals(TEST_CHANNEL_02, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(new Time(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(new Time(1, 0), event.getIocTime());
assertEquals(100, event.getValue(Number.class).longValue()); assertEquals(100, event.getValue(Number.class).longValue());
event = events.get(1); event = events.get(1);
assertEquals(TEST_CHANNEL_02, event.getChannel()); assertEquals(TEST_CHANNEL_02, event.getChannel());
assertEquals(backend, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(new Time(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(new Time(1, 10000000), event.getIocTime());
assertEquals(101, event.getValue(Number.class).longValue()); assertEquals(101, event.getValue(Number.class).longValue());
} }
} }

48
src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java
View File

@@ -137,9 +137,9 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("1", record.get(column++)); assertEquals("1", record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
@@ -226,7 +226,7 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
if (channelSeq.get(channel).contains(pulse)) { if (channelSeq.get(channel).contains(pulse)) {
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
} else { } else {
assertEquals(CSVResponseStreamWriter.EMPTY_VALUE, record.get(column++)); assertEquals(CSVResponseStreamWriter.EMPTY_VALUE, record.get(column++));
@@ -320,7 +320,7 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
if (channelSeq.get(channel).contains(pulse)) { if (channelSeq.get(channel).contains(pulse)) {
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
} else { } else {
assertEquals(CSVResponseStreamWriter.EMPTY_VALUE, record.get(column++)); assertEquals(CSVResponseStreamWriter.EMPTY_VALUE, record.get(column++));
assertEquals(CSVResponseStreamWriter.EMPTY_VALUE, record.get(column++)); assertEquals(CSVResponseStreamWriter.EMPTY_VALUE, record.get(column++));
@@ -416,11 +416,11 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
// assertEquals("" + pulse, record.get(column++)); // assertEquals("" + pulse, record.get(column++));
// assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), // assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)),
// record.get(column++)); // record.get(column++));
// assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), // assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse)),
// record.get(column++)); // record.get(column++));
// assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), // assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)),
// record.get(column++)); // record.get(column++));
// assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), // assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse)),
// record.get(column++)); // record.get(column++));
// assertEquals("[1]", record.get(column++)); // assertEquals("[1]", record.get(column++));
// assertEquals("1", record.get(column++)); // assertEquals("1", record.get(column++));
@@ -502,9 +502,9 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[8]", record.get(column++)); assertEquals("[8]", record.get(column++));
assertEquals("1", record.get(column++)); assertEquals("1", record.get(column++));
assertTrue(record.get(column).startsWith("[" + pulse + ",")); assertTrue(record.get(column).startsWith("[" + pulse + ","));
@@ -586,9 +586,9 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("1", record.get(column++)); assertEquals("1", record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
@@ -689,7 +689,7 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + configPulse, record.get(column++)); assertEquals("" + configPulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(configPulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(configPulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(configPulse)), assertEquals("" + TestTimeUtils.getTimeFromPulseId(configPulse).getMillis(),
record.get(column++)); record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("", record.get(column++)); assertEquals("", record.get(column++));
@@ -730,9 +730,9 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("1", record.get(column++)); assertEquals("1", record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
@@ -818,10 +818,10 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("1", record.get(column++)); assertEquals("1", record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
@@ -976,9 +976,9 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("5", record.get(column++)); assertEquals("5", record.get(column++));
assertEquals("" + pulse + ".0", record.get(column++)); assertEquals("" + pulse + ".0", record.get(column++));
@@ -1103,9 +1103,9 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("5", record.get(column++)); assertEquals("5", record.get(column++));
assertEquals("" + pulse + ".0", record.get(column++)); assertEquals("" + pulse + ".0", record.get(column++));
@@ -1114,13 +1114,13 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("1", record.get(column++)); assertEquals("1", record.get(column++));
assertEquals("" + pulse + ".0", record.get(column++)); assertEquals("" + pulse + ".0", record.get(column++));
assertEquals("" + (pulse + 4), record.get(column++)); assertEquals("" + (pulse + 4), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId((pulse + 4))), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId((pulse + 4))), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId((pulse + 4))), assertEquals("" + TestTimeUtils.getTimeFromPulseId((pulse + 4)).getMillis(),
record.get(column++)); record.get(column++));
assertEquals("1", record.get(column++)); assertEquals("1", record.get(column++));
assertEquals("" + (pulse + 4) + ".0", record.get(column++)); assertEquals("" + (pulse + 4) + ".0", record.get(column++));
@@ -1220,9 +1220,9 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals(TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
assertEquals("[1]", record.get(column++)); assertEquals("[1]", record.get(column++));
assertEquals("10", record.get(column++)); assertEquals("10", record.get(column++));
assertEquals("" + pulse + ".0", record.get(column++)); assertEquals("" + pulse + ".0", record.get(column++));
@@ -1344,7 +1344,7 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A
for (String channel : channels) { for (String channel : channels) {
assertEquals(channel, record.get(column++)); assertEquals(channel, record.get(column++));
assertEquals("" + pulse, record.get(column++)); assertEquals("" + pulse, record.get(column++));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), record.get(column++)); assertEquals("" + TestTimeUtils.getTimeFromPulseId(pulse).getMillis(), record.get(column++));
} }
++pulse; ++pulse;
} }