Skip to content

Commit 7e0cf9e

Browse files
test: update assertions in DefaultServiceEnricherTest for improved clarity (3689)
test: update assertions in DefaultServiceEnricherTest for improved clarity --- test: update type assertions in DefaultServiceEnricherTest for accuracy --- test: add import for ServicePort in DefaultServiceEnricherTest
1 parent 9c7d1e4 commit 7e0cf9e

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

jkube-kit/enricher/generic/src/test/java/org/eclipse/jkube/enricher/generic/DefaultServiceEnricherTest.java

+12-11
Original file line numberDiff line numberDiff line change
@@ -17,30 +17,31 @@
1717
import java.util.Collections;
1818
import java.util.TreeMap;
1919

20+
import static org.assertj.core.api.Assertions.assertThat;
21+
import static org.assertj.core.api.InstanceOfAssertFactories.list;
22+
import static org.eclipse.jkube.enricher.generic.DefaultServiceEnricher.getPortToExpose;
2023
import org.eclipse.jkube.kit.config.image.ImageConfiguration;
2124
import org.eclipse.jkube.kit.config.image.build.BuildConfiguration;
2225
import org.eclipse.jkube.kit.config.resource.GroupArtifactVersion;
2326
import org.eclipse.jkube.kit.config.resource.PlatformMode;
2427
import org.eclipse.jkube.kit.config.resource.ProcessorConfig;
2528
import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
2629
import org.eclipse.jkube.kit.enricher.api.model.Configuration;
27-
28-
import io.fabric8.kubernetes.api.model.HasMetadata;
29-
import io.fabric8.kubernetes.api.model.KubernetesList;
30-
import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
31-
import io.fabric8.kubernetes.api.model.ServiceBuilder;
30+
import static org.junit.jupiter.api.Assertions.assertAll;
3231
import org.junit.jupiter.api.BeforeEach;
3332
import org.junit.jupiter.api.DisplayName;
3433
import org.junit.jupiter.api.Nested;
3534
import org.junit.jupiter.api.Test;
36-
37-
import static org.assertj.core.api.Assertions.assertThat;
38-
import static org.eclipse.jkube.enricher.generic.DefaultServiceEnricher.getPortToExpose;
39-
import static org.junit.jupiter.api.Assertions.assertAll;
4035
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
4136
import static org.mockito.Mockito.mock;
4237
import static org.mockito.Mockito.when;
4338

39+
import io.fabric8.kubernetes.api.model.HasMetadata;
40+
import io.fabric8.kubernetes.api.model.KubernetesList;
41+
import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
42+
import io.fabric8.kubernetes.api.model.ServiceBuilder;
43+
import io.fabric8.kubernetes.api.model.ServicePort;
44+
4445
/**
4546
* @author roland
4647
*/
@@ -156,7 +157,7 @@ void headlessServicePositive() {
156157
assertThat(resource)
157158
.hasFieldOrPropertyWithValue("spec.clusterIP", "None")
158159
.extracting("spec.ports")
159-
.asList()
160+
.asInstanceOf(list(ServicePort.class))
160161
.isEmpty();
161162
}
162163

@@ -260,7 +261,7 @@ private HasMetadata enrich(){
260261

261262
private void assertPort(HasMetadata resource, int noOfPorts, int idx, int port, int targetPort, String name, String protocol) {
262263
assertThat(resource)
263-
.extracting("spec.ports").asList()
264+
.extracting("spec.ports").asInstanceOf(list(ServicePort.class))
264265
.hasSize(noOfPorts)
265266
.element(idx)
266267
.hasFieldOrPropertyWithValue("port", port)

0 commit comments

Comments
 (0)