Change the env variables implementation for tests.

Author: brendandburns

pom.xml

@@ -262,8 +262,8 @@
       </dependency>
       <dependency>
         <groupId>com.github.stefanbirkner</groupId>
-        <artifactId>system-rules</artifactId>
-        <version>1.19.0</version>
+        <artifactId>system-lambda</artifactId>
+        <version>1.2.0</version>
         <scope>test</scope>
       </dependency>
       <dependency>

util/pom.xml

@@ -97,7 +97,7 @@
         </dependency>
         <dependency>
             <groupId>com.github.stefanbirkner</groupId>
-            <artifactId>system-rules</artifactId>
+            <artifactId>system-lambda</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

util/src/test/java/io/kubernetes/client/informer/cache/CacheTest.java

@@ -26,15 +26,12 @@
 import java.util.function.Function;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
 @RunWith(Parameterized.class)
 public class CacheTest {
 
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
   private static String mockIndexName = "mock";
 
   private static List<String> mockIndexFunc(Object obj) {

util/src/test/java/io/kubernetes/client/informer/cache/ControllerTest.java

@@ -26,12 +26,9 @@
 import java.util.concurrent.atomic.AtomicInteger;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
 public class ControllerTest {
 
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
   @Test
   public void testControllerProcessDeltas() throws InterruptedException {
 

util/src/test/java/io/kubernetes/client/informer/cache/DeltaFIFOTest.java

@@ -25,12 +25,8 @@
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
 public class DeltaFIFOTest {
-
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
   @Test
   public void testDeltaFIFOBasic() throws InterruptedException {
     Deque<MutablePair<DeltaFIFO.DeltaType, KubernetesObject>> receivingDeltas = new LinkedList<>();

util/src/test/java/io/kubernetes/client/informer/cache/ListerTest.java

@@ -20,11 +20,8 @@
 import java.util.List;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
 public class ListerTest {
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
   @Test
   public void testListerBasic() {
     Cache<V1Pod> podCache = new Cache<>();

util/src/test/java/io/kubernetes/client/informer/cache/ProcessorListenerTest.java

@@ -19,12 +19,9 @@
 import io.kubernetes.client.openapi.models.V1Pod;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
 public class ProcessorListenerTest {
 
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
   private static boolean addNotificationReceived;
   private static boolean updateNotificationReceived;
   private static boolean deleteNotificationReceived;

util/src/test/java/io/kubernetes/client/informer/cache/ReflectorRunnableTest.java

@@ -36,16 +36,13 @@
 import org.hamcrest.core.IsEqual;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 
 @RunWith(MockitoJUnitRunner.class)
 public class ReflectorRunnableTest {
 
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
   @Mock private DeltaFIFO deltaFIFO;
 
   @Mock private ListerWatcher<V1Pod, V1PodList> listerWatcher;

util/src/test/java/io/kubernetes/client/informer/cache/SharedProcessorTest.java

@@ -22,12 +22,9 @@
 import java.util.concurrent.Executors;
 import org.junit.Rule;
 import org.junit.Test;
-import org.junit.contrib.java.lang.system.EnvironmentVariables;
 
 public class SharedProcessorTest {
 
-  @Rule public final EnvironmentVariables environmentVariables = new EnvironmentVariables();
-
   @Test
   public void testListenerAddition() throws InterruptedException {
 

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

@@ -34,6 +34,7 @@
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.contrib.java.lang.system.EnvironmentVariables;
+import static com.github.stefanbirkner.systemlambda.SystemLambda.withEnvironmentVariable;
 
 /** Tests for the ConfigBuilder helper class */
 public class ClientBuilderTest {
@@ -68,76 +69,107 @@ public void setup() {
   }
 
   @Test
-  public void testDefaultClientWithNoFiles() throws IOException {
-    environmentVariables.set("HOME", "/non-existent");
-    final ApiClient client = ClientBuilder.defaultClient();
-    assertEquals("http://localhost:8080", client.getBasePath());
+  public void testDefaultClientWithNoFiles() throws Exception {
+     String path = withEnvironmentVariable("HOME", "/non-existent")
+        .execute(() -> {
+          environmentVariables.set("HOME", "/non-existent");
+          final ApiClient client = ClientBuilder.defaultClient();
+          return client.getBasePath();
+        });
+    assertEquals("http://localhost:8080", path);
   }
 
   @Test
   public void testDefaultClientReadsHomeDir() throws Exception {
-    environmentVariables.set("HOME", HOME_PATH);
-    ApiClient client = ClientBuilder.defaultClient();
-    assertEquals("http://home.dir.com", client.getBasePath());
+    String path = withEnvironmentVariable("HOME", HOME_PATH)
+        .execute(() -> {
+          ApiClient client = ClientBuilder.defaultClient();
+          return client.getBasePath();
+        });
+    assertEquals("http://home.dir.com", path);
   }
 
   @Test
   public void testDefaultClientReadsKubeConfig() throws Exception {
-    environmentVariables.set("KUBECONFIG", KUBECONFIG_FILE_PATH);
-    final ApiClient client = ClientBuilder.defaultClient();
-    assertEquals("http://kubeconfig.dir.com", client.getBasePath());
+    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_FILE_PATH)
+        .execute(() -> {
+          final ApiClient client = ClientBuilder.defaultClient();
+          return client.getBasePath();
+        });
+    assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testDefaultClientUTF8EncodedConfig() throws Exception {
-    environmentVariables.set("KUBECONFIG", KUBECONFIG_UTF8_FILE_PATH);
-    final ApiClient client = ClientBuilder.defaultClient();
-    assertEquals("http://kubeconfig.dir.com", client.getBasePath());
+    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_UTF8_FILE_PATH)
+        .execute(() -> {
+          final ApiClient client = ClientBuilder.defaultClient();
+          return client.getBasePath();
+        });
+    assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testDefaultClientReadsKubeConfigMultiple() throws Exception {
     final String kubeConfigEnv = KUBECONFIG_FILE_PATH + File.pathSeparator + "/non-existent";
-    environmentVariables.set("KUBECONFIG", kubeConfigEnv);
-    final ApiClient client = ClientBuilder.defaultClient();
-    assertEquals("http://kubeconfig.dir.com", client.getBasePath());
+    String path = withEnvironmentVariable("KUBECONFIG", kubeConfigEnv)
+        .execute(() -> {
+          final ApiClient client = ClientBuilder.defaultClient();
+          return client.getBasePath();
+        });
+    assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testKubeconfigPreferredOverHomeDir() throws Exception {
-    environmentVariables.set("HOME", HOME_PATH);
-    environmentVariables.set("KUBECONFIG", KUBECONFIG_FILE_PATH);
-    final ApiClient client = ClientBuilder.standard().build();
+    String path = withEnvironmentVariable("HOME", HOME_PATH)
+      .and("KUBECONFIG", KUBECONFIG_FILE_PATH)
+      .execute(() -> {
+        final ApiClient client = ClientBuilder.standard().build();
+        return client.getBasePath();
+      });
     // $KUBECONFIG should take precedence over $HOME/.kube/config
-    assertEquals("http://kubeconfig.dir.com", client.getBasePath());
+    assertEquals("http://kubeconfig.dir.com", path);
   }
 
   @Test
   public void testInvalidKubeconfig() throws Exception {
-    environmentVariables.set("KUBECONFIG", "/non-existent");
-    final ApiClient client = ClientBuilder.standard().build();
-    assertThat(client.getBasePath(), is(Config.DEFAULT_FALLBACK_HOST));
+    String path = withEnvironmentVariable("KUBECONFIG", "/non-existent")
+      .execute(() -> {
+        final ApiClient client = ClientBuilder.standard().build();
+        return client.getBasePath();
+      });
+    assertThat(path, is(Config.DEFAULT_FALLBACK_HOST));
   }
 
   @Test
   public void testKubeconfigAddsSchemeHttps() throws Exception {
-    environmentVariables.set("KUBECONFIG", KUBECONFIG_HTTPS_FILE_PATH);
-    final ApiClient client = ClientBuilder.standard().build();
-    assertThat(client.getBasePath(), is("https://localhost:443"));
+    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTPS_FILE_PATH)
+      .execute(() -> {
+        final ApiClient client = ClientBuilder.standard().build();
+        return client.getBasePath();
+      });
+    assertThat(path, is("https://localhost:443"));
   }
 
   @Test
   public void testKubeconfigAddsSchemeHttp() throws Exception {
-    environmentVariables.set("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH);
-    final ApiClient client = ClientBuilder.standard().build();
-    assertThat(client.getBasePath(), is("http://localhost"));
+    String path = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH)
+      .execute(() -> {
+        final ApiClient client = ClientBuilder.standard().build();
+        return client.getBasePath();
+      });
+    assertThat(path, is("http://localhost"));
   }
 
   @Test
   public void testKubeconfigDisablesVerifySsl() throws Exception {
-    environmentVariables.set("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH);
-    final ApiClient client = ClientBuilder.standard().build();
-    assertThat(client.isVerifyingSsl(), is(false));
+    boolean isVerifyingSsl = withEnvironmentVariable("KUBECONFIG", KUBECONFIG_HTTP_FILE_PATH)
+      .execute(() -> {
+        final ApiClient client = ClientBuilder.standard().build();
+        return client.isVerifyingSsl();
+      });
+    assertThat(isVerifyingSsl, is(false));
   }
 
   @Test
@@ -147,10 +179,13 @@ public void testBasePathTrailingSlash() throws Exception {
   }
 
   @Test
-  public void testStandardVerifiesSsl() throws IOException {
-    environmentVariables.set("HOME", "/non-existent");
-    final ApiClient client = ClientBuilder.standard().build();
-    assertThat(client.isVerifyingSsl(), is(true));
+  public void testStandardVerifiesSsl() throws Exception {
+    boolean isVerifyingSsl = withEnvironmentVariable("HOME", "/non-existent")
+      .execute(() -> {
+        final ApiClient client = ClientBuilder.standard().build();
+        return client.isVerifyingSsl();
+      });
+    assertThat(isVerifyingSsl, is(true));
   }
 
   @Test
@@ -183,45 +218,52 @@ public void testSslCertCaBad() throws Exception {
 
   @Test
   public void testHomeDirPreferredOverKubeConfig() throws Exception {
-    environmentVariables.set("HOME", HOME_PATH);
-    environmentVariables.set("KUBEDIR", KUBEDIR);
-    environmentVariables.set("KUBECONFIG", KUBECONFIG);
-    final ApiClient client = ClientBuilder.standard().build();
-    assertEquals("http://home.dir.com", client.getBasePath());
+    String path = withEnvironmentVariable("HOME", HOME_PATH)
+      .and("KUBEDIR", KUBEDIR)
+      .and("KUBECONFIG", KUBECONFIG)
+      .execute(() -> {
+        final ApiClient client = ClientBuilder.standard().build();
+        return client.getBasePath();
+      });
+    assertEquals(path, "http://home.dir.com");
   }
 
   @Test
-  public void testIPv4AddressParsingShouldWork() {
-    environmentVariables.set(ENV_SERVICE_HOST, "127.0.0.1");
-    environmentVariables.set(ENV_SERVICE_PORT, "6443");
-    String ipv4Host = "127.0.0.1";
-    String port = "6443";
-    ClientBuilder builder =
-        new ClientBuilder() {
-          @Override
-          public ClientBuilder setBasePath(String host, String port) {
-            return super.setBasePath(host, port);
-          }
-        }.setBasePath(ipv4Host, port);
-
-    assertEquals("https://127.0.0.1:6443", builder.getBasePath());
+  public void testIPv4AddressParsingShouldWork() throws Exception {
+    String path = withEnvironmentVariable(ENV_SERVICE_HOST, "127.0.0.1")
+      .and(ENV_SERVICE_PORT, "6443")
+      .execute(() -> {
+        String ipv4Host = "127.0.0.1";
+        String port = "6443";
+        ClientBuilder builder =
+          new ClientBuilder() {
+            @Override
+            public ClientBuilder setBasePath(String host, String port) {
+              return super.setBasePath(host, port);
+            }
+          }.setBasePath(ipv4Host, port);
+        return builder.getBasePath();
+      });
+    assertEquals(path, "https://127.0.0.1:6443");
   }
 
   @Test
-  public void testIPv6AddressParsingShouldWork() {
-    environmentVariables.set(ENV_SERVICE_HOST, "127.0.0.1");
-    environmentVariables.set(ENV_SERVICE_PORT, "6443");
-    String ipv4Host = "::1";
-    String port = "6443";
-    ClientBuilder builder =
-        new ClientBuilder() {
-          @Override
-          public ClientBuilder setBasePath(String host, String port) {
-            return super.setBasePath(host, port);
-          }
-        }.setBasePath(ipv4Host, port);
-
-    assertEquals("https://[::1]:6443", builder.getBasePath());
+  public void testIPv6AddressParsingShouldWork() throws Exception {
+    String path = withEnvironmentVariable(ENV_SERVICE_HOST, "127.0.0.1")
+      .and(ENV_SERVICE_PORT, "6443")
+      .execute(() -> {
+        String ipv4Host = "::1";
+        String port = "6443";
+        ClientBuilder builder =
+          new ClientBuilder() {
+            @Override
+            public ClientBuilder setBasePath(String host, String port) {
+              return super.setBasePath(host, port);
+            }
+          }.setBasePath(ipv4Host, port);
+          return builder.getBasePath();
+      });
+    assertEquals(path, "https://[::1]:6443");
   }
 
   @Test