alx/ATS_Esper
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

OHLCPlugInView.java: fix bug in interval parsing. test.

Browse Source
This commit is contained in:
Seth Ladygo
2018-07-23 18:03:03 -07:00
parent 648b14eda9
commit 77dd0e2fc4
2 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/ats/plugin/OHLCPlugInView.java
View File

@ -34,9 +34,9 @@ public class OHLCPlugInView extends ViewSupport {
private static final Logger log = LoggerFactory.getLogger(OHLCPlugInView.class); private static final Logger log = LoggerFactory.getLogger(OHLCPlugInView.class);
private static final int LATE_EVENT_SLACK_SECONDS = 5; private static final int LATE_EVENT_SLACK_SECONDS = 5;
private static final PeriodFormatter periodFormatter = new PeriodFormatterBuilder() private static final PeriodFormatter periodFormatter = new PeriodFormatterBuilder()
.appendDays().appendSuffix("d ") .appendDays().appendSuffix("d")
.appendHours().appendSuffix("h ") .appendHours().appendSuffix("h")
.appendMinutes().appendSuffix("m ") .appendMinutes().appendSuffix("m")
.appendSeconds().appendSuffix("s") .appendSeconds().appendSuffix("s")
.toFormatter(); .toFormatter();
@ -78,7 +78,15 @@ public class OHLCPlugInView extends ViewSupport {
private Duration parseInterval(ExprNode interval) { private Duration parseInterval(ExprNode interval) {
ExprEvaluator evaluator = interval.getForge().getExprEvaluator(); ExprEvaluator evaluator = interval.getForge().getExprEvaluator();
String intervalStr = (String)evaluator.evaluate(null, true, agentContext); String intervalStr = (String)evaluator.evaluate(null, true, agentContext);
return periodFormatter.parsePeriod(intervalStr).toStandardDuration(); return parseInterval(intervalStr);
}
/**
* Return the time period specified by the given string.
*/
public static Duration parseInterval(String interval) {
interval = interval.replaceAll("\\s+","");
return periodFormatter.parsePeriod(interval).toStandardDuration();
} }
/** /**

21
src/test/java/ats/plugin/OHLCPlugInViewTest.java
View File

@ -43,14 +43,27 @@ public class OHLCPlugInViewTest {
expected += ".000Z"; expected += ".000Z";
log.info(" duration: {}", interval); // log.info(" duration: {}", interval);
log.info(" cur time: {}", dateFormatter.print(currentTime)); // log.info(" cur time: {}", dateFormatter.print(currentTime));
log.info("start time: {}", start); // log.info("start time: {}", start);
log.info(" expected: {}", expected); // log.info(" expected: {}", expected);
//assertEquals(interval.toString(), l.longValue(), Instant.parse("2018-05-15T13:23:00").getMillis()); //assertEquals(interval.toString(), l.longValue(), Instant.parse("2018-05-15T13:23:00").getMillis());
assertEquals(interval.toString(), expected, start); assertEquals(interval.toString(), expected, start);
} }
@Test
public void testParseInterval() {
assertParseInterval("4s", new Duration(4 * 1000));
assertParseInterval("4m", new Duration(4 * 60 * 1000));
assertParseInterval("1m5s", new Duration(65 * 1000));
assertParseInterval("1m 5s", new Duration(65 * 1000));
}
private void assertParseInterval(String str, Duration expected) {
assertEquals(OHLCPlugInView.parseInterval(str), expected);
}
/* /*
private static Long makeWindowStartTime(Long timestamp, Duration interval) { private static Long makeWindowStartTime(Long timestamp, Duration interval) {
long today = getDayStart(timestamp); long today = getDayStart(timestamp);