Skip to content

Commit 08b00a3

Browse files
metacosmmetacosm
committed
chore: use static imports
1 parent d0e3774 commit 08b00a3

File tree

8 files changed

+53
-54
lines changed

8 files changed

+53
-54
lines changed

‎operator-framework-core/src/test/java/io/javaoperatorsdk/operator/processing/event/EventListTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package io.javaoperatorsdk.operator.processing.event;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
34
import static org.mockito.Mockito.mock;
45

56
import io.javaoperatorsdk.operator.processing.event.internal.TimerEvent;
67
import java.util.Arrays;
7-
import org.assertj.core.api.Assertions;
88
import org.junit.jupiter.api.Test;
99

1010
class EventListTest {
@@ -16,6 +16,6 @@ public void returnsLatestOfEventType() {
1616
new EventList(
1717
Arrays.asList(mock(Event.class), new TimerEvent("2", null), event2, mock(Event.class)));
1818

19-
Assertions.assertThat(eventList.getLatestOfType(TimerEvent.class).get()).isEqualTo(event2);
19+
assertThat(eventList.getLatestOfType(TimerEvent.class).get()).isEqualTo(event2);
2020
}
2121
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ConcurrencyIT.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.javaoperatorsdk.operator;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.awaitility.Awaitility.await;
5+
36
import io.fabric8.kubernetes.api.model.ConfigMap;
47
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
58
import io.fabric8.kubernetes.client.KubernetesClient;
@@ -8,8 +11,6 @@
811
import java.util.List;
912
import java.util.concurrent.TimeUnit;
1013
import java.util.stream.Collectors;
11-
import org.assertj.core.api.Assertions;
12-
import org.awaitility.Awaitility;
1314
import org.junit.jupiter.api.BeforeAll;
1415
import org.junit.jupiter.api.BeforeEach;
1516
import org.junit.jupiter.api.Test;
@@ -52,7 +53,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
5253
.create(tcr);
5354
}
5455

55-
Awaitility.await()
56+
await()
5657
.atMost(1, TimeUnit.MINUTES)
5758
.untilAsserted(
5859
() -> {
@@ -65,7 +66,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
6566
"managedBy", TestCustomResourceController.class.getSimpleName())
6667
.list()
6768
.getItems();
68-
Assertions.assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED);
69+
assertThat(items).hasSize(NUMBER_OF_RESOURCES_CREATED);
6970
});
7071

7172
log.info("Updating {} resources", NUMBER_OF_RESOURCES_UPDATED);
@@ -97,7 +98,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
9798
.delete(tcr);
9899
}
99100

100-
Awaitility.await()
101+
await()
101102
.atMost(1, TimeUnit.MINUTES)
102103
.untilAsserted(
103104
() -> {
@@ -115,7 +116,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
115116
items.stream()
116117
.map(configMap -> configMap.getMetadata().getName())
117118
.collect(Collectors.toList());
118-
Assertions.assertThat(itemDescs)
119+
assertThat(itemDescs)
119120
.hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED);
120121

121122
List<TestCustomResource> crs =
@@ -124,7 +125,7 @@ public void manyResourcesGetCreatedUpdatedAndDeleted() {
124125
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
125126
.list()
126127
.getItems();
127-
Assertions.assertThat(crs)
128+
assertThat(crs)
128129
.hasSize(NUMBER_OF_RESOURCES_CREATED - NUMBER_OF_RESOURCES_DELETED);
129130
});
130131
});

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/ControllerExecutionIT.java

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
package io.javaoperatorsdk.operator;
22

3+
import static org.assertj.core.api.Assertions.*;
4+
import static org.awaitility.Awaitility.await;
5+
36
import io.fabric8.kubernetes.api.model.ConfigMap;
47
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
58
import io.fabric8.kubernetes.client.KubernetesClient;
69
import io.javaoperatorsdk.operator.sample.simple.TestCustomResource;
710
import io.javaoperatorsdk.operator.sample.simple.TestCustomResourceController;
811
import java.util.concurrent.TimeUnit;
9-
import org.assertj.core.api.Assertions;
10-
import org.awaitility.Awaitility;
1112
import org.junit.jupiter.api.Test;
1213
import org.junit.jupiter.api.TestInstance;
1314

