mmiklavc commented on a change in pull request #1554: METRON-2307: Migrate to
JUnit5
URL: https://github.com/apache/metron/pull/1554#discussion_r346411604
##########
File path:
metron-analytics/metron-profiler-client/src/test/java/org/apache/metron/profiler/client/window/WindowProcessorTest.java
##########
@@ -262,66 +264,80 @@ public void testDateDaySpecifier() throws ParseException
{
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm");
Date now = sdf.parse("2017/12/26 12:00");
List<Range<Long>> intervals = w.toIntervals(now.getTime());
- Assert.assertEquals(1, intervals.size());
+ assertEquals(1, intervals.size());
Date includedDate = new Date(intervals.get(0).getMinimum());
SimpleDateFormat equalityFormat = new SimpleDateFormat("yyyyMMdd");
- Assert.assertEquals("20171225", equalityFormat.format(includedDate));
+ assertEquals("20171225", equalityFormat.format(includedDate));
}
{
Window w = WindowProcessor.process("30 minute window every 24 hours from
14 days ago excluding date:2017/12/25");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm");
Date now = sdf.parse("2017/12/26 12:00");
List<Range<Long>> intervals = w.toIntervals(now.getTime());
- Assert.assertEquals(13, intervals.size());
+ assertEquals(13, intervals.size());
}
{
Window w = WindowProcessor.process("30 minute window every 24 hours from
14 days ago including date:2017/12/25, date:2017/12/24");
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm");
Date now = sdf.parse("2017/12/26 12:00");
List<Range<Long>> intervals = w.toIntervals(now.getTime());
- Assert.assertEquals(2, intervals.size());
+ assertEquals(2, intervals.size());
{
Date includedDate = new Date(intervals.get(0).getMinimum());
SimpleDateFormat equalityFormat = new SimpleDateFormat("yyyyMMdd");
- Assert.assertEquals("20171224", equalityFormat.format(includedDate));
+ assertEquals("20171224", equalityFormat.format(includedDate));
}
{
Date includedDate = new Date(intervals.get(1).getMinimum());
SimpleDateFormat equalityFormat = new SimpleDateFormat("yyyyMMdd");
- Assert.assertEquals("20171225", equalityFormat.format(includedDate));
+ assertEquals("20171225", equalityFormat.format(includedDate));
}
}
}
- @Test(expected=org.apache.metron.stellar.dsl.ParseException.class)
- public void testWithInvalidDaySpecifier() throws ParseException {
- WindowProcessor.process("30 minute window every 24 hours from 14 days ago
excluding hoolidays:us");
+ @Test
+ public void testWithInvalidDaySpecifier() {
+ assertThrows(
+ org.apache.metron.stellar.dsl.ParseException.class,
+ () ->
+ WindowProcessor.process(
+ "30 minute window every 24 hours from 14 days ago excluding
hoolidays:us"));
}
- @Test(expected=org.apache.metron.stellar.dsl.ParseException.class)
- public void testWithInvalidTimeUnit() throws ParseException {
- WindowProcessor.process("30 minute window every 24 months from 14 days
ago");
+ @Test
+ public void testWithInvalidTimeUnit() {
+ assertThrows(
+ org.apache.metron.stellar.dsl.ParseException.class,
+ () -> WindowProcessor.process("30 minute window every 24 months from
14 days ago"));
}
- @Test(expected=org.apache.metron.stellar.dsl.ParseException.class)
- public void testWithInvalidWindowUnit() throws ParseException {
- WindowProcessor.process("30 minuete window every 24 hours from 14 days
ago");
+ @Test
+ public void testWithInvalidWindowUnit() {
+ assertThrows(
+ org.apache.metron.stellar.dsl.ParseException.class,
+ () -> WindowProcessor.process("30 minuete window every 24 hours from
14 days ago"));
}
- @Test(expected=org.apache.metron.stellar.dsl.ParseException.class)
- public void testWithInvalidTimeNumber() throws ParseException {
- WindowProcessor.process("30p minute window every 24 hours from 14 days
ago");
+ @Test
+ public void testWithInvalidTimeNumber() {
+ assertThrows(
+ org.apache.metron.stellar.dsl.ParseException.class,
+ () -> WindowProcessor.process("30p minute window every 24 hours from
14 days ago"));
}
- @Test(expected=org.apache.metron.stellar.dsl.ParseException.class)
- public void testInvalidDaySpecifier() throws ParseException {
- WindowProcessor.process("30 minute window every 14 hours from 14 days ago
including date");
+ @Test
+ public void testInvalidDaySpecifier() {
+ assertThrows(
+ org.apache.metron.stellar.dsl.ParseException.class,
+ () ->
+ WindowProcessor.process(
+ "30 minute window every 14 hours from 14 days ago including
date"));
}
- private static void assertEquals(long expected, long actual) {
+ private static void assertTimeEquals(long expected, long actual) {
Review comment:
Good stuff re: clear name
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
