ferenc-csaky commented on code in PR #24483:
URL: https://github.com/apache/flink/pull/24483#discussion_r1523230235
##########
flink-streaming-java/src/test/java/org/apache/flink/streaming/runtime/operators/windowing/MergingWindowSetTest.java:
##########
@@ -227,97 +220,92 @@ public void testLateMerging() throws Exception {
// add several non-overlapping initial windows
mergeFunction.reset();
- assertEquals(
- new TimeWindow(0, 3), windowSet.addWindow(new TimeWindow(0,
3), mergeFunction));
- assertFalse(mergeFunction.hasMerged());
- assertEquals(new TimeWindow(0, 3), windowSet.getStateWindow(new
TimeWindow(0, 3)));
+ assertThat(windowSet.addWindow(new TimeWindow(0, 3), mergeFunction))
+ .isEqualTo(new TimeWindow(0, 3));
+ assertThat(mergeFunction.hasMerged()).isFalse();
+ assertThat(windowSet.getStateWindow(new TimeWindow(0,
3))).isEqualTo(new TimeWindow(0, 3));
mergeFunction.reset();
- assertEquals(
- new TimeWindow(5, 8), windowSet.addWindow(new TimeWindow(5,
8), mergeFunction));
- assertFalse(mergeFunction.hasMerged());
- assertEquals(new TimeWindow(5, 8), windowSet.getStateWindow(new
TimeWindow(5, 8)));
+ assertThat(windowSet.addWindow(new TimeWindow(5, 8), mergeFunction))
+ .isEqualTo(new TimeWindow(5, 8));
+ assertThat(mergeFunction.hasMerged()).isFalse();
+ assertThat(windowSet.getStateWindow(new TimeWindow(5,
8))).isEqualTo(new TimeWindow(5, 8));
mergeFunction.reset();
- assertEquals(
- new TimeWindow(10, 13), windowSet.addWindow(new TimeWindow(10,
13), mergeFunction));
- assertFalse(mergeFunction.hasMerged());
- assertEquals(new TimeWindow(10, 13), windowSet.getStateWindow(new
TimeWindow(10, 13)));
+ assertThat(windowSet.addWindow(new TimeWindow(10, 13), mergeFunction))
+ .isEqualTo(new TimeWindow(10, 13));
+ assertThat(mergeFunction.hasMerged()).isFalse();
+ assertThat(windowSet.getStateWindow(new TimeWindow(10, 13)))
+ .isEqualTo(new TimeWindow(10, 13));
// add a window that merges the later two windows
mergeFunction.reset();
- assertEquals(
- new TimeWindow(5, 13), windowSet.addWindow(new TimeWindow(8,
10), mergeFunction));
- assertTrue(mergeFunction.hasMerged());
- assertEquals(new TimeWindow(5, 13), mergeFunction.mergeTarget());
- assertThat(
- mergeFunction.stateWindow(),
- anyOf(is(new TimeWindow(5, 8)), is(new TimeWindow(10, 13))));
- assertThat(
- mergeFunction.mergeSources(),
- containsInAnyOrder(new TimeWindow(5, 8), new TimeWindow(10,
13)));
- assertThat(
- mergeFunction.mergedStateWindows(),
- anyOf(
- containsInAnyOrder(new TimeWindow(10, 13)),
- containsInAnyOrder(new TimeWindow(5, 8))));
- assertThat(mergeFunction.mergedStateWindows(),
not(hasItem(mergeFunction.mergeTarget())));
+ assertThat(windowSet.addWindow(new TimeWindow(8, 10), mergeFunction))
+ .isEqualTo(new TimeWindow(5, 13));
+ assertThat(mergeFunction.hasMerged()).isTrue();
+ assertThat(mergeFunction.mergeTarget()).isEqualTo(new TimeWindow(5,
13));
+ assertThat(mergeFunction.stateWindow())
+ .satisfiesAnyOf(
+ w -> assertThat(w).isEqualTo(new TimeWindow(5, 8)),
+ w -> assertThat(w).isEqualTo(new TimeWindow(10, 13)));
+ assertThat(mergeFunction.mergeSources())
+ .containsExactlyInAnyOrder(new TimeWindow(5, 8), new
TimeWindow(10, 13));
+ assertThat(mergeFunction.mergedStateWindows())
+ .containsAnyOf(new TimeWindow(5, 8), new TimeWindow(10, 13));
- assertEquals(new TimeWindow(0, 3), windowSet.getStateWindow(new
TimeWindow(0, 3)));
+ assertThat(mergeFunction.mergedStateWindows().toArray())
+ .satisfiesAnyOf(
+ o -> assertThat(o).containsExactly(new TimeWindow(10,
13)),
+ o -> assertThat(o).containsExactly(new TimeWindow(5,
8)));
+
+
assertThat(mergeFunction.mergedStateWindows()).doesNotContain(mergeFunction.mergeTarget());
+
+ assertThat(windowSet.getStateWindow(new TimeWindow(0,
3))).isEqualTo(new TimeWindow(0, 3));
mergeFunction.reset();
- assertEquals(
- new TimeWindow(5, 13), windowSet.addWindow(new TimeWindow(5,
8), mergeFunction));
- assertFalse(mergeFunction.hasMerged());
+ assertThat(windowSet.addWindow(new TimeWindow(5, 8), mergeFunction))
+ .isEqualTo(new TimeWindow(5, 13));
+ assertThat(mergeFunction.hasMerged()).isFalse();
mergeFunction.reset();
- assertEquals(
- new TimeWindow(5, 13), windowSet.addWindow(new TimeWindow(8,
10), mergeFunction));
- assertFalse(mergeFunction.hasMerged());
+ assertThat(windowSet.addWindow(new TimeWindow(8, 10), mergeFunction))
+ .isEqualTo(new TimeWindow(5, 13));
+ assertThat(mergeFunction.hasMerged()).isFalse();
mergeFunction.reset();
- assertEquals(
- new TimeWindow(5, 13), windowSet.addWindow(new TimeWindow(10,
13), mergeFunction));
- assertFalse(mergeFunction.hasMerged());
+ assertThat(windowSet.addWindow(new TimeWindow(10, 13), mergeFunction))
+ .isEqualTo(new TimeWindow(5, 13));
+ assertThat(mergeFunction.hasMerged()).isFalse();
- assertThat(
- windowSet.getStateWindow(new TimeWindow(5, 13)),
- anyOf(is(new TimeWindow(5, 8)), is(new TimeWindow(10, 13))));
+ assertThat(windowSet.getStateWindow(new TimeWindow(5, 13)))
+ .isIn(new TimeWindow(5, 8), new TimeWindow(10, 13));
// add a window that merges all of them together
mergeFunction.reset();
- assertEquals(
- new TimeWindow(0, 13), windowSet.addWindow(new TimeWindow(3,
5), mergeFunction));
- assertTrue(mergeFunction.hasMerged());
- assertEquals(new TimeWindow(0, 13), mergeFunction.mergeTarget());
- assertThat(
- mergeFunction.stateWindow(),
- anyOf(
- is(new TimeWindow(0, 3)),
- is(new TimeWindow(5, 8)),
- is(new TimeWindow(10, 13))));
- assertThat(
- mergeFunction.mergeSources(),
- containsInAnyOrder(new TimeWindow(0, 3), new TimeWindow(5,
13)));
- assertThat(
- mergeFunction.mergedStateWindows(),
- anyOf(
- containsInAnyOrder(new TimeWindow(0, 3)),
- containsInAnyOrder(new TimeWindow(5, 8)),
- containsInAnyOrder(new TimeWindow(10, 13))));
- assertThat(mergeFunction.mergedStateWindows(),
not(hasItem(mergeFunction.mergeTarget())));
-
- assertThat(
- windowSet.getStateWindow(new TimeWindow(0, 13)),
- anyOf(
- is(new TimeWindow(0, 3)),
- is(new TimeWindow(5, 8)),
- is(new TimeWindow(10, 13))));
+ assertThat(windowSet.addWindow(new TimeWindow(0, 13), mergeFunction))
Review Comment:
This was `.addWindow(new TimeWindow(3, 5), ...` previously.
--
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.
To unsubscribe, e-mail: issues-unsubscr...@flink.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
