From 8882d34593496027fb4ae5e1fa18cc01bc32a357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Tue, 2 Apr 2019 12:21:09 +0200 Subject: [PATCH] Extend test --- .../query/QueryManagerRemoteTest.java | 86 +++++++++++++------ 1 file changed, 59 insertions(+), 27 deletions(-) diff --git a/src/test/java/ch/psi/daq/test/queryrest/query/QueryManagerRemoteTest.java b/src/test/java/ch/psi/daq/test/queryrest/query/QueryManagerRemoteTest.java index 30876b8..4e9de83 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/query/QueryManagerRemoteTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/query/QueryManagerRemoteTest.java @@ -561,7 +561,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { @Test public void testQueryManager_01() throws Exception { final List backends = queryManager.getBackends().collect(Collectors.toList()); - assertEquals(7, backends.size()); + assertEquals(8, backends.size()); final List channels = queryManager.getChannels(new ChannelsRequest()) .flatMap(response -> response.getChannels().stream()) @@ -591,16 +591,16 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { assertEquals(scalarChannel, queryResponse.getChannel().getName()); assertEquals("2016-10-12T14:07:09.914760000+02:00", queryResponse.getStart().getGlobalDate()); assertEquals(638760000, queryResponse.getStart().getPulseId()); - assertEquals("2016-10-12T15:57:10.053420000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(639420000, queryResponse.getStart().getPulseId()); + assertEquals("2016-10-12T15:57:10.053420000+02:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(639420000, queryResponse.getEnd().getPulseId()); - queryResponse = rangeQueryResponses.get(0); + queryResponse = rangeQueryResponses.get(1); assertEquals(queryBackend, queryResponse.getChannel().getBackend()); assertEquals(waveformChannel, queryResponse.getChannel().getName()); assertEquals("2016-10-12T14:07:09.914760000+02:00", queryResponse.getStart().getGlobalDate()); assertEquals(638760000, queryResponse.getStart().getPulseId()); - assertEquals("2016-10-12T15:57:10.053420000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(639420000, queryResponse.getStart().getPulseId()); + assertEquals("2016-10-12T15:57:10.053420000+02:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(639420000, queryResponse.getEnd().getPulseId()); query = new RangeQuery( new RequestRangeSeconds( @@ -620,50 +620,82 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { // it seems the system stopped a few days assertEquals("2016-10-07T09:32:24.579300000+02:00", queryResponse.getStart().getGlobalDate()); assertEquals(609300000, queryResponse.getStart().getPulseId()); - assertEquals("2016-10-12T16:07:09.793480000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(639480000, queryResponse.getStart().getPulseId()); + assertEquals("2016-10-12T16:07:09.793480000+02:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(639480000, queryResponse.getEnd().getPulseId()); queryResponse = rangeQueryResponses.get(1); assertEquals(queryBackend, queryResponse.getChannel().getBackend()); - assertEquals(scalarChannel, queryResponse.getChannel().getName()); + assertEquals(waveformChannel, queryResponse.getChannel().getName()); // it seems the system stopped a few days assertEquals("2016-10-07T09:32:24.579300000+02:00", queryResponse.getStart().getGlobalDate()); assertEquals(609300000, queryResponse.getStart().getPulseId()); - assertEquals("2016-10-12T16:07:09.793480000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(639480000, queryResponse.getStart().getPulseId()); + assertEquals("2016-10-12T16:07:09.793480000+02:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(639480000, queryResponse.getEnd().getPulseId()); query = new RangeQuery( new RequestRangeSeconds( - TimeUtils.parse("2016-10-12T14:00"), - TimeUtils.parse("2016-10-12T16:00"))); + TimeUtils.parse("2019-03-01T14:00"), + TimeUtils.parse("2019-03-01T16:00"))); rangeQueryResponses = RestHelper.queryRange(context, queryServer, query); assertEquals("Size was " + rangeQueryResponses.size(), 1, rangeQueryResponses.size()); - // TODO: set time/pulse correctly (was not clear at time of writing) queryResponse = rangeQueryResponses.get(0); assertEquals(queryBackend, queryResponse.getChannel().getBackend()); - assertEquals(waveformChannel, queryResponse.getChannel().getName()); - assertEquals("2016-10-12T13:57:09.914760000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(638750000, queryResponse.getStart().getPulseId()); - assertEquals("2016-10-12T16:07:10.053420000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(639430000, queryResponse.getStart().getPulseId()); + assertEquals(ChannelConfiguration.COMBINED_CHANNEL_NAME, queryResponse.getChannel().getName()); + assertEquals("2019-03-01T14:00:00.003686705+01:00", queryResponse.getStart().getGlobalDate()); + assertEquals(8007686705L, queryResponse.getStart().getPulseId()); + assertEquals("2019-03-01T15:59:59.993406581+01:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(8008406581L, queryResponse.getEnd().getPulseId()); query = new RangeQuery( new RequestRangeSeconds( - TimeUtils.parse("2016-10-12T14:00"), + TimeUtils.parse("2019-03-01T14:00"), true, - TimeUtils.parse("2016-10-12T16:00"), + TimeUtils.parse("2019-03-01T16:00"), true)); rangeQueryResponses = RestHelper.queryRange(context, queryServer, query); assertEquals("Size was " + rangeQueryResponses.size(), 1, rangeQueryResponses.size()); - // TODO: set time/pulse correctly (was not clear at time of writing) queryResponse = rangeQueryResponses.get(0); assertEquals(queryBackend, queryResponse.getChannel().getBackend()); - assertEquals(scalarChannel, ChannelConfiguration.COMBINED_CHANNEL_NAME); - assertEquals("2016-10-12T14:07:09.913760000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(638759999, queryResponse.getStart().getPulseId()); - assertEquals("2016-10-12T15:57:10.054420000+02:00", queryResponse.getStart().getGlobalDate()); - assertEquals(639420001, queryResponse.getStart().getPulseId()); + assertEquals(ChannelConfiguration.COMBINED_CHANNEL_NAME, queryResponse.getChannel().getName()); + assertEquals("2019-03-01T13:59:59.993686704+01:00", queryResponse.getStart().getGlobalDate()); + assertEquals(8007686704L, queryResponse.getStart().getPulseId()); + assertEquals("2019-03-01T16:00:00.003406582+01:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(8008406582L, queryResponse.getEnd().getPulseId()); + + query = new RangeQuery( + new RequestRangeSeconds( + TimeUtils.parse("2019-03-01T14:00"), + true, + TimeUtils.parse("2019-03-01T16:00"), + false)); + + rangeQueryResponses = RestHelper.queryRange(context, queryServer, query); + assertEquals("Size was " + rangeQueryResponses.size(), 1, rangeQueryResponses.size()); + queryResponse = rangeQueryResponses.get(0); + assertEquals(queryBackend, queryResponse.getChannel().getBackend()); + assertEquals(ChannelConfiguration.COMBINED_CHANNEL_NAME, queryResponse.getChannel().getName()); + assertEquals("2019-03-01T13:59:59.993686704+01:00", queryResponse.getStart().getGlobalDate()); + assertEquals(8007686704L, queryResponse.getStart().getPulseId()); + assertEquals("2019-03-01T15:59:59.993406581+01:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(8008406581L, queryResponse.getEnd().getPulseId()); + + query = new RangeQuery( + new RequestRangeSeconds( + TimeUtils.parse("2019-03-01T14:00"), + false, + TimeUtils.parse("2019-03-01T16:00"), + true)); + + rangeQueryResponses = RestHelper.queryRange(context, queryServer, query); + assertEquals("Size was " + rangeQueryResponses.size(), 1, rangeQueryResponses.size()); + queryResponse = rangeQueryResponses.get(0); + assertEquals(queryBackend, queryResponse.getChannel().getBackend()); + assertEquals(ChannelConfiguration.COMBINED_CHANNEL_NAME, queryResponse.getChannel().getName()); + assertEquals("2019-03-01T14:00:00.003686705+01:00", queryResponse.getStart().getGlobalDate()); + assertEquals(8007686705L, queryResponse.getStart().getPulseId()); + assertEquals("2019-03-01T16:00:00.003406582+01:00", queryResponse.getEnd().getGlobalDate()); + assertEquals(8008406582L, queryResponse.getEnd().getPulseId()); } }