@@ -39,7 +40,7 @@ public void configMapGetsCreatedForTestCustomResource() {
3940

4041
awaitResourcesCreatedOrUpdated();
4142
awaitStatusUpdated();
42-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
43+
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
4344
});
4445
}
4546

@@ -56,12 +57,12 @@ public void eventIsSkippedChangedOnMetadataOnlyUpdate() {
5657
.create(resource);
5758

5859
awaitResourcesCreatedOrUpdated();
59-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(1);
60+
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(1);
6061
});
6162
}
6263

6364
void awaitResourcesCreatedOrUpdated() {
64-
Awaitility.await("config map created")
65+
await("config map created")
6566
.atMost(5, TimeUnit.SECONDS)
6667
.untilAsserted(
6768
() -> {
@@ -72,8 +73,8 @@ void awaitResourcesCreatedOrUpdated() {
7273
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
7374
.withName("test-config-map")
7475
.get();
75-
Assertions.assertThat(configMap).isNotNull();
76-
Assertions.assertThat(configMap.getData().get("test-key")).isEqualTo("test-value");
76+
assertThat(configMap).isNotNull();
77+
assertThat(configMap.getData().get("test-key")).isEqualTo("test-value");
7778
});
7879
}
7980

@@ -82,7 +83,7 @@ void awaitStatusUpdated() {
8283
}
8384

8485
void awaitStatusUpdated(int timeout) {
85-
Awaitility.await("cr status updated")
86+
await("cr status updated")
8687
.atMost(timeout, TimeUnit.SECONDS)
8788
.untilAsserted(
8889
() -> {
@@ -93,10 +94,9 @@ void awaitStatusUpdated(int timeout) {
9394
.inNamespace(IntegrationTestSupport.TEST_NAMESPACE)
9495
.withName(TestUtils.TEST_CUSTOM_RESOURCE_NAME)
9596
.get();
96-
Assertions.assertThat(cr).isNotNull();
97-
Assertions.assertThat(cr.getStatus()).isNotNull();
98-
Assertions.assertThat(cr.getStatus().getConfigMapStatus())
99-
.isEqualTo("ConfigMap Ready");
97+
assertThat(cr).isNotNull();
98+
assertThat(cr.getStatus()).isNotNull();
99+
assertThat(cr.getStatus().getConfigMapStatus()).isEqualTo("ConfigMap Ready");
100100
});
101101
}
102102
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/EventSourceIT.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
package io.javaoperatorsdk.operator;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
35
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
46
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
57
import io.fabric8.kubernetes.client.KubernetesClient;
68
import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResource;
79
import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResourceController;
810
import io.javaoperatorsdk.operator.sample.event.EventSourceTestCustomResourceSpec;
9-
import org.assertj.core.api.Assertions;
1011
import org.junit.jupiter.api.BeforeEach;
1112
import org.junit.jupiter.api.Test;
1213
import org.junit.jupiter.api.TestInstance;
@@ -44,7 +45,7 @@ public void receivingPeriodicEvents() {
4445
+ EXPECTED_TIMER_EVENT_COUNT
4546
* EventSourceTestCustomResourceController.TIMER_PERIOD);
4647

47-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions())
48+
assertThat(integrationTestSupport.numberOfControllerExecutions())
4849
.isGreaterThanOrEqualTo(EXPECTED_TIMER_EVENT_COUNT + 1);
4950
});
5051
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/IntegrationTestSupport.java

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
package io.javaoperatorsdk.operator;
22

3+
import static org.assertj.core.api.Assertions.assertThat;
4+
import static org.awaitility.Awaitility.await;
5+
36
import io.fabric8.kubernetes.api.model.Namespace;
47
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
58
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
@@ -20,8 +23,6 @@
2023
import java.io.IOException;
2124
import java.io.InputStream;
2225
import java.util.concurrent.TimeUnit;
23-
import org.assertj.core.api.Assertions;
24-
import org.awaitility.Awaitility;
2526
import org.slf4j.Logger;
2627
import org.slf4j.LoggerFactory;
2728

