From 5dc54653f0ff18b0a9bc6290926cffdbcd9fb7d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20M=C3=A4rki?= Date: Wed, 13 Mar 2019 14:17:45 +0100 Subject: [PATCH] Fix tests. --- .../query/QueryManagerRemoteTest.java | 34 +++++++++++-------- 1 file changed, 20 insertions(+), 14 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 0dbdcaa..b812e91 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 @@ -17,6 +17,7 @@ import javax.annotation.Resource; import org.junit.After; import org.junit.Before; +import org.junit.Ignore; import org.junit.Test; import org.springframework.context.ApplicationContext; @@ -78,6 +79,9 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { @After public void tearDown() {} + // had to disable json decoding -> StorelessStatistics @JsonTypeName and Statistics + // @JsonTypeInfo because otherwise field type would be included in QueryREST responses. + @Ignore @Test public void testStatisticsJSON_01() throws Exception { final ObjectMapper objectMapper = context.getBean(DomainConfig.BEAN_NAME_OBJECT_MAPPER, ObjectMapper.class) @@ -249,6 +253,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; + final int nrOfBins = 2; DAQQuery query = new DAQQuery( new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), @@ -256,10 +261,10 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { new ChannelName(scalarChannel, queryBackend), new ChannelName(waveformChannel, queryBackend)); query.setAggregation(new AggregationDescriptor(AggregationType.value) - .setNrOfBins(2) + .setNrOfBins(nrOfBins) .setAggregations(Arrays.asList(Aggregation.typed))); - int firstBinEventCount = 6; // 5; + int firstBinEventCount = 5; final List eventsList = RestHelper.queryEvents(context, queryServer, query); assertEquals("Size was " + eventsList.size(), 2, eventsList.size()); @@ -274,7 +279,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { // assertEquals(1, event.getDoubleStream(ByteConverter.PARALLELISM_FALSE).count()); assertEquals(firstBinEventCount, event.getEventCount()); assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getGlobalDate()); - assertEquals("1970-01-01T01:00:00.000000000+01:00", event.getIocDate()); + assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getIocDate()); assertEquals(638760000, event.getPulseId()); assertArrayEquals(new int[] {1}, event.getShape()); assertEquals(firstBinEventCount, event.getStatistics().getCount()); @@ -284,7 +289,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { events = eventsList.get(1) .getEvents() .collect(Collectors.toList()); - assertEquals("Size was " + events.size(), 11, events.size()); + assertEquals("Size was " + events.size(), nrOfBins, events.size()); event = events.get(0); assertEquals(Event.class, event.getClass()); assertEquals(queryBackend, event.getBackend()); @@ -292,7 +297,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { // assertEquals(1, event.getDoubleStream(ByteConverter.PARALLELISM_FALSE).count()); assertEquals(firstBinEventCount, event.getEventCount()); assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getGlobalDate()); - assertEquals("1970-01-01T01:00:00.000000000+01:00", event.getIocDate()); + assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getIocDate()); assertEquals(638760000, event.getPulseId()); assertArrayEquals(new int[] {1}, event.getShape()); assertEquals(firstBinEventCount * 2048, event.getStatistics().getCount()); @@ -307,6 +312,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { String scalarChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT-AVG"; String waveformChannel = "SINEG01-RCIR-PUP10:SIG-AMPLT"; + final int nrOfBins = 2; DAQQuery query = new DAQQuery( new RequestRangeSeconds( TimeUtils.parse("2016-10-12T14:00"), @@ -314,17 +320,17 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { new ChannelName(scalarChannel, queryBackend), new ChannelName(waveformChannel, queryBackend)); query.setAggregation(new AggregationDescriptor(AggregationType.index) - .setNrOfBins(2) + .setNrOfBins(nrOfBins) .setAggregations(Arrays.asList(Aggregation.typed))); final List eventsList = RestHelper.queryEvents(context, queryServer, query); assertEquals("Size was " + eventsList.size(), 2, eventsList.size()); - int firstBinEventCount = 6; // 5; + int firstBinEventCount = 5; List events = eventsList.get(0) .getEvents() .collect(Collectors.toList()); - assertEquals("Size was " + events.size(), 11, events.size()); + assertEquals("Size was " + events.size(), nrOfBins, events.size()); StreamEvent event = events.get(0); assertEquals(Event.class, event.getClass()); assertEquals(queryBackend, event.getBackend()); @@ -332,7 +338,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { // assertEquals(1, event.getDoubleStream(ByteConverter.PARALLELISM_FALSE).count()); assertEquals(firstBinEventCount, event.getEventCount()); assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getGlobalDate()); - assertEquals("1970-01-01T01:00:00.000000000+01:00", event.getIocDate()); + assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getIocDate()); assertEquals(638760000, event.getPulseId()); assertArrayEquals(new int[] {1}, event.getShape()); assertEquals(firstBinEventCount, event.getStatistics().getCount()); @@ -343,7 +349,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { events = eventsList.get(1) .getEvents() .collect(Collectors.toList()); - assertEquals("Size was " + events.size(), 11, events.size()); + assertEquals("Size was " + events.size(), nrOfBins, events.size()); event = events.get(0); assertEquals(Event.class, event.getClass()); assertEquals(queryBackend, event.getBackend()); @@ -351,7 +357,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { // assertEquals(1, event.getDoubleStream(ByteConverter.PARALLELISM_FALSE).count()); assertEquals(firstBinEventCount, event.getEventCount()); assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getGlobalDate()); - assertEquals("1970-01-01T01:00:00.000000000+01:00", event.getIocDate()); + assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getIocDate()); assertEquals(638760000, event.getPulseId()); assertArrayEquals(new int[] {2048}, event.getShape()); assertEquals(2048, event.getValue(List.class).size()); @@ -506,7 +512,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { .setAggregations(Arrays.asList(Aggregation.typed))); query.setMapping(new Mapping()); - int firstBinEventCount = 6; // 5; + int firstBinEventCount = 5; final ChannelEventTable table = RestHelper.queryEventsTable(context, queryServer, query); assertEquals("Size was " + table.size(), 2, table.size()); final List> eventsTable = table.getEvents(Collectors.toMap( @@ -528,7 +534,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { // assertEquals(1, event.getDoubleStream(ByteConverter.PARALLELISM_FALSE).count()); assertEquals(firstBinEventCount, event.getEventCount()); assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getGlobalDate()); - assertEquals("1970-01-01T01:00:00.000000000+01:00", event.getIocDate()); + assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getIocDate()); assertEquals(638760000, event.getPulseId()); assertArrayEquals(new int[] {1}, event.getShape()); assertEquals(firstBinEventCount, event.getStatistics().getCount()); @@ -542,7 +548,7 @@ public class QueryManagerRemoteTest extends AbstractDaqRestTest { // assertEquals(1, event.getDoubleStream(ByteConverter.PARALLELISM_FALSE).count()); assertEquals(firstBinEventCount, event.getEventCount()); assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getGlobalDate()); - assertEquals("1970-01-01T01:00:00.000000000+01:00", event.getIocDate()); + assertEquals("2016-10-12T14:07:09.914760000+02:00", event.getIocDate()); assertEquals(638760000, event.getPulseId()); assertArrayEquals(new int[] {1}, event.getShape()); assertEquals(firstBinEventCount * 2048, event.getStatistics().getCount());