Merge pull request #3686 from yue9944882/sanitize-ut-api-path

Nit: Sanitize mock API paths in the tests
kubernetes-client · Sep 13, 2024 · 0fe7329 · 0fe7329
2 parents e687bd6 + 8d34647
commit 0fe7329
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlDeleteTest.java b/extended/src/test/java/io/kubernetes/client/extended/kubectl/KubectlDeleteTest.java
@@ -142,7 +142,7 @@ void kubectlDelete() throws KubectlException, ApiException {
                                         .withStatus(201)
                                         .withBody(ADD_JOB)));
         apiServer.stubFor(
-                delete(urlPathEqualTo("/apis/batch%2Fv1/batch%2Fv1/namespaces/foo/jobs/bar"))
+                delete(urlPathEqualTo("/apis/batch/v1/namespaces/foo/jobs/bar"))
                         .inScenario("JobDeletionScenario")
                         .whenScenarioStateIs(Scenario.STARTED)
                         .willReturn(aResponse()
@@ -153,7 +153,7 @@ void kubectlDelete() throws KubectlException, ApiException {
         );
 
         apiServer.stubFor(
-                delete(urlPathEqualTo("/apis/batch%2Fv1/batch%2Fv1/namespaces/foo/jobs/bar"))
+                delete(urlPathEqualTo("/apis/batch/v1/namespaces/foo/jobs/bar"))
                         .inScenario("JobDeletionScenario")
                         .whenScenarioStateIs("SecondCall")
                         .willReturn(aResponse()
@@ -204,7 +204,7 @@ void kubectlDelete() throws KubectlException, ApiException {
         BatchV1Api api = new BatchV1Api();
         api.setApiClient(apiClient);
         api.createNamespacedJob("foo", job).execute();
-        ModelMapper.addModelMap(api.getAPIResources().execute().getGroupVersion(), job.getApiVersion(), job.getKind(), "jobs", true, V1Job.class);
+        ModelMapper.addModelMap("batch", "v1", job.getKind(), "jobs", true, V1Job.class);
 
         KubectlDelete<V1Job> kubectlDelete = Kubectl.delete(V1Job.class);
         kubectlDelete.apiClient(apiClient);
@@ -215,7 +215,7 @@ void kubectlDelete() throws KubectlException, ApiException {
         kubectlDelete.execute();
         apiServer.verify(
             1,
-            deleteRequestedFor(urlPathEqualTo("/apis/batch%2Fv1/batch%2Fv1/namespaces/foo/jobs/bar"))
+            deleteRequestedFor(urlPathEqualTo("/apis/batch/v1/namespaces/foo/jobs/bar"))
                 .withRequestBody(equalToJson("{\"propagationPolicy\" : \"Foreground\"}")));
         assertThatThrownBy(() -> {
             KubectlDelete<V1Job> kubectlDelete2 = Kubectl.delete(V1Job.class);