Merge pull request #1238 from sarveshkaushal/k-test

Removing static port in Junit tests

Author: k8s-ci-robot

util/src/test/java/io/kubernetes/client/informer/impl/DefaultSharedIndexInformerTest.java

@@ -13,6 +13,7 @@
 package io.kubernetes.client.informer.impl;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.*;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
@@ -43,12 +44,11 @@ public class DefaultSharedIndexInformerTest {
 
   private ApiClient client;
 
-  private static final int PORT = 8089;
-  @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
+  @Rule public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort());
 
   @Before
   public void setup() throws IOException {
-    client = new ClientBuilder().setBasePath("http://localhost:" + PORT).build();
+    client = new ClientBuilder().setBasePath("http://localhost:" + wireMockRule.port()).build();
 
     namespace = "default";
     podName = "apod";

util/src/test/java/io/kubernetes/client/util/PatchUtilsTest.java

@@ -13,6 +13,7 @@
 package io.kubernetes.client.util;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
 import io.kubernetes.client.custom.V1Patch;
@@ -28,13 +29,12 @@
 public class PatchUtilsTest {
 
   private ApiClient client;
-  private static final int PORT = 8089;
 
-  @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
+  @Rule public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort());
 
   @Before
   public void setup() throws IOException {
-    client = new ClientBuilder().setBasePath("http://localhost:" + PORT).build();
+    client = new ClientBuilder().setBasePath("http://localhost:" + wireMockRule.port()).build();
   }
 
   @Test

util/src/test/java/io/kubernetes/client/util/credentials/TokenFileAuthenticationTest.java

@@ -13,6 +13,7 @@
 package io.kubernetes.client.util.credentials;
 
 import static com.github.tomakehurst.wiremock.client.WireMock.*;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 
 import com.github.tomakehurst.wiremock.client.WireMock;
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
@@ -35,12 +36,12 @@ public class TokenFileAuthenticationTest {
   private static final int PORT = 8089;
   private TokenFileAuthentication auth;
 
-  @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
+  @Rule public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort());
 
   @Before
   public void setup() throws IOException {
     final ApiClient client = new ApiClient();
-    client.setBasePath("http://localhost:" + PORT);
+    client.setBasePath("http://localhost:" + wireMockRule.port());
     this.auth = new TokenFileAuthentication(SERVICEACCOUNT_TOKEN1_PATH);
     this.auth.provide(client);
     Configuration.setDefaultApiClient(client);

util/src/test/java/io/kubernetes/client/util/version/VersionTest.java

@@ -18,6 +18,7 @@
 import static com.github.tomakehurst.wiremock.client.WireMock.getRequestedFor;
 import static com.github.tomakehurst.wiremock.client.WireMock.urlPathEqualTo;
 import static com.github.tomakehurst.wiremock.client.WireMock.verify;
+import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.options;
 import static org.junit.Assert.assertEquals;
 
 import com.github.tomakehurst.wiremock.junit.WireMockRule;
@@ -34,12 +35,11 @@ public class VersionTest {
 
   private ApiClient client;
 
-  private static final int PORT = 8091;
-  @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
+  @Rule public WireMockRule wireMockRule = new WireMockRule(options().dynamicPort());
 
   @Before
   public void setup() throws IOException {
-    client = new ClientBuilder().setBasePath("http://localhost:" + PORT).build();
+    client = new ClientBuilder().setBasePath("http://localhost:" + wireMockRule.port()).build();
   }
 
   @Test