From e77bf6cb33935a623e4cc898a1cd0a17580bc377 Mon Sep 17 00:00:00 2001 From: Marc Nuri Date: Tue, 22 Oct 2024 20:08:53 +0800 Subject: [PATCH] test:refactor: tests use KubernetesMockServer and EnableKubernetesMockClient Replaced usage of OpenShiftMockServer and EnableOpenShiftMockClient with vanilla Kubernetes alternatives. Signed-off-by: Marc Nuri --- .../test/agent/KlusterletAddonConfigTest.java | 2 +- .../test/apps/ApplicationTest.java | 2 +- .../openclustermanagement/test/apps/ChannelTest.java | 2 +- .../test/apps/GitOpsClusterTest.java | 2 +- .../test/apps/HelmReleaseTest.java | 2 +- .../test/apps/PlacementRuleTest.java | 2 +- .../test/apps/SubscriptionTest.java | 2 +- .../test/cluster/ManagedClusterSetBindingTest.java | 2 +- .../test/cluster/ManagedClusterSetTest.java | 2 +- .../test/cluster/ManagedClusterTest.java | 2 +- .../test/cluster/PlacementDecisionTest.java | 2 +- .../test/cluster/PlacementTest.java | 2 +- .../test/crud/ManagedClusterCrudTest.java | 2 +- .../test/discovery/DiscoveredClusterTest.java | 2 +- .../test/discovery/DiscoveryConfigTest.java | 2 +- .../observability/MultiClusterObservabilityTest.java | 2 +- .../test/observability/ObservabilityAddonTest.java | 2 +- .../test/operator/ClusterManagerTest.java | 2 +- .../test/operator/KlusterletTest.java | 2 +- .../test/operator/MultiClusterHubTest.java | 2 +- .../test/policy/PlacementBindingTest.java | 2 +- .../test/policy/PolicyAutomationTest.java | 2 +- .../test/policy/PolicyTest.java | 2 +- .../test/search/SearchCustomizationTest.java | 2 +- .../test/search/SearchOperationTest.java | 2 +- .../java/io/fabric8/ovn/client/mock/AdaptTest.java | 2 +- .../mock/AdminPolicyBasedExternalRouteTest.java | 2 +- .../fabric8/ovn/client/mock/EgressFirewallTest.java | 2 +- .../io/fabric8/ovn/client/mock/EgressIPTest.java | 2 +- .../io/fabric8/ovn/client/mock/EgressQoSTest.java | 2 +- .../fabric8/ovn/client/mock/EgressServiceTest.java | 2 +- .../client/server/mock/ExpectationsTest.java | 2 +- .../client/server/mock/KubernetesMockServerTest.java | 2 +- ...ockServerExtensionClientAndServerStaticTests.java | 6 ++++-- ...ShiftMockServerExtensionClientAndServerTests.java | 8 +++++--- .../OpenShiftMockServerExtensionStaticTests.java | 3 ++- .../mock/OpenShiftMockServerExtensionTests.java | 3 ++- .../kubernetes/client/mock/APIServiceTest.java | 2 +- .../kubernetes/client/mock/CSIDriverTest.java | 2 +- .../fabric8/kubernetes/client/mock/CSINodeTest.java | 2 +- .../client/mock/CSIStorageCapacityTest.java | 2 +- .../client/mock/ControllerRevisionTest.java | 2 +- .../kubernetes/client/mock/FlowSchemaTest.java | 2 +- .../kubernetes/client/mock/MixedCrudTest.java | 2 +- .../fabric8/kubernetes/client/mock/PodExecTest.java | 2 +- .../client/mock/PodSchedulingContextTest.java | 2 +- .../client/mock/PriorityLevelConfigurationTest.java | 2 +- .../client/mock/ResourceClaimTemplateTest.java | 2 +- .../kubernetes/client/mock/ResourceClaimTest.java | 2 +- .../kubernetes/client/mock/ResourceClassTest.java | 2 +- .../client/mock/SelfSubjectReviewTest.java | 2 +- .../client/mock/V1Beta1SelfSubjectReviewTest.java | 2 +- .../client/mock/V1CSIStorageCapacityTest.java | 2 +- .../kubernetes/client/mock/V1CronJobTest.java | 2 +- .../kubernetes/client/mock/V1EndpointSliceTest.java | 2 +- .../fabric8/kubernetes/client/mock/V1EventsTest.java | 2 +- .../kubernetes/client/mock/V1FlowSchemaTest.java | 2 +- .../client/mock/V1PodDisruptionBudgetTest.java | 2 +- .../mock/V1PriorityLevelConfigurationTest.java | 2 +- .../client/mock/V1SelfSubjectReviewTest.java | 2 +- .../mock/V1ValidatingAdmissionPolicyBindingTest.java | 2 +- .../client/mock/V1ValidatingAdmissionPolicyTest.java | 2 +- .../kubernetes/client/mock/V1beta1EventsTest.java | 2 +- .../V1beta1ValidatingAdmissionPolicyBindingTest.java | 2 +- .../mock/V1beta1ValidatingAdmissionPolicyTest.java | 2 +- .../client/mock/V1beta2FlowSchemaTest.java | 2 +- .../mock/V1beta2PriorityLevelConfigurationTest.java | 2 +- .../client/mock/V1beta3FlowSchemaTest.java | 2 +- .../mock/V1beta3PriorityLevelConfigurationTest.java | 2 +- .../mock/ValidatingAdmissionPolicyBindingTest.java | 2 +- .../client/mock/ValidatingAdmissionPolicyTest.java | 2 +- .../kubernetes/client/mock/VisitResourcesTest.java | 2 +- .../kubernetes/client/mock/VolumeAttachmentTest.java | 2 +- .../client/server/mock/APIRequestCountTest.java | 6 ++++-- .../client/server/mock/AlertmanagerConfigTest.java | 6 ++++-- .../client/server/mock/AuthenticationTest.java | 6 ++++-- .../client/server/mock/BareMetalHostTest.java | 6 ++++-- .../server/mock/BrokerTemplateInstanceTest.java | 6 ++++-- .../client/server/mock/BuildConfigCrudTest.java | 3 ++- .../client/server/mock/BuildConfigTest.java | 6 ++++-- .../client/server/mock/CatalogSourceTest.java | 6 ++++-- .../client/server/mock/CloudCredentialTest.java | 6 ++++-- .../client/server/mock/ClusterAutoscalerTest.java | 6 ++++-- .../client/server/mock/ClusterCSIDriverTest.java | 6 ++++-- .../client/server/mock/ClusterResourceQuotaTest.java | 6 ++++-- .../client/server/mock/ClusterRoleTest.java | 6 ++++-- .../server/mock/ClusterServiceVersionTest.java | 6 ++++-- .../openshift/client/server/mock/ConfigTest.java | 6 ++++-- .../client/server/mock/ConsoleLinkTest.java | 6 ++++-- .../client/server/mock/ConsolePluginTest.java | 6 ++++-- .../client/server/mock/ConsoleQuickStartTest.java | 6 ++++-- .../openshift/client/server/mock/ConsoleTest.java | 6 ++++-- .../server/mock/ContainerRuntimeConfigTest.java | 6 ++++-- .../client/server/mock/ControllerConfigTest.java | 6 ++++-- .../client/server/mock/CredentialsRequestTest.java | 6 ++++-- .../openshift/client/server/mock/DNSRecordTest.java | 6 ++++-- .../openshift/client/server/mock/DNSTest.java | 6 ++++-- .../client/server/mock/DeploymentConfigCrudTest.java | 6 ++++-- .../client/server/mock/DeploymentConfigTest.java | 6 ++++-- .../client/server/mock/EgressRouterTest.java | 6 ++++-- .../openshift/client/server/mock/EtcdTest.java | 6 ++++-- .../client/server/mock/FeatureGateTest.java | 6 ++++-- .../openshift/client/server/mock/GroupTest.java | 8 +++++--- .../client/server/mock/HelmChartRepositoryTest.java | 6 ++++-- .../openshift/client/server/mock/IPPoolTest.java | 6 ++++-- .../openshift/client/server/mock/IdentityTest.java | 6 ++++-- .../server/mock/ImageContentSourcePolicyTest.java | 6 ++++-- .../client/server/mock/ImageDigestMirrorSetTest.java | 2 +- .../client/server/mock/ImagePrunerTest.java | 6 ++++-- .../server/mock/ImageRegistryOperatorConfigTest.java | 6 ++++-- .../client/server/mock/ImageSignatureTest.java | 6 ++++-- .../client/server/mock/ImageStreamImageTest.java | 6 ++++-- .../client/server/mock/ImageStreamImportTest.java | 6 ++++-- .../client/server/mock/ImageStreamMappingTest.java | 6 ++++-- .../client/server/mock/ImageStreamTagCrudTest.java | 3 ++- .../client/server/mock/ImageTagMirrorSetTest.java | 2 +- .../openshift/client/server/mock/ImageTagTest.java | 6 ++++-- .../openshift/client/server/mock/IngressTest.java | 6 ++++-- .../client/server/mock/KubeletConfigTest.java | 6 ++++-- .../client/server/mock/KubernetesOperationTest.java | 6 ++++-- .../client/server/mock/MachineAutoscalerTest.java | 6 ++++-- .../client/server/mock/MachineConfigPoolTest.java | 6 ++++-- .../client/server/mock/MachineConfigTest.java | 6 ++++-- .../client/server/mock/MachineHealthCheckTest.java | 6 ++++-- .../openshift/client/server/mock/MachineSetTest.java | 6 ++++-- .../openshift/client/server/mock/MachineTest.java | 6 ++++-- .../server/mock/NetworkAttachmentDefinitionTest.java | 6 ++++-- .../openshift/client/server/mock/NetworkTest.java | 6 ++++-- .../server/mock/OAuthClientAuthorizationTest.java | 6 ++++-- .../client/server/mock/OAuthClientTest.java | 6 ++++-- .../openshift/client/server/mock/OLMConfigTest.java | 2 +- .../client/server/mock/OpenShiftVersionInfoTest.java | 6 ++++-- .../client/server/mock/OpenshiftRoleBindingTest.java | 6 ++++-- .../client/server/mock/OpenshiftRoleTest.java | 6 ++++-- .../client/server/mock/OperatorConditionTest.java | 6 ++++-- .../client/server/mock/OperatorPKITest.java | 6 ++++-- .../openshift/client/server/mock/OperatorTest.java | 6 ++++-- .../mock/OverlappingRangeIPReservationTest.java | 6 ++++-- .../client/server/mock/PackageManifestTest.java | 6 ++++-- .../server/mock/PodNetworkConnectivityCheckTest.java | 6 ++++-- .../server/mock/PodSecurityPolicyReviewTest.java | 6 ++++-- .../mock/PodSecurityPolicySelfSubjectReviewTest.java | 6 ++++-- .../mock/PodSecurityPolicySubjectReviewTest.java | 6 ++++-- .../openshift/client/server/mock/ProbeTest.java | 6 ++++-- .../openshift/client/server/mock/ProfileTest.java | 6 ++++-- .../openshift/client/server/mock/ProjectTest.java | 6 ++++-- .../client/server/mock/PrometheusRuleTest.java | 6 ++++-- .../openshift/client/server/mock/PrometheusTest.java | 6 ++++-- .../client/server/mock/RangeAllocationTest.java | 6 ++++-- .../server/mock/RoleBindingRestrictionTest.java | 6 ++++-- .../openshift/client/server/mock/RouteCrudTest.java | 6 ++++-- .../mock/SecurityContextConstraintsCrudTest.java | 3 ++- .../server/mock/SecurityContextConstraintsTest.java | 6 ++++-- .../client/server/mock/ServiceMonitorTest.java | 6 ++++-- .../client/server/mock/StorageStateTest.java | 6 ++++-- .../openshift/client/server/mock/StorageTest.java | 6 ++++-- .../server/mock/StorageVersionMigrationTest.java | 6 ++++-- .../client/server/mock/SubjectAccessReviewTest.java | 8 +++++--- .../client/server/mock/SubscriptionTest.java | 6 ++++-- .../client/server/mock/TemplateInstanceTest.java | 6 ++++-- .../openshift/client/server/mock/TemplateTest.java | 6 ++++-- .../client/server/mock/ThanosRulerTest.java | 6 ++++-- .../openshift/client/server/mock/TunedTest.java | 6 ++++-- .../client/server/mock/UserIdentityMappingTest.java | 6 ++++-- .../client/server/mock/UserOAuthAccessTokenTest.java | 6 ++++-- .../openshift/client/server/mock/UserTest.java | 12 ++++-------- .../client/server/mock/hive/ClusterClaimTest.java | 8 ++++---- .../server/mock/hive/ClusterDeploymentTest.java | 8 ++++---- .../server/mock/hive/ClusterDeprovisionTest.java | 8 ++++---- .../client/server/mock/hive/ClusterImageSetTest.java | 8 ++++---- .../client/server/mock/hive/ClusterPoolTest.java | 8 ++++---- .../client/server/mock/hive/ClusterRelocateTest.java | 8 ++++---- .../client/server/mock/hive/DNSZoneTest.java | 8 ++++---- .../client/server/mock/hive/HiveConfigTest.java | 8 ++++---- .../client/server/mock/hive/MachinePoolTest.java | 8 ++++---- .../mock/hive/SelectorSyncIdentityProviderTest.java | 8 ++++---- .../client/server/mock/hive/SelectorSyncSetTest.java | 8 ++++---- .../server/mock/hive/SyncIdentityProviderTest.java | 8 ++++---- .../client/server/mock/hive/SyncSetTest.java | 8 ++++---- 179 files changed, 493 insertions(+), 316 deletions(-) diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/agent/KlusterletAddonConfigTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/agent/KlusterletAddonConfigTest.java index e4ec868abfe..028fc523fbf 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/agent/KlusterletAddonConfigTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/agent/KlusterletAddonConfigTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class KlusterletAddonConfigTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ApplicationTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ApplicationTest.java index 61555490f1b..81faf2c25c8 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ApplicationTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ApplicationTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ApplicationTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ChannelTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ChannelTest.java index deaf47b6057..fcef5424650 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ChannelTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/ChannelTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ChannelTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/GitOpsClusterTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/GitOpsClusterTest.java index 1bfc3d90e14..64e9f48da26 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/GitOpsClusterTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/GitOpsClusterTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class GitOpsClusterTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/HelmReleaseTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/HelmReleaseTest.java index 1ce0e6384da..83d1bf47582 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/HelmReleaseTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/HelmReleaseTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class HelmReleaseTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/PlacementRuleTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/PlacementRuleTest.java index 810b3f1fdb1..3758a11af2b 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/PlacementRuleTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/PlacementRuleTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class PlacementRuleTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/SubscriptionTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/SubscriptionTest.java index 314e5468e64..923ddb11ebb 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/SubscriptionTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/apps/SubscriptionTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class SubscriptionTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetBindingTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetBindingTest.java index e785c5e3d42..eef6d09ddd7 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetBindingTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetBindingTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ManagedClusterSetBindingTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetTest.java index 026234dc474..5247c1eae49 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterSetTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ManagedClusterSetTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterTest.java index 275c448ecec..cc7a057fcb6 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/ManagedClusterTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ManagedClusterTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementDecisionTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementDecisionTest.java index 0385de1ce60..d9f3c72f1a1 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementDecisionTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementDecisionTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class PlacementDecisionTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementTest.java index f124dd92800..b9a20139b63 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/cluster/PlacementTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class PlacementTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/crud/ManagedClusterCrudTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/crud/ManagedClusterCrudTest.java index 4f34b358f17..ef80fc0a248 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/crud/ManagedClusterCrudTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/crud/ManagedClusterCrudTest.java @@ -28,7 +28,7 @@ @EnableKubernetesMockClient(crud = true) class ManagedClusterCrudTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveredClusterTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveredClusterTest.java index 94cca319583..0c9f039c4a4 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveredClusterTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveredClusterTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class DiscoveredClusterTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveryConfigTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveryConfigTest.java index 54aa7206df0..f8dced37804 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveryConfigTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/discovery/DiscoveryConfigTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class DiscoveryConfigTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/MultiClusterObservabilityTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/MultiClusterObservabilityTest.java index 3c05c8265d9..609682a9a5a 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/MultiClusterObservabilityTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/MultiClusterObservabilityTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class MultiClusterObservabilityTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/ObservabilityAddonTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/ObservabilityAddonTest.java index 8dc8a6d1244..0740dfc1cc8 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/ObservabilityAddonTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/observability/ObservabilityAddonTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ObservabilityAddonTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/ClusterManagerTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/ClusterManagerTest.java index c2f2fa0b8ac..362bc7f8b37 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/ClusterManagerTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/ClusterManagerTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ClusterManagerTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/KlusterletTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/KlusterletTest.java index c85d324fccf..c8eef4472b7 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/KlusterletTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/KlusterletTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class KlusterletTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/MultiClusterHubTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/MultiClusterHubTest.java index 520c45ce6b2..33a07232051 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/MultiClusterHubTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/operator/MultiClusterHubTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class MultiClusterHubTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PlacementBindingTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PlacementBindingTest.java index ddc170c62ff..13b057223da 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PlacementBindingTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PlacementBindingTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class PlacementBindingTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyAutomationTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyAutomationTest.java index 313f851a60a..d5fd5b99250 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyAutomationTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyAutomationTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class PolicyAutomationTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyTest.java index 059e5f27a7d..446bee9053f 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/policy/PolicyTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class PolicyTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchCustomizationTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchCustomizationTest.java index fcfd0ace93e..15430e75850 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchCustomizationTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchCustomizationTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class SearchCustomizationTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchOperationTest.java b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchOperationTest.java index c239f49786b..7fbc1433cd8 100644 --- a/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchOperationTest.java +++ b/extensions/open-cluster-management/tests/src/test/java/io/fabric8/openclustermanagement/test/search/SearchOperationTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class SearchOperatorTest { private OpenClusterManagementClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdaptTest.java b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdaptTest.java index 482e2643837..69dbb864959 100644 --- a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdaptTest.java +++ b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdaptTest.java @@ -29,7 +29,7 @@ @EnableKubernetesMockClient class AdaptTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @ParameterizedTest(name = "when server does not support {0}, then adapt = {1}") @CsvSource(value = { diff --git a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdminPolicyBasedExternalRouteTest.java b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdminPolicyBasedExternalRouteTest.java index 4f625ad9d25..0b2b9c610be 100644 --- a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdminPolicyBasedExternalRouteTest.java +++ b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/AdminPolicyBasedExternalRouteTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class AdminPolicyBasedExternalRouteTest { private OpenVirtualNetworkingClient ovnClient; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressFirewallTest.java b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressFirewallTest.java index 46313e8fa2c..6a3449c7a49 100644 --- a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressFirewallTest.java +++ b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressFirewallTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class EgressFirewallTest { private OpenVirtualNetworkingClient ovnClient; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressIPTest.java b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressIPTest.java index 2528a99aaa5..dccc6604ad5 100644 --- a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressIPTest.java +++ b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressIPTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class EgressIPTest { private OpenVirtualNetworkingClient ovnClient; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressQoSTest.java b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressQoSTest.java index e4216f07734..8fe3b0d3b81 100644 --- a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressQoSTest.java +++ b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressQoSTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class EgressQoSTest { private OpenVirtualNetworkingClient ovnClient; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressServiceTest.java b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressServiceTest.java index 47b765166c2..785ede3c42f 100644 --- a/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressServiceTest.java +++ b/extensions/open-virtual-networking/tests/src/test/java/io/fabric8/ovn/client/mock/EgressServiceTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class EgressServiceTest { private OpenVirtualNetworkingClient ovnClient; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/ExpectationsTest.java b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/ExpectationsTest.java index ce04a86240f..774b4ab453f 100644 --- a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/ExpectationsTest.java +++ b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/ExpectationsTest.java @@ -31,7 +31,7 @@ @DisplayName("Kubernetes Mock Server Expectations") class ExpectationsTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; private HttpClient httpClient; private HttpRequest.Builder request; diff --git a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerTest.java b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerTest.java index 1bd9a45f7b1..57420d75bf5 100644 --- a/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerTest.java +++ b/junit/kubernetes-server-mock/src/test/java/io/fabric8/kubernetes/client/server/mock/KubernetesMockServerTest.java @@ -26,7 +26,7 @@ class KubernetesMockServerTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @BeforeEach diff --git a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerStaticTests.java b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerStaticTests.java index bf88006e3ce..b7b6953887f 100644 --- a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerStaticTests.java +++ b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerStaticTests.java @@ -15,14 +15,16 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OpenShiftMockServerExtensionClientAndServerStaticTests { - private static OpenShiftMockServer openShiftMockServer; + private static KubernetesMockServer openShiftMockServer; private static OpenShiftClient openShiftClient; @Test diff --git a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerTests.java b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerTests.java index 2e622c4dadc..71e24ab1556 100644 --- a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerTests.java +++ b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionClientAndServerTests.java @@ -15,15 +15,17 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertNotNull; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OpenShiftMockServerExtensionClientAndServerTests { - private OpenShiftMockServer openShiftMockServer; - private OpenShiftClient openShiftClient; + KubernetesMockServer openShiftMockServer; + OpenShiftClient openShiftClient; @Test void testMockServerAndClientAreInitialized() { diff --git a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java index 09cd7d1e689..974251cbecc 100644 --- a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java +++ b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionStaticTests.java @@ -16,12 +16,13 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.client.Client; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient(crud = true) +@EnableKubernetesMockClient(crud = true) class OpenShiftMockServerExtensionStaticTests { static OpenShiftClient openShiftClient; diff --git a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java index f4fa10f038d..fc2e9657f67 100644 --- a/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java +++ b/junit/openshift-server-mock/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftMockServerExtensionTests.java @@ -16,12 +16,13 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.client.Client; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient(crud = true) +@EnableKubernetesMockClient(crud = true) class OpenShiftMockServerExtensionTests { OpenShiftClient client; diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/APIServiceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/APIServiceTest.java index 9e6f8a9c1d1..b54bc6a05cd 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/APIServiceTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/APIServiceTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class APIServiceTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIDriverTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIDriverTest.java index bfa2775b7d9..59f96d652d6 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIDriverTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIDriverTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class CSIDriverTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSINodeTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSINodeTest.java index 78040f2bb6b..95cc391c18b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSINodeTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSINodeTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class CSINodeTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIStorageCapacityTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIStorageCapacityTest.java index 521c8c7b5c1..d3cab0dabca 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIStorageCapacityTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/CSIStorageCapacityTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class CSIStorageCapacityTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ControllerRevisionTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ControllerRevisionTest.java index b50986d651c..220991464bf 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ControllerRevisionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ControllerRevisionTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class ControllerRevisionTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/FlowSchemaTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/FlowSchemaTest.java index 46155ea026e..33c4002c137 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/FlowSchemaTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/FlowSchemaTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class FlowSchemaTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/MixedCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/MixedCrudTest.java index 815c569f90b..5c01f4ac81f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/MixedCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/MixedCrudTest.java @@ -41,7 +41,7 @@ class MixedCrudTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @BeforeEach diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java index 1a982364bf4..89d8afa1a7e 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodExecTest.java @@ -46,7 +46,7 @@ class PodExecTest { private static PodStatus READY = new PodStatusBuilder().addNewCondition().withType("Ready").withStatus("True").endCondition() .build(); - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @BeforeEach diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingContextTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingContextTest.java index 0288fe9a0a7..fd27633f1e6 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingContextTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PodSchedulingContextTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class PodSchedulingContextTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PriorityLevelConfigurationTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PriorityLevelConfigurationTest.java index 06171d91a1c..cf2a5c88da1 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PriorityLevelConfigurationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/PriorityLevelConfigurationTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class PriorityLevelConfigurationTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java index 8de8d0a31fd..b1ad77d858b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTemplateTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ResourceClaimTemplateTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java index bcfc9cba0cf..845b4ee3280 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClaimTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ResourceClaimTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java index d2016531122..74ce26e3001 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ResourceClassTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class ResourceClassTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SelfSubjectReviewTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SelfSubjectReviewTest.java index 3680c1e1059..74d73c8dea7 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SelfSubjectReviewTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/SelfSubjectReviewTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class SelfSubjectReviewTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void create_whenInvoked_shouldReturnObjectWithUpdatedStatus() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1Beta1SelfSubjectReviewTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1Beta1SelfSubjectReviewTest.java index 6b59a54d1d0..b00d2c4c5e2 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1Beta1SelfSubjectReviewTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1Beta1SelfSubjectReviewTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class V1Beta1SelfSubjectReviewTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void create_whenInvoked_shouldReturnObjectWithUpdatedStatus() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CSIStorageCapacityTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CSIStorageCapacityTest.java index abdf3e73d61..ff9192e136a 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CSIStorageCapacityTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CSIStorageCapacityTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class V1CSIStorageCapacityTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CronJobTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CronJobTest.java index 97b38eecb4a..7949ac56302 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CronJobTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1CronJobTest.java @@ -40,7 +40,7 @@ @EnableKubernetesMockClient class V1CronJobTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EndpointSliceTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EndpointSliceTest.java index 6ea0fcff8d2..12b5dbc66e5 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EndpointSliceTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EndpointSliceTest.java @@ -30,7 +30,7 @@ @EnableKubernetesMockClient class V1EndpointSliceTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EventsTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EventsTest.java index 3feb7025750..371978ebedf 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EventsTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1EventsTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class V1EventsTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void testList() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1FlowSchemaTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1FlowSchemaTest.java index 729a08226b9..1b69f3df827 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1FlowSchemaTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1FlowSchemaTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class V1FlowSchemaTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PodDisruptionBudgetTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PodDisruptionBudgetTest.java index 63279f698b9..c987c7d4453 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PodDisruptionBudgetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PodDisruptionBudgetTest.java @@ -40,7 +40,7 @@ @EnableKubernetesMockClient class V1PodDisruptionBudgetTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PriorityLevelConfigurationTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PriorityLevelConfigurationTest.java index 129b4162da9..402b2d79b09 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PriorityLevelConfigurationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1PriorityLevelConfigurationTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class V1PriorityLevelConfigurationTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1SelfSubjectReviewTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1SelfSubjectReviewTest.java index d2a946afe3c..20d4709d597 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1SelfSubjectReviewTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1SelfSubjectReviewTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class V1SelfSubjectReviewTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void create_whenInvoked_shouldReturnObjectWithUpdatedStatus() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyBindingTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyBindingTest.java index af4ed63ab89..febbf0d560e 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyBindingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyBindingTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class V1ValidatingAdmissionPolicyBindingTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyTest.java index 32cc543a66e..964bb754df7 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1ValidatingAdmissionPolicyTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class V1ValidatingAdmissionPolicyTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1EventsTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1EventsTest.java index 552efe2a67b..7c736b1e503 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1EventsTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1EventsTest.java @@ -32,7 +32,7 @@ @EnableKubernetesMockClient class V1beta1EventsTest { private KubernetesClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void testList() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyBindingTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyBindingTest.java index 5976782229c..10d924d9f77 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyBindingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyBindingTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class V1beta1ValidatingAdmissionPolicyBindingTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyTest.java index a69a06f6179..2a82b7b7782 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta1ValidatingAdmissionPolicyTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class V1beta1ValidatingAdmissionPolicyTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java index 1f4867852e6..99c6f1e9e4b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2FlowSchemaTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class V1beta2FlowSchemaTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java index 58087ef1778..667eb93f200 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta2PriorityLevelConfigurationTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class V1beta2PriorityLevelConfigurationTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3FlowSchemaTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3FlowSchemaTest.java index beeda715c7d..22c21524e7b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3FlowSchemaTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3FlowSchemaTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class V1beta3FlowSchemaTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3PriorityLevelConfigurationTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3PriorityLevelConfigurationTest.java index 2abdd350e60..48bf095ec3f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3PriorityLevelConfigurationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/V1beta3PriorityLevelConfigurationTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class V1beta3PriorityLevelConfigurationTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyBindingTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyBindingTest.java index 322eff2c1cb..302ffdcbe5d 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyBindingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyBindingTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class ValidatingAdmissionPolicyBindingTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyTest.java index f6e337c70f1..73329a38c9b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/ValidatingAdmissionPolicyTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class ValidatingAdmissionPolicyTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VisitResourcesTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VisitResourcesTest.java index fc6cc8a8a65..7df1c6d9bd9 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VisitResourcesTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VisitResourcesTest.java @@ -34,7 +34,7 @@ @EnableKubernetesMockClient class VisitResourcesTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VolumeAttachmentTest.java b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VolumeAttachmentTest.java index 202c8465d60..b742520ccea 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VolumeAttachmentTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/kubernetes/client/mock/VolumeAttachmentTest.java @@ -33,7 +33,7 @@ @EnableKubernetesMockClient class VolumeAttachmentTest { - private KubernetesMockServer server; + KubernetesMockServer server; private KubernetesClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java index 35fbf9b2ed2..7f89947d557 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/APIRequestCountTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCount; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountBuilder; import io.fabric8.openshift.api.model.miscellaneous.apiserver.v1.APIRequestCountList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class APIRequestCountTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AlertmanagerConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AlertmanagerConfigTest.java index 2a3c3816a01..535d905f5a7 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AlertmanagerConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AlertmanagerConfigTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.monitoring.v1alpha1.AlertmanagerConfig; import io.fabric8.openshift.api.model.monitoring.v1alpha1.AlertmanagerConfigBuilder; import io.fabric8.openshift.api.model.monitoring.v1alpha1.AlertmanagerConfigList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class AlertmanagerConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AuthenticationTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AuthenticationTest.java index e9c6583865c..64901e09b6b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AuthenticationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/AuthenticationTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.Authentication; import io.fabric8.openshift.api.model.config.v1.AuthenticationBuilder; import io.fabric8.openshift.api.model.config.v1.AuthenticationList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class AuthenticationTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java index 1ceb908e085..7e6d49af560 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BareMetalHostTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHost; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostBuilder; import io.fabric8.openshift.api.model.miscellaneous.metal3.v1alpha1.BareMetalHostList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class BareMetalHostTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BrokerTemplateInstanceTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BrokerTemplateInstanceTest.java index 0726e9b5557..aa8856cdda2 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BrokerTemplateInstanceTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BrokerTemplateInstanceTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.BrokerTemplateInstance; import io.fabric8.openshift.api.model.BrokerTemplateInstanceBuilder; import io.fabric8.openshift.api.model.BrokerTemplateInstanceList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class BrokerTemplateInstanceTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigCrudTest.java index ef23460614a..150dafae118 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigCrudTest.java @@ -15,6 +15,7 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.openshift.api.model.BuildConfig; import io.fabric8.openshift.api.model.BuildConfigBuilder; import io.fabric8.openshift.api.model.BuildConfigList; @@ -25,7 +26,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -@EnableOpenShiftMockClient(crud = true) +@EnableKubernetesMockClient(crud = true) class BuildConfigCrudTest { OpenShiftClient client; diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigTest.java index c3ce139f803..d25aa5f76c6 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/BuildConfigTest.java @@ -17,6 +17,8 @@ import io.fabric8.kubernetes.api.model.APIGroupListBuilder; import io.fabric8.kubernetes.client.KubernetesClientException; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.Build; import io.fabric8.openshift.api.model.BuildBuilder; import io.fabric8.openshift.api.model.BuildConfig; @@ -42,10 +44,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.fail; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class BuildConfigTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CatalogSourceTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CatalogSourceTest.java index 93ca28fcd4c..c9094578ff4 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CatalogSourceTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CatalogSourceTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CatalogSource; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CatalogSourceBuilder; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.CatalogSourceList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class CatalogSourceTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CloudCredentialTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CloudCredentialTest.java index 13e1f448f0b..a23a116ebbf 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CloudCredentialTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CloudCredentialTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.v1.CloudCredential; import io.fabric8.openshift.api.model.operator.v1.CloudCredentialBuilder; import io.fabric8.openshift.api.model.operator.v1.CloudCredentialList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class CloudCredentialTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterAutoscalerTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterAutoscalerTest.java index 671f2686835..a635d78f71f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterAutoscalerTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterAutoscalerTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.autoscaling.v1.ClusterAutoscaler; import io.fabric8.openshift.api.model.autoscaling.v1.ClusterAutoscalerBuilder; import io.fabric8.openshift.api.model.autoscaling.v1.ClusterAutoscalerList; @@ -26,9 +28,9 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterAutoscalerTest { - private OpenShiftMockServer server; + KubernetesMockServer server; private OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterCSIDriverTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterCSIDriverTest.java index 16d5b93270b..4591b085bff 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterCSIDriverTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterCSIDriverTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.v1.ClusterCSIDriver; import io.fabric8.openshift.api.model.operator.v1.ClusterCSIDriverBuilder; import io.fabric8.openshift.api.model.operator.v1.ClusterCSIDriverList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterCSIDriverTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterResourceQuotaTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterResourceQuotaTest.java index 3e452f8909d..d2e9730a8c5 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterResourceQuotaTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterResourceQuotaTest.java @@ -17,6 +17,8 @@ import io.fabric8.kubernetes.api.model.Quantity; import io.fabric8.kubernetes.api.model.ResourceQuotaSpecBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.ClusterResourceQuota; import io.fabric8.openshift.api.model.ClusterResourceQuotaBuilder; import io.fabric8.openshift.api.model.ClusterResourceQuotaList; @@ -32,10 +34,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterResourceQuotaTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterRoleTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterRoleTest.java index fd95602038e..58e58e6c0d7 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterRoleTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterRoleTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.ClusterRole; import io.fabric8.openshift.api.model.ClusterRoleBuilder; import io.fabric8.openshift.api.model.ClusterRoleList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterRoleTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterServiceVersionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterServiceVersionTest.java index abe48b84494..c55cea10677 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterServiceVersionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ClusterServiceVersionTest.java @@ -15,16 +15,18 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.ClusterServiceVersion; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterServiceVersionTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void testLoad() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConfigTest.java index 8a1d0e22fef..eb8eac697cd 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConfigTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.v1.Config; import io.fabric8.openshift.api.model.operator.v1.ConfigBuilder; import io.fabric8.openshift.api.model.operator.v1.ConfigList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleLinkTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleLinkTest.java index 6ecea749ac3..9f6ddfb04fe 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleLinkTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleLinkTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.console.v1.ConsoleLink; import io.fabric8.openshift.api.model.console.v1.ConsoleLinkBuilder; import io.fabric8.openshift.api.model.console.v1.ConsoleLinkList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ConsoleLinkTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java index 82f14cdd19e..3668ad98219 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsolePluginTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.console.v1.ConsolePlugin; import io.fabric8.openshift.api.model.console.v1.ConsolePluginBuilder; import io.fabric8.openshift.api.model.console.v1.ConsolePluginList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ConsolePluginTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java index 3e01345f394..6857bf4aadf 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleQuickStartTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStart; import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartBuilder; import io.fabric8.openshift.api.model.console.v1.ConsoleQuickStartList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ConsoleQuickStartTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleTest.java index 0774ad7cac4..aeb267604f4 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ConsoleTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.Console; import io.fabric8.openshift.api.model.config.v1.ConsoleBuilder; import io.fabric8.openshift.api.model.config.v1.ConsoleList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ConsoleTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java index aa9a9374ec2..1140abd184b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ContainerRuntimeConfigTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfig; import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfigBuilder; import io.fabric8.openshift.api.model.machineconfiguration.v1.ContainerRuntimeConfigList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ContainerRuntimeConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java index 541b2b57d4a..207ff7f03e5 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ControllerConfigTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.InfrastructureBuilder; import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfig; import io.fabric8.openshift.api.model.machineconfiguration.v1.ControllerConfigBuilder; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ControllerConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java index c2e881768e5..2bfe1f5ed79 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/CredentialsRequestTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.GenericKubernetesResourceBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequest; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestBuilder; import io.fabric8.openshift.api.model.miscellaneous.cloudcredential.v1.CredentialsRequestList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class CredentialsRequestTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSRecordTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSRecordTest.java index bbe84fb6e00..a45b56ab0f9 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSRecordTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSRecordTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.ingress.v1.DNSRecord; import io.fabric8.openshift.api.model.operator.ingress.v1.DNSRecordBuilder; import io.fabric8.openshift.api.model.operator.ingress.v1.DNSRecordList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class DNSRecordTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSTest.java index 2f433f48837..787353eaf9c 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DNSTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.DNS; import io.fabric8.openshift.api.model.config.v1.DNSBuilder; import io.fabric8.openshift.api.model.config.v1.DNSList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class DNSTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java index 78dc2ee3199..1d5808cd985 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigCrudTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.DeploymentConfig; import io.fabric8.openshift.api.model.DeploymentConfigBuilder; import io.fabric8.openshift.api.model.DeploymentConfigList; @@ -27,10 +29,10 @@ import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertNotNull; -@EnableOpenShiftMockClient(crud = true) +@EnableKubernetesMockClient(crud = true) class DeploymentConfigCrudTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigTest.java index d8cba1507f2..7832cd0ec5f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/DeploymentConfigTest.java @@ -23,6 +23,8 @@ import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.PodListBuilder; import io.fabric8.kubernetes.client.dsl.LogWatch; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.kubernetes.client.utils.InputStreamPumper; import io.fabric8.kubernetes.client.utils.Utils; import io.fabric8.openshift.api.model.DeploymentConfig; @@ -49,10 +51,10 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class DeploymentConfigTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java index 4996c23d9fa..9583d68266d 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EgressRouterTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.network.v1.EgressRouter; import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterBuilder; import io.fabric8.openshift.api.model.operator.network.v1.EgressRouterList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class EgressRouterTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EtcdTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EtcdTest.java index c8d047ba3d2..49cade7d186 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EtcdTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/EtcdTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.v1.Etcd; import io.fabric8.openshift.api.model.operator.v1.EtcdBuilder; import io.fabric8.openshift.api.model.operator.v1.EtcdList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class EtcdTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/FeatureGateTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/FeatureGateTest.java index 6f878323145..5c6066a0318 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/FeatureGateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/FeatureGateTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.FeatureGate; import io.fabric8.openshift.api.model.config.v1.FeatureGateBuilder; import io.fabric8.openshift.api.model.config.v1.FeatureGateList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class FeatureGateTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/GroupTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/GroupTest.java index 523abaa944e..c0a53f013de 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/GroupTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/GroupTest.java @@ -17,6 +17,8 @@ import io.fabric8.kubernetes.api.model.APIGroupListBuilder; import io.fabric8.kubernetes.api.model.DeletionPropagation; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.Group; import io.fabric8.openshift.api.model.GroupBuilder; import io.fabric8.openshift.api.model.GroupList; @@ -31,15 +33,15 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class GroupTest { - OpenShiftMockServer server; + KubernetesMockServer server; NamespacedOpenShiftClient client; @BeforeEach void setUp() { - client = server.createOpenShiftClient(); + client = server.createClient().adapt(NamespacedOpenShiftClient.class); } @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java index 62c8bbdda99..47f26ca8839 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/HelmChartRepositoryTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepository; import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryBuilder; import io.fabric8.openshift.api.model.miscellaneous.helm.v1beta1.HelmChartRepositoryList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class HelmChartRepositoryTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IPPoolTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IPPoolTest.java index 951980a6565..c96f77f8cff 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IPPoolTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IPPoolTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPPool; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPPoolBuilder; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.IPPoolList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class IPPoolTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IdentityTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IdentityTest.java index 03287c73954..6e3ff04a1cb 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IdentityTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IdentityTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.Identity; import io.fabric8.openshift.api.model.IdentityBuilder; import io.fabric8.openshift.api.model.IdentityList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class IdentityTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageContentSourcePolicyTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageContentSourcePolicyTest.java index b1a7b29ba2e..1ecd56a01cf 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageContentSourcePolicyTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageContentSourcePolicyTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicy; import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyBuilder; import io.fabric8.openshift.api.model.operator.v1alpha1.ImageContentSourcePolicyList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImageContentSourcePolicyTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageDigestMirrorSetTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageDigestMirrorSetTest.java index 5a893148f3b..28b94b9cbdf 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageDigestMirrorSetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageDigestMirrorSetTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ImageDigestMirrorSetTest { private OpenShiftClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImagePrunerTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImagePrunerTest.java index b1cda6134ae..3ed2643367b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImagePrunerTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImagePrunerTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.imageregistry.v1.ImagePruner; import io.fabric8.openshift.api.model.operator.imageregistry.v1.ImagePrunerBuilder; import io.fabric8.openshift.api.model.operator.imageregistry.v1.ImagePrunerList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImagePrunerTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java index 3b8f6ef0fe0..3094adf2975 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageRegistryOperatorConfigTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.imageregistry.v1.Config; import io.fabric8.openshift.api.model.operator.imageregistry.v1.ConfigBuilder; import io.fabric8.openshift.api.model.operator.imageregistry.v1.ConfigList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImageRegistryOperatorConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() throws ParseException { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageSignatureTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageSignatureTest.java index fb27ed050cf..64a53d21299 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageSignatureTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageSignatureTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.StatusBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.ImageSignature; import io.fabric8.openshift.api.model.ImageSignatureBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -25,10 +27,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImageSignatureTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void create() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImageTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImageTest.java index f1731b44227..304f648a9ac 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImageTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImageTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.ImageStreamImage; import io.fabric8.openshift.api.model.ImageStreamImageBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -24,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImageStreamImageTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImportTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImportTest.java index d1be9596213..36703f19b68 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImportTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamImportTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.ImageStreamImport; import io.fabric8.openshift.api.model.ImageStreamImportBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -24,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImageStreamImportTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void create() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamMappingTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamMappingTest.java index 20515c4c3b0..5bbd3a3f691 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamMappingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamMappingTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.ImageStreamMapping; import io.fabric8.openshift.api.model.ImageStreamMappingBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -24,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImageStreamMappingTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void create() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamTagCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamTagCrudTest.java index 6e39447d158..9ddcc38dd25 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamTagCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageStreamTagCrudTest.java @@ -15,6 +15,7 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.openshift.api.model.ImageStreamTag; import io.fabric8.openshift.api.model.ImageStreamTagBuilder; import io.fabric8.openshift.api.model.ImageStreamTagList; @@ -27,7 +28,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient(crud = true) +@EnableKubernetesMockClient(crud = true) class ImageStreamTagCrudTest { private static final Logger logger = LoggerFactory.getLogger(ImageStreamTagCrudTest.class); diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagMirrorSetTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagMirrorSetTest.java index e627ede2384..5cd2dcbf075 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagMirrorSetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagMirrorSetTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class ImageTagMirrorSetTest { private OpenShiftClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagTest.java index 987d8719830..1d590a3086a 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ImageTagTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.ImageTag; import io.fabric8.openshift.api.model.ImageTagBuilder; import io.fabric8.openshift.api.model.ImageTagList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ImageTagTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressTest.java index ada67a79466..835074c68d1 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/IngressTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.Ingress; import io.fabric8.openshift.api.model.config.v1.IngressBuilder; import io.fabric8.openshift.api.model.config.v1.IngressList; @@ -28,10 +30,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class IngressTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void load() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java index 0d5448ff10c..e27930dfd32 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubeletConfigTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfig; import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfigBuilder; import io.fabric8.openshift.api.model.machineconfiguration.v1.KubeletConfigList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class KubeletConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubernetesOperationTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubernetesOperationTest.java index 39eeee3ccf9..38f0b8f5b4f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubernetesOperationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/KubernetesOperationTest.java @@ -18,16 +18,18 @@ import io.fabric8.kubernetes.api.model.APIGroupListBuilder; import io.fabric8.kubernetes.api.model.PodBuilder; import io.fabric8.kubernetes.api.model.ReplicationControllerBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.BuildConfigBuilder; import io.fabric8.openshift.client.OpenShiftClient; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class KubernetesOperationTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineAutoscalerTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineAutoscalerTest.java index da6c4764a1b..41caafb898a 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineAutoscalerTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineAutoscalerTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.autoscaling.v1beta1.MachineAutoscaler; import io.fabric8.openshift.api.model.autoscaling.v1beta1.MachineAutoscalerBuilder; import io.fabric8.openshift.api.model.autoscaling.v1beta1.MachineAutoscalerList; @@ -26,9 +28,9 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class MachineAutoscalerTest { - private OpenShiftMockServer server; + KubernetesMockServer server; private OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java index 781e97714d4..4b8c16970c2 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigPoolTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPool; import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPoolBuilder; import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigPoolList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class MachineConfigPoolTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java index b28100bcd74..9f99c355fb4 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineConfigTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfig; import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigBuilder; import io.fabric8.openshift.api.model.machineconfiguration.v1.MachineConfigList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class MachineConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java index cadc7c30c48..1bd0432232c 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineHealthCheckTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheck; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheckBuilder; import io.fabric8.openshift.api.model.machine.v1beta1.MachineHealthCheckList; @@ -28,10 +30,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class MachineHealthCheckTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() throws ParseException { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineSetTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineSetTest.java index ba3f46271d9..9ef3836f4f9 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineSetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineSetTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSet; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSetBuilder; import io.fabric8.openshift.api.model.machine.v1beta1.MachineSetList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class MachineSetTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineTest.java index 8b3680fd842..0c70050517b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/MachineTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.kubernetes.client.utils.Serialization; import io.fabric8.openshift.api.model.machine.v1beta1.Machine; import io.fabric8.openshift.api.model.machine.v1beta1.MachineBuilder; @@ -29,10 +31,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class MachineTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() throws IOException { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkAttachmentDefinitionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkAttachmentDefinitionTest.java index 52d928e4d8b..ebeb207c2d5 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkAttachmentDefinitionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkAttachmentDefinitionTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinition; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionBuilder; import io.fabric8.openshift.api.model.miscellaneous.cncf.cni.v1.NetworkAttachmentDefinitionList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class NetworkAttachmentDefinitionTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java index fd4e8e39641..b5670a08fba 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/NetworkTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.Network; import io.fabric8.openshift.api.model.config.v1.NetworkBuilder; import io.fabric8.openshift.api.model.config.v1.NetworkList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class NetworkTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientAuthorizationTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientAuthorizationTest.java index 9effe759cbd..595f376955f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientAuthorizationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientAuthorizationTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.OAuthClientAuthorization; import io.fabric8.openshift.api.model.OAuthClientAuthorizationBuilder; import io.fabric8.openshift.api.model.OAuthClientAuthorizationList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OAuthClientAuthorizationTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientTest.java index e02d04ac114..191186930db 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OAuthClientTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.OAuthClient; import io.fabric8.openshift.api.model.OAuthClientBuilder; import io.fabric8.openshift.api.model.OAuthClientList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OAuthClientTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OLMConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OLMConfigTest.java index cc8f963672f..c8070351ba8 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OLMConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OLMConfigTest.java @@ -31,7 +31,7 @@ @EnableKubernetesMockClient class OLMConfigTest { private OpenShiftClient client; - private KubernetesMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftVersionInfoTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftVersionInfoTest.java index 1f2b1d8cfa4..476dac77005 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftVersionInfoTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenShiftVersionInfoTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.client.VersionInfo; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.ClusterVersionBuilder; import io.fabric8.openshift.api.model.config.v1.ClusterVersionList; import io.fabric8.openshift.api.model.config.v1.ClusterVersionListBuilder; @@ -28,9 +30,9 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OpenShiftVersionInfoTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java index 44a597f2cba..6c1a4b626c1 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleBindingTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import com.fasterxml.jackson.databind.ObjectMapper; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.RoleBinding; import io.fabric8.openshift.api.model.RoleBindingBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -23,10 +25,10 @@ import static org.junit.jupiter.api.Assertions.assertEquals; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OpenshiftRoleBindingTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; private RoleBinding expectedRoleBinding = new RoleBindingBuilder() diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleTest.java index e3ea4e2b323..a87bd21a6ee 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OpenshiftRoleTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.APIGroupListBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.Role; import io.fabric8.openshift.api.model.RoleBuilder; import io.fabric8.openshift.api.model.RoleList; @@ -27,10 +29,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OpenshiftRoleTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorConditionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorConditionTest.java index 7e86556c54b..6c38cd5e02e 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorConditionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorConditionTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.ConditionBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operatorhub.v1.OperatorCondition; import io.fabric8.openshift.api.model.operatorhub.v1.OperatorConditionBuilder; import io.fabric8.openshift.api.model.operatorhub.v1.OperatorConditionList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OperatorConditionTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java index 963144a0acc..05d4b1be46e 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorPKITest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKI; import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIBuilder; import io.fabric8.openshift.api.model.operator.network.v1.OperatorPKIList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OperatorPKITest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorTest.java index c31e6c301f9..36494d3cddc 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OperatorTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operatorhub.v1.Operator; import io.fabric8.openshift.api.model.operatorhub.v1.OperatorBuilder; import io.fabric8.openshift.api.model.operatorhub.v1.OperatorList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OperatorTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OverlappingRangeIPReservationTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OverlappingRangeIPReservationTest.java index 9f4ee2c781b..1824f543672 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OverlappingRangeIPReservationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/OverlappingRangeIPReservationTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.OverlappingRangeIPReservation; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.OverlappingRangeIPReservationBuilder; import io.fabric8.openshift.api.model.whereabouts.v1alpha1.OverlappingRangeIPReservationList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class OverlappingRangeIPReservationTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PackageManifestTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PackageManifestTest.java index 18b9c6bd56c..0ebf39f5f31 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PackageManifestTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PackageManifestTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operatorhub.packages.v1.PackageManifest; import io.fabric8.openshift.api.model.operatorhub.packages.v1.PackageManifestBuilder; import io.fabric8.openshift.api.model.operatorhub.packages.v1.PackageManifestList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class PackageManifestTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodNetworkConnectivityCheckTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodNetworkConnectivityCheckTest.java index 74322c8dc5a..449c0e4ec48 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodNetworkConnectivityCheckTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodNetworkConnectivityCheckTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.controlplane.v1alpha1.PodNetworkConnectivityCheck; import io.fabric8.openshift.api.model.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckBuilder; import io.fabric8.openshift.api.model.operator.controlplane.v1alpha1.PodNetworkConnectivityCheckList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class PodNetworkConnectivityCheckTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicyReviewTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicyReviewTest.java index 8b984fd6c5a..9282531805c 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicyReviewTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicyReviewTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.PodSecurityPolicyReview; import io.fabric8.openshift.api.model.PodSecurityPolicyReviewBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -24,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class PodSecurityPolicyReviewTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void create() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySelfSubjectReviewTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySelfSubjectReviewTest.java index b6df91de5a0..faa8f6236b0 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySelfSubjectReviewTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySelfSubjectReviewTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReview; import io.fabric8.openshift.api.model.PodSecurityPolicySelfSubjectReviewBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -24,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class PodSecurityPolicySelfSubjectReviewTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void create() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySubjectReviewTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySubjectReviewTest.java index fcf248c446f..6aacf72e260 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySubjectReviewTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PodSecurityPolicySubjectReviewTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReview; import io.fabric8.openshift.api.model.PodSecurityPolicySubjectReviewBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -24,10 +26,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class PodSecurityPolicySubjectReviewTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void create() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProbeTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProbeTest.java index 95764f1e5e0..bbaa13ef1f1 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProbeTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProbeTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.monitoring.v1.Probe; import io.fabric8.openshift.api.model.monitoring.v1.ProbeBuilder; import io.fabric8.openshift.api.model.monitoring.v1.ProbeList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ProbeTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProfileTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProfileTest.java index 49eba8a61ef..3e7a8ede230 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProfileTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProfileTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.tuned.v1.Profile; import io.fabric8.openshift.api.model.tuned.v1.ProfileBuilder; import io.fabric8.openshift.api.model.tuned.v1.ProfileList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ProfileTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectTest.java index b5e26934b17..1a96747157b 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ProjectTest.java @@ -17,6 +17,8 @@ import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.rbac.RoleBindingBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.Project; import io.fabric8.openshift.api.model.ProjectBuilder; import io.fabric8.openshift.api.model.ProjectList; @@ -33,10 +35,10 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ProjectTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusRuleTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusRuleTest.java index c4f64d7b68a..f1dbffb00eb 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusRuleTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusRuleTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.monitoring.v1.PrometheusRule; import io.fabric8.openshift.api.model.monitoring.v1.PrometheusRuleBuilder; import io.fabric8.openshift.api.model.monitoring.v1.PrometheusRuleList; @@ -30,10 +32,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class PrometheusRuleTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusTest.java index 154d1b97bfb..ffe45e85e8f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/PrometheusTest.java @@ -17,6 +17,8 @@ import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.monitoring.v1.AlertingSpec; import io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerEndpoints; import io.fabric8.openshift.api.model.monitoring.v1.AlertmanagerEndpointsBuilder; @@ -35,10 +37,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class PrometheusTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RangeAllocationTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RangeAllocationTest.java index 6731ca43fe5..dc740b50402 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RangeAllocationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RangeAllocationTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.RangeAllocation; import io.fabric8.openshift.api.model.RangeAllocationBuilder; import io.fabric8.openshift.api.model.RangeAllocationList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class RangeAllocationTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java index 6723f3adb7f..e2742673a82 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RoleBindingRestrictionTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.RoleBindingRestriction; import io.fabric8.openshift.api.model.RoleBindingRestrictionBuilder; import io.fabric8.openshift.api.model.RoleBindingRestrictionList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class RoleBindingRestrictionTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RouteCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RouteCrudTest.java index 20a237d12b2..0820ec13492 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RouteCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/RouteCrudTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.Route; import io.fabric8.openshift.api.model.RouteBuilder; import io.fabric8.openshift.api.model.RouteList; @@ -27,10 +29,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient(crud = true) +@EnableKubernetesMockClient(crud = true) class RouteCrudTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java index 5d9e755a141..e8940a353ba 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsCrudTest.java @@ -15,6 +15,7 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; import io.fabric8.openshift.api.model.SecurityContextConstraints; import io.fabric8.openshift.api.model.SecurityContextConstraintsBuilder; import io.fabric8.openshift.api.model.SecurityContextConstraintsList; @@ -29,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient(crud = true) +@EnableKubernetesMockClient(crud = true) class SecurityContextConstraintsCrudTest { private static final Logger logger = LoggerFactory.getLogger(SecurityContextConstraintsCrudTest.class); diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java index 113dbd378d4..82e05df0f52 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SecurityContextConstraintsTest.java @@ -17,6 +17,8 @@ import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.client.dsl.NonDeletingOperation; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.SecurityContextConstraints; import io.fabric8.openshift.api.model.SecurityContextConstraintsBuilder; import io.fabric8.openshift.api.model.SecurityContextConstraintsList; @@ -34,10 +36,10 @@ import static org.junit.jupiter.api.Assertions.assertNotEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class SecurityContextConstraintsTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ServiceMonitorTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ServiceMonitorTest.java index 0292eb95d2b..33523d874d9 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ServiceMonitorTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ServiceMonitorTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.HasMetadata; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitor; import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitorBuilder; import io.fabric8.openshift.api.model.monitoring.v1.ServiceMonitorList; @@ -30,10 +32,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ServiceMonitorTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageStateTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageStateTest.java index bf691f8c1bc..769ec138396 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageStateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageStateTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageState; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageStateBuilder; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageStateList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class StorageStateTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageTest.java index 4b090ba4b6a..a3b4fbbf7de 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operator.v1.Storage; import io.fabric8.openshift.api.model.operator.v1.StorageBuilder; import io.fabric8.openshift.api.model.operator.v1.StorageList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class StorageTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageVersionMigrationTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageVersionMigrationTest.java index 9323b05cd4a..6dde67802c1 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageVersionMigrationTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/StorageVersionMigrationTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigration; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigrationBuilder; import io.fabric8.openshift.api.model.storageversionmigrator.v1alpha1.StorageVersionMigrationList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class StorageVersionMigrationTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubjectAccessReviewTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubjectAccessReviewTest.java index 98259510b71..0602b646604 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubjectAccessReviewTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubjectAccessReviewTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.LocalResourceAccessReviewBuilder; import io.fabric8.openshift.api.model.LocalSubjectAccessReviewBuilder; import io.fabric8.openshift.api.model.ResourceAccessReviewBuilder; @@ -36,15 +38,15 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class SubjectAccessReviewTest { - OpenShiftMockServer server; + KubernetesMockServer server; NamespacedOpenShiftClient client; @BeforeEach void setUp() { - client = server.createOpenShiftClient(); + client = server.createClient().adapt(NamespacedOpenShiftClient.class); } @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubscriptionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubscriptionTest.java index 97e59237da2..47f7bb4c0b8 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubscriptionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/SubscriptionTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.Subscription; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionBuilder; import io.fabric8.openshift.api.model.operatorhub.v1alpha1.SubscriptionList; @@ -28,10 +30,10 @@ import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class SubscriptionTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateInstanceTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateInstanceTest.java index 6e8159eaf91..9dfa6cf6d0e 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateInstanceTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateInstanceTest.java @@ -16,6 +16,8 @@ package io.fabric8.openshift.client.server.mock; import io.fabric8.kubernetes.api.model.ConfigMapBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.TemplateInstance; import io.fabric8.openshift.api.model.TemplateInstanceBuilder; import io.fabric8.openshift.api.model.TemplateInstanceList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class TemplateInstanceTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java index 52613ef2186..bb6a49d94a1 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TemplateTest.java @@ -26,6 +26,8 @@ import io.fabric8.kubernetes.api.model.ServicePort; import io.fabric8.kubernetes.api.model.ServiceSpec; import io.fabric8.kubernetes.api.model.StatusBuilder; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.kubernetes.client.utils.IOHelpers; import io.fabric8.openshift.api.model.ParameterBuilder; import io.fabric8.openshift.api.model.Template; @@ -53,10 +55,10 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class TemplateTest { - OpenShiftMockServer server; + KubernetesMockServer server; OpenShiftClient client; @Test diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ThanosRulerTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ThanosRulerTest.java index 0cdb13c9588..51b387942d8 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ThanosRulerTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/ThanosRulerTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.monitoring.v1.ThanosRuler; import io.fabric8.openshift.api.model.monitoring.v1.ThanosRulerBuilder; import io.fabric8.openshift.api.model.monitoring.v1.ThanosRulerList; @@ -27,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ThanosRulerTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TunedTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TunedTest.java index 50baab03930..f3177bd8940 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TunedTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/TunedTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.tuned.v1.Tuned; import io.fabric8.openshift.api.model.tuned.v1.TunedBuilder; import io.fabric8.openshift.api.model.tuned.v1.TunedList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class TunedTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserIdentityMappingTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserIdentityMappingTest.java index 4698b7cb7a7..0fcd84733df 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserIdentityMappingTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserIdentityMappingTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.UserIdentityMapping; import io.fabric8.openshift.api.model.UserIdentityMappingBuilder; import io.fabric8.openshift.client.OpenShiftClient; @@ -23,10 +25,10 @@ import static java.net.HttpURLConnection.HTTP_CREATED; import static org.junit.jupiter.api.Assertions.assertNotNull; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class UserIdentityMappingTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void create() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserOAuthAccessTokenTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserOAuthAccessTokenTest.java index 16c7e5d712b..23621d05037 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserOAuthAccessTokenTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserOAuthAccessTokenTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.UserOAuthAccessToken; import io.fabric8.openshift.api.model.UserOAuthAccessTokenBuilder; import io.fabric8.openshift.api.model.UserOAuthAccessTokenList; @@ -26,10 +28,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class UserOAuthAccessTokenTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserTest.java index 3d42c409ea9..4d1cca3e88c 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/UserTest.java @@ -15,12 +15,13 @@ */ package io.fabric8.openshift.client.server.mock; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.User; import io.fabric8.openshift.api.model.UserBuilder; import io.fabric8.openshift.api.model.UserList; import io.fabric8.openshift.api.model.UserListBuilder; import io.fabric8.openshift.client.NamespacedOpenShiftClient; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,17 +30,12 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertTrue; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class UserTest { - OpenShiftMockServer server; + KubernetesMockServer server; NamespacedOpenShiftClient client; - @BeforeEach - void setUp() { - client = server.createOpenShiftClient(); - } - @Test void testList() { server.expect().withPath("/apis/user.openshift.io/v1/users").andReturn(200, new UserListBuilder() diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterClaimTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterClaimTest.java index e7a1a342d79..bb33a9e350a 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterClaimTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterClaimTest.java @@ -15,13 +15,13 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.ClusterClaim; import io.fabric8.openshift.api.model.hive.v1.ClusterClaimBuilder; import io.fabric8.openshift.api.model.hive.v1.ClusterClaimList; import io.fabric8.openshift.api.model.hive.v1.ClusterClaimListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; @@ -29,10 +29,10 @@ import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterClaimTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() throws ParseException { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeploymentTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeploymentTest.java index 6f175f53973..cbbde9d9c60 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeploymentTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeploymentTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.ClusterDeployment; import io.fabric8.openshift.api.model.hive.v1.ClusterDeploymentBuilder; import io.fabric8.openshift.api.model.hive.v1.ClusterDeploymentList; import io.fabric8.openshift.api.model.hive.v1.ClusterDeploymentListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterDeploymentTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeprovisionTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeprovisionTest.java index 37b2b7e4e2d..aa8a92d7bdd 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeprovisionTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterDeprovisionTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.ClusterDeprovision; import io.fabric8.openshift.api.model.hive.v1.ClusterDeprovisionBuilder; import io.fabric8.openshift.api.model.hive.v1.ClusterDeprovisionList; import io.fabric8.openshift.api.model.hive.v1.ClusterDeprovisionListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterDeprovisionTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterImageSetTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterImageSetTest.java index bf73bc3bd3d..197f7688b57 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterImageSetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterImageSetTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.ClusterImageSet; import io.fabric8.openshift.api.model.hive.v1.ClusterImageSetBuilder; import io.fabric8.openshift.api.model.hive.v1.ClusterImageSetList; import io.fabric8.openshift.api.model.hive.v1.ClusterImageSetListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterImageSetTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterPoolTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterPoolTest.java index 2be2e4e9862..e0ec39d45c2 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterPoolTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterPoolTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.ClusterPool; import io.fabric8.openshift.api.model.hive.v1.ClusterPoolBuilder; import io.fabric8.openshift.api.model.hive.v1.ClusterPoolList; import io.fabric8.openshift.api.model.hive.v1.ClusterPoolListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterPoolTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterRelocateTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterRelocateTest.java index 070b0d3425e..d9ff5038a4f 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterRelocateTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/ClusterRelocateTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.ClusterRelocate; import io.fabric8.openshift.api.model.hive.v1.ClusterRelocateBuilder; import io.fabric8.openshift.api.model.hive.v1.ClusterRelocateList; import io.fabric8.openshift.api.model.hive.v1.ClusterRelocateListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class ClusterRelocateTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/DNSZoneTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/DNSZoneTest.java index dd9120d5cba..e8ab0f5b092 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/DNSZoneTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/DNSZoneTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.DNSZone; import io.fabric8.openshift.api.model.hive.v1.DNSZoneBuilder; import io.fabric8.openshift.api.model.hive.v1.DNSZoneList; import io.fabric8.openshift.api.model.hive.v1.DNSZoneListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class DNSZoneTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/HiveConfigTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/HiveConfigTest.java index c1b8bf18f8a..5f189f27498 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/HiveConfigTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/HiveConfigTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.HiveConfig; import io.fabric8.openshift.api.model.hive.v1.HiveConfigBuilder; import io.fabric8.openshift.api.model.hive.v1.HiveConfigList; import io.fabric8.openshift.api.model.hive.v1.HiveConfigListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class HiveConfigTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/MachinePoolTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/MachinePoolTest.java index 541b0ed3c91..86061759b79 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/MachinePoolTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/MachinePoolTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.MachinePool; import io.fabric8.openshift.api.model.hive.v1.MachinePoolBuilder; import io.fabric8.openshift.api.model.hive.v1.MachinePoolList; import io.fabric8.openshift.api.model.hive.v1.MachinePoolListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class MachinePoolTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java index 74ce5ac865e..8164221ca19 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncIdentityProviderTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.GitHubIdentityProviderBuilder; import io.fabric8.openshift.api.model.config.v1.IdentityProviderBuilder; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncIdentityProvider; @@ -22,18 +24,16 @@ import io.fabric8.openshift.api.model.hive.v1.SelectorSyncIdentityProviderList; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncIdentityProviderListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class SelectorSyncIdentityProviderTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncSetTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncSetTest.java index 477746537ba..fab2573ea6c 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncSetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SelectorSyncSetTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncSet; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncSetBuilder; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncSetList; import io.fabric8.openshift.api.model.hive.v1.SelectorSyncSetListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class SelectorSyncSetTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java index a4571d96866..0d8ebed27a9 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncIdentityProviderTest.java @@ -15,6 +15,8 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.config.v1.GitHubIdentityProviderBuilder; import io.fabric8.openshift.api.model.config.v1.IdentityProviderBuilder; import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProvider; @@ -22,18 +24,16 @@ import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProviderList; import io.fabric8.openshift.api.model.hive.v1.SyncIdentityProviderListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class SyncIdentityProviderTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() { diff --git a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncSetTest.java b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncSetTest.java index 9ab58d3619b..66742886f82 100644 --- a/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncSetTest.java +++ b/kubernetes-tests/src/test/java/io/fabric8/openshift/client/server/mock/hive/SyncSetTest.java @@ -15,23 +15,23 @@ */ package io.fabric8.openshift.client.server.mock.hive; +import io.fabric8.kubernetes.client.server.mock.EnableKubernetesMockClient; +import io.fabric8.kubernetes.client.server.mock.KubernetesMockServer; import io.fabric8.openshift.api.model.hive.v1.SyncSet; import io.fabric8.openshift.api.model.hive.v1.SyncSetBuilder; import io.fabric8.openshift.api.model.hive.v1.SyncSetList; import io.fabric8.openshift.api.model.hive.v1.SyncSetListBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import io.fabric8.openshift.client.server.mock.EnableOpenShiftMockClient; -import io.fabric8.openshift.client.server.mock.OpenShiftMockServer; import org.junit.jupiter.api.Test; import java.net.HttpURLConnection; import static org.assertj.core.api.Assertions.assertThat; -@EnableOpenShiftMockClient +@EnableKubernetesMockClient class SyncSetTest { private OpenShiftClient client; - private OpenShiftMockServer server; + KubernetesMockServer server; @Test void get() {