@@ -88,25 +89,22 @@ public void cleanup() {
8889
// resources from previous test runs
8990
crOperations.inNamespace(TEST_NAMESPACE).delete(crOperations.list().getItems());
9091

91-
Awaitility.await("all CRs cleaned up")
92+
await("all CRs cleaned up")
9293
.atMost(60, TimeUnit.SECONDS)
9394
.untilAsserted(
94-
() -> {
95-
Assertions.assertThat(crOperations.inNamespace(TEST_NAMESPACE).list().getItems())
96-
.isEmpty();
97-
});
95+
() -> assertThat(crOperations.inNamespace(TEST_NAMESPACE).list().getItems()).isEmpty());
9896

9997
k8sClient
10098
.configMaps()
10199
.inNamespace(TEST_NAMESPACE)
102100
.withLabel("managedBy", controller.getClass().getSimpleName())
103101
.delete();
104102

105-
Awaitility.await("all config maps cleaned up")
103+
await("all config maps cleaned up")
106104
.atMost(60, TimeUnit.SECONDS)
107105
.untilAsserted(
108106
() -> {
109-
Assertions.assertThat(
107+
assertThat(
110108
k8sClient
111109
.configMaps()
112110
.inNamespace(TEST_NAMESPACE)
@@ -137,7 +135,7 @@ public void teardownIfSuccess(TestRun test) {
137135
if (namespace.getStatus().getPhase().equals("Active")) {
138136
k8sClient.namespaces().withName(TEST_NAMESPACE).delete();
139137
}
140-
Awaitility.await("namespace deleted")
138+
await("namespace deleted")
141139
.atMost(45, TimeUnit.SECONDS)
142140
.until(() -> k8sClient.namespaces().withName(TEST_NAMESPACE).get() == null);
143141
} catch (Exception e) {

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/RetryIT.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.javaoperatorsdk.operator;
22

33
import static io.javaoperatorsdk.operator.IntegrationTestSupport.TEST_NAMESPACE;
4+
import static org.assertj.core.api.Assertions.*;
45

56
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
67
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
@@ -11,7 +12,6 @@
1112
import io.javaoperatorsdk.operator.sample.retry.RetryTestCustomResourceController;
1213
import io.javaoperatorsdk.operator.sample.retry.RetryTestCustomResourceSpec;
1314
import io.javaoperatorsdk.operator.sample.retry.RetryTestCustomResourceStatus;
14-
import org.assertj.core.api.Assertions;
1515
import org.junit.jupiter.api.BeforeEach;
1616
import org.junit.jupiter.api.Test;
1717

@@ -40,7 +40,7 @@ public void retryFailedExecution() {
4040
Thread.sleep(
4141
RETRY_INTERVAL * (RetryTestCustomResourceController.NUMBER_FAILED_EXECUTIONS + 2));
4242

43-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions())
43+
assertThat(integrationTestSupport.numberOfControllerExecutions())
4444
.isGreaterThanOrEqualTo(
4545
RetryTestCustomResourceController.NUMBER_FAILED_EXECUTIONS + 1);
4646

@@ -51,7 +51,7 @@ public void retryFailedExecution() {
5151
.inNamespace(TEST_NAMESPACE)
5252
.withName(resource.getMetadata().getName())
5353
.get();
54-
Assertions.assertThat(finalResource.getStatus().getState())
54+
assertThat(finalResource.getStatus().getState())
5555
.isEqualTo(RetryTestCustomResourceStatus.State.SUCCESS);
5656
});
5757
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/SubResourceUpdateIT.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
package io.javaoperatorsdk.operator;
22

33
import static io.javaoperatorsdk.operator.IntegrationTestSupport.TEST_NAMESPACE;
4+
import static org.assertj.core.api.Assertions.assertThat;
5+
import static org.awaitility.Awaitility.await;
46

57
import io.fabric8.kubernetes.api.model.ObjectMetaBuilder;
68
import io.fabric8.kubernetes.client.DefaultKubernetesClient;
@@ -11,8 +13,6 @@
1113
import io.javaoperatorsdk.operator.sample.subresource.SubResourceTestCustomResourceStatus;
1214
import java.util.Collections;
1315
import java.util.concurrent.TimeUnit;
14-
import org.assertj.core.api.Assertions;
15-
import org.awaitility.Awaitility;
1616
import org.junit.jupiter.api.BeforeEach;
1717
import org.junit.jupiter.api.Test;
1818
import org.junit.jupiter.api.TestInstance;
@@ -41,7 +41,7 @@ public void updatesSubResourceStatus() {
4141
// wait for sure, there are no more events
4242
waitXms(200);
4343
// there is no event on status update processed
44-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
44+
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
4545
});
4646
}
4747

@@ -58,7 +58,7 @@ public void updatesSubResourceStatusNoFinalizer() {
5858
// wait for sure, there are no more events
5959
waitXms(200);
6060
// there is no event on status update processed
61-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
61+
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
6262
});
6363
}
6464

