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

Fix tests for imagestorage

Browse Source
This commit is contained in:
Fabian Märki
2017-01-09 11:16:01 +01:00
parent 1d9f9fbe4f
commit c41407635d
3 changed files with 137 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,14 +87,14 @@ public abstract class AbstractQueryRestControllerTableTest extends AbstractDaqRe
assertEquals(2, events.size()); assertEquals(2, events.size());
DataEvent event = events.get(0); DataEvent event = events.get(0);
assertEquals(TEST_CHANNEL_01, event.getChannel()); assertEquals(TEST_CHANNEL_01, event.getChannel());
assertEquals(Backend.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(TimeUtils.getTime(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.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(TimeUtils.getTime(1, 0), event.getIocTime());
@ -104,14 +104,14 @@ public abstract class AbstractQueryRestControllerTableTest extends AbstractDaqRe
assertEquals(2, events.size()); assertEquals(2, events.size());
event = events.get(0); event = events.get(0);
assertEquals(TEST_CHANNEL_01, event.getChannel()); assertEquals(TEST_CHANNEL_01, event.getChannel());
assertEquals(Backend.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(TimeUtils.getTime(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.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime());

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

@ -83,19 +83,19 @@ public abstract class AbstractQueryRestControllerTest extends AbstractDaqRestTes
assertEquals(2, eventsList.size()); assertEquals(2, eventsList.size());
ChannelEventsImpl chEvents = eventsList.get(0); ChannelEventsImpl chEvents = eventsList.get(0);
assertEquals(TEST_CHANNEL_01, chEvents.getChannel().getName()); assertEquals(TEST_CHANNEL_01, chEvents.getChannel().getName());
assertEquals(Backend.SF_DATABUFFER, chEvents.getChannel().getBackend()); assertEquals(backend, chEvents.getChannel().getBackend());
List<DataEvent> events = chEvents.getEvents().collect(Collectors.toList()); List<DataEvent> events = chEvents.getEvents().collect(Collectors.toList());
assertEquals(2, events.size()); assertEquals(2, events.size());
DataEvent event = events.get(0); DataEvent event = events.get(0);
assertEquals(TEST_CHANNEL_01, event.getChannel()); assertEquals(TEST_CHANNEL_01, event.getChannel());
assertEquals(Backend.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(TimeUtils.getTime(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.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime());
@ -103,19 +103,19 @@ public abstract class AbstractQueryRestControllerTest extends AbstractDaqRestTes
chEvents = eventsList.get(1); chEvents = eventsList.get(1);
assertEquals(TEST_CHANNEL_02, chEvents.getChannel().getName()); assertEquals(TEST_CHANNEL_02, chEvents.getChannel().getName());
assertEquals(Backend.SF_DATABUFFER, chEvents.getChannel().getBackend()); assertEquals(backend, chEvents.getChannel().getBackend());
events = chEvents.getEvents().collect(Collectors.toList()); events = chEvents.getEvents().collect(Collectors.toList());
assertEquals(2, events.size()); assertEquals(2, events.size());
event = events.get(0); event = events.get(0);
assertEquals(TEST_CHANNEL_02, event.getChannel()); assertEquals(TEST_CHANNEL_02, event.getChannel());
assertEquals(Backend.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(100, event.getPulseId()); assertEquals(100, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 0), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 0), event.getIocTime()); assertEquals(TimeUtils.getTime(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.SF_DATABUFFER, event.getBackend()); assertEquals(backend, event.getBackend());
assertEquals(101, event.getPulseId()); assertEquals(101, event.getPulseId());
assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getGlobalTime());
assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime()); assertEquals(TimeUtils.getTime(1, 10000000), event.getIocTime());

254
src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java
View File

File diff suppressed because it is too large Load Diff