|
17 | 17 | import java.util.Collections;
|
18 | 18 | import java.util.TreeMap;
|
19 | 19 |
|
| 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; |
20 | 23 | import org.eclipse.jkube.kit.config.image.ImageConfiguration;
|
21 | 24 | import org.eclipse.jkube.kit.config.image.build.BuildConfiguration;
|
22 | 25 | import org.eclipse.jkube.kit.config.resource.GroupArtifactVersion;
|
23 | 26 | import org.eclipse.jkube.kit.config.resource.PlatformMode;
|
24 | 27 | import org.eclipse.jkube.kit.config.resource.ProcessorConfig;
|
25 | 28 | import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;
|
26 | 29 | 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; |
32 | 31 | import org.junit.jupiter.api.BeforeEach;
|
33 | 32 | import org.junit.jupiter.api.DisplayName;
|
34 | 33 | import org.junit.jupiter.api.Nested;
|
35 | 34 | 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; |
40 | 35 | import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
|
41 | 36 | import static org.mockito.Mockito.mock;
|
42 | 37 | import static org.mockito.Mockito.when;
|
43 | 38 |
|
| 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 | + |
44 | 45 | /**
|
45 | 46 | * @author roland
|
46 | 47 | */
|
@@ -156,7 +157,7 @@ void headlessServicePositive() {
|
156 | 157 | assertThat(resource)
|
157 | 158 | .hasFieldOrPropertyWithValue("spec.clusterIP", "None")
|
158 | 159 | .extracting("spec.ports")
|
159 |
| - .asList() |
| 160 | + .asInstanceOf(list(ServicePort.class)) |
160 | 161 | .isEmpty();
|
161 | 162 | }
|
162 | 163 |
|
@@ -260,7 +261,7 @@ private HasMetadata enrich(){
|
260 | 261 |
|
261 | 262 | private void assertPort(HasMetadata resource, int noOfPorts, int idx, int port, int targetPort, String name, String protocol) {
|
262 | 263 | assertThat(resource)
|
263 |
| - .extracting("spec.ports").asList() |
| 264 | + .extracting("spec.ports").asInstanceOf(list(ServicePort.class)) |
264 | 265 | .hasSize(noOfPorts)
|
265 | 266 | .element(idx)
|
266 | 267 | .hasFieldOrPropertyWithValue("port", port)
|
|
0 commit comments