@@ -75,7 +75,7 @@ public void ifNoFinalizerPresentFirstAddsTheFinalizerThenExecutesControllerAgain
7575
// wait for sure, there are no more events
7676
waitXms(200);
7777
// there is no event on status update processed
78-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
78+
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(2);
7979
});
8080
}
8181

@@ -103,12 +103,12 @@ public void updateCustomResourceAfterSubResourceChange() {
103103
// wait for sure, there are no more events
104104
waitXms(200);
105105
// there is no event on status update processed
106-
Assertions.assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(3);
106+
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(3);
107107
});
108108
}
109109

110110
void awaitStatusUpdated(String name) {
111-
Awaitility.await("cr status updated")
111+
await("cr status updated")
112112
.atMost(5, TimeUnit.SECONDS)
113113
.untilAsserted(
114114
() -> {
@@ -119,10 +119,10 @@ void awaitStatusUpdated(String name) {
119119
.inNamespace(TEST_NAMESPACE)
120120
.withName(name)
121121
.get();
122-
Assertions.assertThat(cr.getMetadata().getFinalizers()).hasSize(1);
123-
Assertions.assertThat(cr).isNotNull();
124-
Assertions.assertThat(cr.getStatus()).isNotNull();
125-
Assertions.assertThat(cr.getStatus().getState())
122+
assertThat(cr.getMetadata().getFinalizers()).hasSize(1);
123+
assertThat(cr).isNotNull();
124+
assertThat(cr.getStatus()).isNotNull();
125+
assertThat(cr.getStatus().getState())
126126
.isEqualTo(SubResourceTestCustomResourceStatus.State.SUCCESS);
127127
});
128128
}

‎operator-framework/src/test/java/io/javaoperatorsdk/operator/UpdatingResAndSubResIT.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import io.javaoperatorsdk.operator.sample.doubleupdate.DoubleUpdateTestCustomResourceSpec;
1313
import io.javaoperatorsdk.operator.sample.doubleupdate.DoubleUpdateTestCustomResourceStatus;
1414
import java.util.concurrent.TimeUnit;
15-
import org.assertj.core.api.Assertions;
1615
import org.junit.jupiter.api.BeforeEach;
1716
import org.junit.jupiter.api.Test;
1817
import org.junit.jupiter.api.TestInstance;
@@ -45,9 +44,9 @@ public void updatesSubResourceStatus() {
4544
(DoubleUpdateTestCustomResource)
4645
integrationTestSupport.getCustomResource(resource.getMetadata().getName());
4746
assertThat(integrationTestSupport.numberOfControllerExecutions()).isEqualTo(1);
48-
Assertions.assertThat(customResource.getStatus().getState())
47+
assertThat(customResource.getStatus().getState())
4948
.isEqualTo(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
50-
Assertions.assertThat(
49+
assertThat(
5150
customResource
5251
.getMetadata()
5352
.getAnnotations()
@@ -68,10 +67,10 @@ void awaitStatusUpdated(String name) {
6867
.inNamespace(TEST_NAMESPACE)
6968
.withName(name)
7069
.get();
71-
Assertions.assertThat(cr.getMetadata().getFinalizers()).hasSize(1);
72-
Assertions.assertThat(cr).isNotNull();
73-
Assertions.assertThat(cr.getStatus()).isNotNull();
74-
Assertions.assertThat(cr.getStatus().getState())
70+
assertThat(cr.getMetadata().getFinalizers()).hasSize(1);
71+
assertThat(cr).isNotNull();
72+
assertThat(cr.getStatus()).isNotNull();
73+
assertThat(cr.getStatus().getState())
7574
.isEqualTo(DoubleUpdateTestCustomResourceStatus.State.SUCCESS);
7675
});
7776
}

0 commit comments

Comments
 (0)