Skip to content

Commit 6575973

Browse files
committed
Improve test readability
1 parent dfeb204 commit 6575973

File tree

2 files changed

+11
-12
lines changed

2 files changed

+11
-12
lines changed

operator/src/test/java/oracle/kubernetes/operator/helpers/AsyncCallTestSupport.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ private String toString(RequestParams requestParams, CallParams callParams) {
106106
/**
107107
* Throws an exception if any of the canned responses were not used.
108108
*/
109-
public void verify() {
109+
public void verifyAllDefinedResponsesInvoked() {
110110
List<CannedResponse> unusedResponses = new ArrayList<>();
111111
for (CannedResponse cannedResponse : cannedResponses.keySet())
112112
if (!cannedResponses.get(cannedResponse)) unusedResponses.add(cannedResponse);

operator/src/test/java/oracle/kubernetes/operator/steps/DeleteIngressListStepTest.java

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import java.net.HttpURLConnection;
44
import java.util.ArrayList;
5+
import java.util.Arrays;
56
import java.util.Collection;
67
import java.util.List;
78

@@ -41,23 +42,23 @@ public void tearDown() throws Exception {
4142

4243
@Test
4344
public void whenCollectionEmpty_makeNoCalls() throws Exception {
44-
runStep();
45+
runDeleteStep();
4546
}
4647

47-
private void runStep() {
48-
testSupport.runStep(new DeleteIngressListStep(ingresses, terminalStep));
48+
private void runDeleteStep(V1beta1Ingress... ingresses) {
49+
this.ingresses.addAll(Arrays.asList(ingresses));
50+
testSupport.runStep(new DeleteIngressListStep(this.ingresses, terminalStep));
4951
}
5052

5153
@Test
5254
public void whenCollectionContainsItems_invokeDeleteCalls() throws Exception {
5355
defineResponse("namespace1", "name1").returning(new V1Status());
5456
defineResponse("namespace2", "name2").returning(new V1Status());
55-
ingresses.add(new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace1").name("name1")));
56-
ingresses.add(new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace2").name("name2")));
5757

58-
runStep();
58+
runDeleteStep(new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace1").name("name1")),
59+
new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace2").name("name2")));
5960

60-
testSupport.verify();
61+
testSupport.verifyAllDefinedResponsesInvoked();
6162
}
6263

6364
@SuppressWarnings("unchecked")
@@ -68,18 +69,16 @@ private <T> AsyncCallTestSupport.CannedResponse<T> defineResponse(String namespa
6869
@Test
6970
public void onFailureResponse_reportError() throws Exception {
7071
defineResponse("namespace1", "name1").failingWithStatus(HttpURLConnection.HTTP_FORBIDDEN);
71-
ingresses.add(new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace1").name("name1")));
7272

73-
runStep();
73+
runDeleteStep(new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace1").name("name1")));
7474

7575
testSupport.verifyCompletionThrowable(ApiException.class);
7676
}
7777

7878
@Test
7979
public void onNotFoundResponse_dontReportError() throws Exception {
8080
defineResponse("namespace1", "name1").failingWithStatus(HttpURLConnection.HTTP_NOT_FOUND);
81-
ingresses.add(new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace1").name("name1")));
8281

83-
runStep();
82+
runDeleteStep(new V1beta1Ingress().metadata(new V1ObjectMeta().namespace("namespace1").name("name1")));
8483
}
8584
}

0 commit comments

Comments
 (0)