Skip to content

Commit 52b232c

Browse files
committed
refactor
1 parent 12f911a commit 52b232c

File tree

1 file changed

+13
-37
lines changed

1 file changed

+13
-37
lines changed

operator-framework/src/test/java/io/javaoperatorsdk/operator/GracefulStopIT.java

Lines changed: 13 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -29,38 +29,22 @@ public class GracefulStopIT {
2929

3030
@Test
3131
void stopsGracefullyWIthTimeout() {
32-
var testRes = operator.create(testResource1());
33-
await().untilAsserted(() -> {
34-
var r = operator.get(GracefulStopTestCustomResource.class, TEST_1);
35-
assertThat(r.getStatus()).isNotNull();
36-
assertThat(r.getStatus().getObservedGeneration()).isEqualTo(1);
37-
assertThat(operator.getReconcilerOfType(GracefulStopTestReconciler.class)
38-
.getNumberOfExecutions()).isEqualTo(1);
39-
});
40-
41-
testRes.getSpec().setValue(2);
42-
operator.replace(testRes);
43-
44-
await().pollDelay(Duration.ofMillis(50)).untilAsserted(
45-
() -> assertThat(operator.getReconcilerOfType(GracefulStopTestReconciler.class)
46-
.getNumberOfExecutions()).isEqualTo(2));
47-
48-
operator.getOperator().stop(Duration.ofMillis(RECONCILER_SLEEP));
49-
50-
await().untilAsserted(() -> {
51-
var r = operator.get(GracefulStopTestCustomResource.class, TEST_1);
52-
assertThat(r.getStatus()).isNotNull();
53-
assertThat(r.getStatus().getObservedGeneration()).isEqualTo(2);
54-
});
32+
testGracefulStop(TEST_1, RECONCILER_SLEEP, 2);
5533
}
5634

5735
@Test
5836
void stopsGracefullyWithExpiredTimeout() {
59-
var testRes = operator.create(testResource2());
37+
testGracefulStop(TEST_2, RECONCILER_SLEEP / 5, 1);
38+
}
39+
40+
private void testGracefulStop(String resourceName, int stopTimeout, int expectedFinalGeneration) {
41+
var testRes = operator.create(testResource(resourceName));
6042
await().untilAsserted(() -> {
61-
var r = operator.get(GracefulStopTestCustomResource.class, TEST_2);
43+
var r = operator.get(GracefulStopTestCustomResource.class, resourceName);
6244
assertThat(r.getStatus()).isNotNull();
6345
assertThat(r.getStatus().getObservedGeneration()).isEqualTo(1);
46+
assertThat(operator.getReconcilerOfType(GracefulStopTestReconciler.class)
47+
.getNumberOfExecutions()).isEqualTo(1);
6448
});
6549

6650
testRes.getSpec().setValue(2);
@@ -70,23 +54,15 @@ void stopsGracefullyWithExpiredTimeout() {
7054
() -> assertThat(operator.getReconcilerOfType(GracefulStopTestReconciler.class)
7155
.getNumberOfExecutions()).isEqualTo(2));
7256

73-
operator.getOperator().stop(Duration.ofMillis(RECONCILER_SLEEP / 5));
57+
operator.getOperator().stop(Duration.ofMillis(stopTimeout));
7458

75-
await().pollDelay(Duration.ofMillis(RECONCILER_SLEEP)).untilAsserted(() -> {
76-
var r = operator.get(GracefulStopTestCustomResource.class, TEST_2);
59+
await().untilAsserted(() -> {
60+
var r = operator.get(GracefulStopTestCustomResource.class, resourceName);
7761
assertThat(r.getStatus()).isNotNull();
78-
assertThat(r.getStatus().getObservedGeneration()).isEqualTo(1);
62+
assertThat(r.getStatus().getObservedGeneration()).isEqualTo(expectedFinalGeneration);
7963
});
8064
}
8165

82-
public GracefulStopTestCustomResource testResource1() {
83-
return testResource(TEST_1);
84-
}
85-
86-
public GracefulStopTestCustomResource testResource2() {
87-
return testResource(TEST_2);
88-
}
89-
9066
public GracefulStopTestCustomResource testResource(String name) {
9167
GracefulStopTestCustomResource resource =
9268
new GracefulStopTestCustomResource();

0 commit comments

Comments
 (0)