Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue 3520 replace aslist() project enricher test #3524

Merged
merged 4 commits into from
Nov 8, 2024
Merged

Issue 3520 replace aslist() project enricher test #3524

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d0f1eb3
removed deprected method asList()
ShivamChavan01 Nov 4, 2024
dbf481e
removed deprected aslist
ShivamChavan01 Nov 5, 2024
2c00f12
removed asList() deprected method in the ProjectEnricherTest
ShivamChavan01 Nov 6, 2024
8e20dce
improved imports
ShivamChavan01 Nov 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 11 additions & 8 deletions ...neric/src/test/java/org/eclipse/jkube/enricher/generic/openshift/ProjectEnricherTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,17 @@
*/
package org.eclipse.jkube.enricher.generic.openshift;

import org.eclipse.jkube.kit.config.resource.PlatformMode;
import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;

import io.fabric8.kubernetes.api.model.KubernetesList;
import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
import io.fabric8.kubernetes.api.model.NamespaceBuilder;
import io.fabric8.kubernetes.api.model.Service;
import io.fabric8.kubernetes.api.model.ServiceBuilder;
import io.fabric8.kubernetes.api.model.HasMetadata;

import org.assertj.core.api.InstanceOfAssertFactories;
import org.eclipse.jkube.kit.config.resource.PlatformMode;
import org.eclipse.jkube.kit.enricher.api.JKubeEnricherContext;

import io.fabric8.openshift.api.model.Project;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
Expand All @@ -47,7 +50,7 @@ void create_whenKubernetesListHasNamespace_thenNamespaceConvertedToProject() {
// Then
assertThat(klb.build())
.extracting(KubernetesList::getItems)
.asList()
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.singleElement()
.isInstanceOf(Project.class)
.hasFieldOrPropertyWithValue("metadata.name", "foo");
Expand All @@ -64,11 +67,11 @@ void create_whenKubernetesListHasNamespaceWithSpec_thenNamespaceConvertedToProje
// Then
assertThat(klb.build())
.extracting(KubernetesList::getItems)
.asList()
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.singleElement()
.isInstanceOf(Project.class)
.extracting("spec.finalizers")
.asList().first().isEqualTo("hoo");
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class)).first().isEqualTo("hoo");
}

@Test
Expand All @@ -82,7 +85,7 @@ void create_whenKubernetesListHasNamespaceWithStatus_thenNamespaceConvertedToPro
// Then
assertThat(klb.build())
.extracting(KubernetesList::getItems)
.asList()
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.singleElement()
.isInstanceOf(Project.class)
.hasFieldOrPropertyWithValue("status.phase", "Complete");
Expand All @@ -98,7 +101,7 @@ void create_whenKubernetesListDoesNotHasNamespace_thenDoesNotNamespaceConvertedT
// Then
assertThat(klb.build())
.extracting(KubernetesList::getItems)
.asList()
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.singleElement()
.isInstanceOf(Service.class)
.hasFieldOrPropertyWithValue("metadata.name", null);
Expand Down
19 changes: 14 additions & 5 deletions ...c/test/java/org/eclipse/jkube/enricher/generic/openshift/RouteEnricherBehavioralTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
*/
package org.eclipse.jkube.enricher.generic.openshift;

import io.fabric8.kubernetes.api.model.HasMetadata;
import io.fabric8.kubernetes.api.model.KubernetesList;
import io.fabric8.kubernetes.api.model.KubernetesListBuilder;
import io.fabric8.kubernetes.api.model.Service;
Expand Down Expand Up @@ -54,7 +55,9 @@ void create_withNoServices_shouldNotCreateRoute() {
// When
new RouteEnricher(context).create(PlatformMode.openshift, klb);
// Then
assertThat(klb.build()).extracting(KubernetesList::getItems).asList().isEmpty();
assertThat(klb.build()).extracting(KubernetesList::getItems)
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.isEmpty();
}

@Test
Expand All @@ -65,8 +68,10 @@ void create_withServiceNotExposed_shouldNotCreateRoute() {
// When
new RouteEnricher(context).create(PlatformMode.openshift, klb);
// Then
assertThat(klb.build()).extracting(KubernetesList::getItems).asList().singleElement()
.isInstanceOf(Service.class);
assertThat(klb.build()).extracting(KubernetesList::getItems)
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.singleElement()
.isInstanceOf(Service.class);
}

@Test
Expand All @@ -77,7 +82,9 @@ void create_withServiceWithNoWebPort_shouldNotCreateRoute() {
// When
new RouteEnricher(context).create(PlatformMode.openshift, klb);
// Then
assertThat(klb.build()).extracting(KubernetesList::getItems).asList().singleElement()
assertThat(klb.build()).extracting(KubernetesList::getItems)
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.singleElement()
.isInstanceOf(Service.class);
}

Expand Down Expand Up @@ -115,7 +122,9 @@ void inKubernetes_shouldNotCreateRoute() {
// When
new RouteEnricher(context).create(PlatformMode.kubernetes, klb);
// Then
assertThat(klb.build()).extracting(KubernetesList::getItems).asList().singleElement()
assertThat(klb.build()).extracting(KubernetesList::getItems)
.asInstanceOf(InstanceOfAssertFactories.list(HasMetadata.class))
.singleElement()
.isInstanceOf(Service.class);
}

Expand Down
Loading