From e212c73ca8957a4b8dd572e189afba3962bf8486 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Thu, 21 Feb 2019 15:49:11 +0100 Subject: [PATCH] Provide unscaled time range. --- .../CSVQueryRestControllerTest.java | 6 ++-- .../JsonQueryRestControllerTableTest.java | 6 ++-- .../JsonQueryRestControllerTest.java | 32 +++++++++---------- .../query/QueryManagerRemoteTest.java | 18 +++++------ 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java index dbc8fcf..95b698d 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/controller/CSVQueryRestControllerTest.java @@ -45,7 +45,7 @@ import ch.psi.daq.domain.query.operation.Extrema; import ch.psi.daq.domain.query.operation.EventField; import ch.psi.daq.domain.request.range.RequestRangeDate; import ch.psi.daq.domain.request.range.RequestRangePulseId; -import ch.psi.daq.domain.request.range.RequestRangeTime; +import ch.psi.daq.domain.request.range.RequestRangeSeconds; import ch.psi.daq.domain.test.TestTimeUtils; import ch.psi.daq.queryrest.response.csv.CSVHTTPResponse; import ch.psi.daq.queryrest.response.csv.CSVResponseStreamWriter; @@ -798,7 +798,7 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A public void testTimeRangeQuery() throws Exception { List channels = Arrays.asList(TEST_CHANNEL_01, TEST_CHANNEL_02); DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(0, 0), TimeUtils.getTimeFromMillis(10, 0)), channels); @@ -881,7 +881,7 @@ public class CSVQueryRestControllerTest extends AbstractDaqRestTest implements A public void testTimeRangeQueryConfigFields() throws Exception { List channels = Arrays.asList(TEST_CHANNEL_01, TEST_CHANNEL_02); DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(0, 0), TimeUtils.getTimeFromMillis(10, 0)), channels); diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java index ee4ee3f..149a224 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTableTest.java @@ -54,7 +54,7 @@ import ch.psi.daq.domain.query.transform.image.encoding.Base64ImageEncoder; import ch.psi.daq.domain.query.transform.sampling.ValueSamplerValueTransformation; import ch.psi.daq.domain.request.range.RequestRangeDate; import ch.psi.daq.domain.request.range.RequestRangePulseId; -import ch.psi.daq.domain.request.range.RequestRangeTime; +import ch.psi.daq.domain.request.range.RequestRangeSeconds; import ch.psi.daq.domain.test.TestTimeUtils; import ch.psi.daq.domain.test.reader.TestReader; import ch.psi.daq.test.queryrest.AbstractDaqRestTest; @@ -653,7 +653,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest implem @Test public void testTimeRangeQuery_01() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(2000, 0), TimeUtils.getTimeFromMillis(2010, 0)), TEST_CHANNEL_NAMES); @@ -708,7 +708,7 @@ public class JsonQueryRestControllerTableTest extends AbstractDaqRestTest implem @Test public void testTimeRangeQuery_01_ConfigFields() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(2000, 0), TimeUtils.getTimeFromMillis(2010, 0)), TEST_CHANNEL_NAMES); diff --git a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java index bbbc53d..691e21a 100644 --- a/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java +++ b/src/test/java/ch/psi/daq/test/queryrest/controller/JsonQueryRestControllerTest.java @@ -52,12 +52,12 @@ import ch.psi.daq.domain.query.transform.sampling.ValueSamplerValueTransformatio import ch.psi.daq.domain.request.range.RequestRangeDate; import ch.psi.daq.domain.request.range.RequestRangeEndDate; import ch.psi.daq.domain.request.range.RequestRangeEndPulseId; -import ch.psi.daq.domain.request.range.RequestRangeEndTime; +import ch.psi.daq.domain.request.range.RequestRangeEndSeconds; import ch.psi.daq.domain.request.range.RequestRangePulseId; import ch.psi.daq.domain.request.range.RequestRangeStartDate; import ch.psi.daq.domain.request.range.RequestRangeStartPulseId; -import ch.psi.daq.domain.request.range.RequestRangeStartTime; -import ch.psi.daq.domain.request.range.RequestRangeTime; +import ch.psi.daq.domain.request.range.RequestRangeStartSeconds; +import ch.psi.daq.domain.request.range.RequestRangeSeconds; import ch.psi.daq.domain.test.TestTimeUtils; import ch.psi.daq.queryrest.response.json.JSONHTTPResponse; import ch.psi.daq.test.queryrest.AbstractDaqRestTest; @@ -687,7 +687,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testTimeRangeQuery_01() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(2000, 0), TimeUtils.getTimeFromMillis(2010, 0)), TEST_CHANNEL_NAMES); @@ -729,7 +729,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testTimeRangeQuery_01_StartExpansion() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(2000, 0), true, TimeUtils.getTimeFromMillis(2010, 0), @@ -779,7 +779,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testTimeRangeQuery_01_EndExpansion() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(1990, 0), false, TimeUtils.getTimeFromMillis(2000, 0), @@ -829,7 +829,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testTimeRangeQuery_01_ConfigFields() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(2000, 0), TimeUtils.getTimeFromMillis(2010, 0)), TEST_CHANNEL_NAMES); @@ -1026,7 +1026,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryStart_01() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeStartTime( + new RequestRangeStartSeconds( TimeUtils.getTimeFromMillis(2000, 0)), TEST_CHANNEL_NAMES); request.setLimit(2); @@ -1068,7 +1068,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryStart_01_Exclusive() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeStartTime( + new RequestRangeStartSeconds( TimeUtils.getTimeFromMillis(2000, 0), false), TEST_CHANNEL_NAMES); @@ -1154,7 +1154,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryStart_02() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeStartTime( + new RequestRangeStartSeconds( TimeUtils.getTimeFromMillis(2000, 0)), TEST_CHANNEL_NAMES); @@ -1178,7 +1178,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryStart_03() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeStartTime( + new RequestRangeStartSeconds( TimeUtils.getTimeFromMillis(2000, 0)), TEST_CHANNEL_NAMES); request.setLimit(2); @@ -1204,7 +1204,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryEnd_01() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeEndTime( + new RequestRangeEndSeconds( TimeUtils.getTimeFromMillis(2010, 0)), TEST_CHANNEL_NAMES); request.setLimit(2); @@ -1247,7 +1247,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryEnd_01_Exclusive() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeEndTime( + new RequestRangeEndSeconds( TimeUtils.getTimeFromMillis(2020, 0), false), TEST_CHANNEL_NAMES); @@ -1335,7 +1335,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryEnd_02() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeEndTime( + new RequestRangeEndSeconds( TimeUtils.getTimeFromMillis(2010, 0)), TEST_CHANNEL_NAMES); request.setOrdering(Ordering.desc); @@ -1360,7 +1360,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testOpenTimeRangeQueryEnd_03() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeEndTime( + new RequestRangeEndSeconds( TimeUtils.getTimeFromMillis(2010, 0)), TEST_CHANNEL_NAMES); request.setLimit(2); @@ -2207,7 +2207,7 @@ public class JsonQueryRestControllerTest extends AbstractDaqRestTest implements @Test public void testBadAggregation_02() throws Exception { DAQQuery request = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.getTimeFromMillis(0, 0), TimeUtils.getTimeFromMillis(10, 0)), new AggregationDescriptor().setPulsesPerBin(100), 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 53d4f58..0dbdcaa 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 @@ -45,7 +45,7 @@ import ch.psi.daq.domain.query.mapping.Mapping; import ch.psi.daq.domain.query.operation.Aggregation; import ch.psi.daq.domain.query.operation.AggregationDescriptor; import ch.psi.daq.domain.query.operation.AggregationType; -import ch.psi.daq.domain.request.range.RequestRangeTime; +import ch.psi.daq.domain.request.range.RequestRangeSeconds; import ch.psi.daq.domain.rest.RestHelper; import ch.psi.daq.queryrest.config.QueryRestConfig; import ch.psi.daq.queryrest.query.QueryManager; @@ -114,7 +114,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String channel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; DAQConfigQuery query = new DAQConfigQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2018-12-03T08:00")), new ChannelName(channel, queryBackend)); @@ -138,7 +138,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; DAQQuery query = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2016-10-12T16:00")), new ChannelName(scalarChannel, queryBackend), @@ -194,7 +194,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; DAQQuery query = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2016-10-12T16:00")), new ChannelName(scalarChannel, queryBackend), @@ -250,7 +250,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; DAQQuery query = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2016-10-12T16:00")), new ChannelName(scalarChannel, queryBackend), @@ -308,7 +308,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; DAQQuery query = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2016-10-12T16:00")), new ChannelName(scalarChannel, queryBackend), @@ -376,7 +376,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; DAQQuery query = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2016-10-12T16:00")), new ChannelName(scalarChannel, queryBackend), @@ -436,7 +436,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; DAQQuery query = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2016-10-12T16:00")), new ChannelName(scalarChannel, queryBackend), @@ -496,7 +496,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; DAQQuery query = new DAQQuery( - new RequestRangeTime( + new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), TimeUtils.parse("2016-10-12T16:00")), new ChannelName(scalarChannel, queryBackend),