Skip to content

Commit feaa239

Browse files
committed
test
Signed-off-by: Attila Mészáros <[email protected]>
1 parent 27dbbeb commit feaa239

File tree

2 files changed

+31
-8
lines changed

2 files changed

+31
-8
lines changed

src/test/java/io/javaoperatorsdk/operator/glue/GlueTest.java

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
import io.javaoperatorsdk.operator.glue.customresource.glue.Glue;
2020
import io.javaoperatorsdk.operator.glue.reconciler.ValidationAndErrorHandler;
2121
import io.quarkus.test.junit.QuarkusTest;
22+
import org.junit.jupiter.params.ParameterizedTest;
23+
import org.junit.jupiter.params.provider.ValueSource;
2224

2325
import static org.assertj.core.api.Assertions.assertThat;
2426
import static org.awaitility.Awaitility.await;
@@ -325,12 +327,13 @@ void clusterScopedRelatedResource() {
325327
});
326328
}
327329

328-
@Test
329-
void pathRelatedResourceStatus() {
330+
@ParameterizedTest
331+
@ValueSource(strings = {"PatchRelatedStatus.yaml","PatchRelatedStatusWithTemplate.yaml"})
332+
void pathRelatedResourceStatus(String glueFileName) {
330333
TestUtils.applyTestCrd(client, TestCustomResource.class);
331334

332335
var customResource = create(TestData.testCustomResource());
333-
var glue = createGlue("/glue/PatchRelatedStatus.yaml");
336+
var glue = createGlue("/glue/"+glueFileName);
334337

335338
await().untilAsserted(() -> {
336339
var cm = get(ConfigMap.class, "configmap1");
@@ -339,19 +342,18 @@ void pathRelatedResourceStatus() {
339342
assertThat(cr.getStatus()).isNotNull();
340343
assertThat(cr.getStatus().getValue()).isEqualTo(cm.getMetadata().getResourceVersion());
341344
});
342-
343345
delete(glue);
344-
345346
await().timeout(TestUtils.GC_WAIT_TIMEOUT).untilAsserted(() -> {
346347
var cm = get(ConfigMap.class, "configmap1");
347348
assertThat(cm).isNull();
348349
});
349-
350350
delete(customResource);
351+
await().untilAsserted(() -> {
352+
var cr = get(TestCustomResource.class, "testcr1");
353+
assertThat(cr).isNull();
354+
});
351355
}
352356

353-
354-
355357
private List<Glue> testWorkflowList(int num) {
356358
List<Glue> res = new ArrayList<>();
357359
IntStream.range(0, num).forEach(index -> {
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
apiVersion: io.javaoperatorsdk.operator.glue/v1beta1
2+
kind: Glue
3+
metadata:
4+
name: related-resource-status-patch
5+
spec:
6+
childResources:
7+
- name: configMap1
8+
resource:
9+
apiVersion: v1
10+
kind: ConfigMap
11+
metadata:
12+
name: configmap1
13+
data:
14+
key: "value"
15+
relatedResources:
16+
- name: related
17+
apiVersion: "io.javaoperatorsdk.operator.glue/v1"
18+
kind: TestCustomResource
19+
resourceNames: ["testcr1"]
20+
statusPatchTemplate: |
21+
value: "{configMap1.metadata.resourceVersion}"

0 commit comments

Comments
 (0)