Skip to content

Commit f5e2b39

Browse files
committed
chore: polish the junit5 extension
1 parent 98e3def commit f5e2b39

File tree

7 files changed

+14
-13
lines changed

7 files changed

+14
-13
lines changed

Diff for: operator-framework-junit5/src/main/java/io/javaoperatorsdk/operator/junit/OperatorExtension.java

+6-5
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,11 @@ private OperatorExtension(
6767
this.waitForNamespaceDeletion = waitForNamespaceDeletion;
6868
}
6969

70+
/**
71+
* Creates a {@link Builder} to set up an {@link OperatorExtension} instance.
72+
*
73+
* @return the builder.
74+
*/
7075
public static Builder builder() {
7176
return new Builder();
7277
}
@@ -123,7 +128,7 @@ public <T extends HasMetadata> NonNamespaceOperation<T, KubernetesResourceList<T
123128
return kubernetesClient.resources(type).inNamespace(namespace);
124129
}
125130

126-
public <T extends HasMetadata> T getNamedResource(Class<T> type, String name) {
131+
public <T extends HasMetadata> T get(Class<T> type, String name) {
127132
return kubernetesClient.resources(type).inNamespace(namespace).withName(name).get();
128133
}
129134

@@ -135,10 +140,6 @@ public <T extends HasMetadata> T replace(Class<T> type, T resource) {
135140
return kubernetesClient.resources(type).inNamespace(namespace).replace(resource);
136141
}
137142

138-
public <T extends HasMetadata> T get(Class<T> type, String name) {
139-
return kubernetesClient.resources(type).inNamespace(namespace).withName(name).get();
140-
}
141-
142143

143144
@SuppressWarnings("unchecked")
144145
protected void before(ExtensionContext context) {

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() throws InterruptedExcepti
5858
// update some resources
5959
for (int i = 0; i < NUMBER_OF_RESOURCES_UPDATED; i++) {
6060
TestCustomResource tcr =
61-
operator.getNamedResource(TestCustomResource.class,
61+
operator.get(TestCustomResource.class,
6262
TestUtils.TEST_CUSTOM_RESOURCE_PREFIX + i);
6363
tcr.getSpec().setValue(i + UPDATED_SUFFIX);
6464
operator.resources(TestCustomResource.class)

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ void awaitResourcesCreatedOrUpdated() {
5252
.untilAsserted(
5353
() -> {
5454
ConfigMap configMap =
55-
operator.getNamedResource(ConfigMap.class, "test-config-map");
55+
operator.get(ConfigMap.class, "test-config-map");
5656
assertThat(configMap).isNotNull();
5757
assertThat(configMap.getData().get("test-key")).isEqualTo("test-value");
5858
});
@@ -68,7 +68,7 @@ void awaitStatusUpdated(int timeout) {
6868
.untilAsserted(
6969
() -> {
7070
TestCustomResource cr =
71-
operator.getNamedResource(TestCustomResource.class,
71+
operator.get(TestCustomResource.class,
7272
TestUtils.TEST_CUSTOM_RESOURCE_NAME);
7373
assertThat(cr).isNotNull();
7474
assertThat(cr.getStatus()).isNotNull();

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/InformerEventSourceIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ private InformerEventSourceTestCustomResource initialCustomResource() {
7070
private void waitForCRStatusValue(String value) {
7171
await().atMost(10, TimeUnit.SECONDS).untilAsserted(() -> {
7272
var cr =
73-
operator.getNamedResource(InformerEventSourceTestCustomResource.class, RESOURCE_NAME);
73+
operator.get(InformerEventSourceTestCustomResource.class, RESOURCE_NAME);
7474
assertThat(cr.getStatus()).isNotNull();
7575
assertThat(cr.getStatus().getConfigMapValue()).isEqualTo(value);
7676
});

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public void retryFailedExecution() {
5252
.isEqualTo(RetryTestCustomResourceController.NUMBER_FAILED_EXECUTIONS + 1);
5353

5454
RetryTestCustomResource finalResource =
55-
operator.getNamedResource(RetryTestCustomResource.class,
55+
operator.get(RetryTestCustomResource.class,
5656
resource.getMetadata().getName());
5757
assertThat(finalResource.getStatus().getState())
5858
.isEqualTo(RetryTestCustomResourceStatus.State.SUCCESS);

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ void awaitStatusUpdated(String name) {
9999
.untilAsserted(
100100
() -> {
101101
SubResourceTestCustomResource cr =
102-
operator.getNamedResource(SubResourceTestCustomResource.class, name);
102+
operator.get(SubResourceTestCustomResource.class, name);
103103
assertThat(cr.getMetadata().getFinalizers()).hasSize(1);
104104
assertThat(cr).isNotNull();
105105
assertThat(cr.getStatus()).isNotNull();

Diff for: operator-framework/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public void updatesSubResourceStatus() {
3636

3737
DoubleUpdateTestCustomResource customResource =
3838
operator
39-
.getNamedResource(DoubleUpdateTestCustomResource.class,
39+
.get(DoubleUpdateTestCustomResource.class,
4040
resource.getMetadata().getName());
4141

4242
assertThat(TestUtils.getNumberOfExecutions(operator))
@@ -57,7 +57,7 @@ void awaitStatusUpdated(String name) {
5757
.untilAsserted(
5858
() -> {
5959
DoubleUpdateTestCustomResource cr =
60-
operator.getNamedResource(DoubleUpdateTestCustomResource.class, name);
60+
operator.get(DoubleUpdateTestCustomResource.class, name);
6161

6262
assertThat(cr)
6363
.isNotNull();

0 commit comments

Comments
 (0)