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

ATEST-319

Browse Source
This commit is contained in:
Fabian Märki
2016-04-12 11:59:11 +02:00
parent b6f49ffead
commit 085816ec8f
3 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Readme.md
View File

@ -129,7 +129,7 @@ Queries are applied to a range. The following types of ranges ranges are support
} }
``` ```
- **startDate**: The start date of the time range (ISO8601 format (YYYY-MM-DDThh:mm:ss.sTZD e.g. 1997-07-16T19:20:30.475+02:00 (omitting +02:00 falls back to the local time zone)). - **startDate**: The start date of the time range (ISO8601 format (YYYY-MM-DDThh:mm:ss.sTZD e.g. 1997-07-16T19:20:30.123+02:00 (omitting +02:00 falls back to the local time zone)). Additionally, ISO8601 format up to nano seconds is also supported (e.g. 1997-07-16T19:20:30.123456789+02:00).
- **endDate**: The end date of the time range. - **endDate**: The end date of the time range.

20
src/test/java/ch/psi/daq/test/queryrest/controller/QueryRestControllerCsvTest.java
View File

@ -407,8 +407,8 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
@Test @Test
public void testDateRangeQuery() throws Exception { public void testDateRangeQuery() throws Exception {
String startDate = RequestRangeDate.format(0); String startDate = TimeUtils.format(0);
String endDate = RequestRangeDate.format(10); String endDate = TimeUtils.format(10);
DAQQuery request = new DAQQuery( DAQQuery request = new DAQQuery(
new RequestRangeDate( new RequestRangeDate(
startDate, startDate,
@ -424,10 +424,14 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
cellProcessors.add(new NotNull()); cellProcessors.add(new NotNull());
queryFields.add(QueryField.iocSeconds); queryFields.add(QueryField.iocSeconds);
cellProcessors.add(new NotNull()); cellProcessors.add(new NotNull());
queryFields.add(QueryField.iocDate);
cellProcessors.add(new NotNull());
queryFields.add(QueryField.iocMillis); queryFields.add(QueryField.iocMillis);
cellProcessors.add(new NotNull()); cellProcessors.add(new NotNull());
queryFields.add(QueryField.globalSeconds); queryFields.add(QueryField.globalSeconds);
cellProcessors.add(new NotNull()); cellProcessors.add(new NotNull());
queryFields.add(QueryField.globalDate);
cellProcessors.add(new NotNull());
queryFields.add(QueryField.globalMillis); queryFields.add(QueryField.globalMillis);
cellProcessors.add(new NotNull()); cellProcessors.add(new NotNull());
queryFields.add(QueryField.shape); queryFields.add(QueryField.shape);
@ -470,10 +474,14 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
assertEquals("" + pulse, customerMap.get(QueryField.pulseId.name())); assertEquals("" + pulse, customerMap.get(QueryField.pulseId.name()));
assertEquals("" + TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), assertEquals("" + TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)),
customerMap.get(QueryField.iocSeconds.name())); customerMap.get(QueryField.iocSeconds.name()));
assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)),
customerMap.get(QueryField.iocDate.name()));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)),
customerMap.get(QueryField.iocMillis.name())); customerMap.get(QueryField.iocMillis.name()));
assertEquals("" + TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)), assertEquals("" + TimeUtils.getTimeStr(TestTimeUtils.getTimeFromPulseId(pulse)),
customerMap.get(QueryField.globalSeconds.name())); customerMap.get(QueryField.globalSeconds.name()));
assertEquals("" + TimeUtils.format(TestTimeUtils.getTimeFromPulseId(pulse)),
customerMap.get(QueryField.globalDate.name()));
assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)), assertEquals("" + TimeUtils.getMillis(TestTimeUtils.getTimeFromPulseId(pulse)),
customerMap.get(QueryField.globalMillis.name())); customerMap.get(QueryField.globalMillis.name()));
assertEquals("[1]", customerMap.get(QueryField.shape.name())); assertEquals("[1]", customerMap.get(QueryField.shape.name()));
@ -559,8 +567,8 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
public void testDateRangeQueryNrOfBinsAggregate() throws Exception { public void testDateRangeQueryNrOfBinsAggregate() throws Exception {
long startTime = 0; long startTime = 0;
long endTime = 99; long endTime = 99;
String startDate = RequestRangeDate.format(startTime); String startDate = TimeUtils.format(startTime);
String endDate = RequestRangeDate.format(endTime); String endDate = TimeUtils.format(endTime);
DAQQuery request = new DAQQuery( DAQQuery request = new DAQQuery(
new RequestRangeDate( new RequestRangeDate(
startDate, startDate,
@ -651,8 +659,8 @@ public class QueryRestControllerCsvTest extends AbstractDaqRestTest {
public void testDateRangeQueryBinSizeAggregate() throws Exception { public void testDateRangeQueryBinSizeAggregate() throws Exception {
long startTime = 0; long startTime = 0;
long endTime = 999; long endTime = 999;
String startDate = RequestRangeDate.format(startTime); String startDate = TimeUtils.format(startTime);
String endDate = RequestRangeDate.format(endTime); String endDate = TimeUtils.format(endTime);
DAQQuery request = new DAQQuery( DAQQuery request = new DAQQuery(
new RequestRangeDate( new RequestRangeDate(
startDate, startDate,

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

@ -460,8 +460,8 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
@Test @Test
public void testDateRangeQuery() throws Exception { public void testDateRangeQuery() throws Exception {
String startDate = RequestRangeDate.format(1000); String startDate = TimeUtils.format(1000);
String endDate = RequestRangeDate.format(1010); String endDate = TimeUtils.format(1010);
DAQQuery request = new DAQQuery( DAQQuery request = new DAQQuery(
new RequestRangeDate( new RequestRangeDate(
startDate, startDate,
@ -547,8 +547,8 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
public void testDateRangeQueryNrOfBinsAggregate() throws Exception { public void testDateRangeQueryNrOfBinsAggregate() throws Exception {
long startTime = 1000; long startTime = 1000;
long endTime = 1099; long endTime = 1099;
String startDate = RequestRangeDate.format(startTime); String startDate = TimeUtils.format(startTime);
String endDate = RequestRangeDate.format(endTime); String endDate = TimeUtils.format(endTime);
DAQQuery request = new DAQQuery( DAQQuery request = new DAQQuery(
new RequestRangeDate( new RequestRangeDate(
startDate, startDate,
@ -588,8 +588,8 @@ public class QueryRestControllerJsonTest extends AbstractDaqRestTest {
public void testDateRangeQueryBinSizeAggregate() throws Exception { public void testDateRangeQueryBinSizeAggregate() throws Exception {
long startTime = 10000; long startTime = 10000;
long endTime = 10999; long endTime = 10999;
String startDate = RequestRangeDate.format(startTime); String startDate = TimeUtils.format(startTime);
String endDate = RequestRangeDate.format(endTime); String endDate = TimeUtils.format(endTime);
DAQQuery request = new DAQQuery( DAQQuery request = new DAQQuery(
new RequestRangeDate( new RequestRangeDate(
startDate, startDate,