Merge pull request #1699 from yue9944882/junit-rules-system-env

Switching JUnit system-rules dependency to system-lambda

Author: k8s-ci-robot

extended/pom.xml

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

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

@@ -24,17 +24,13 @@
 import java.util.List;
 import java.util.Map;
 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

@@ -24,14 +24,10 @@
 import java.util.Arrays;
 import java.util.concurrent.atomic.AtomicBoolean;
 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

@@ -23,14 +23,9 @@
 import java.util.Deque;
 import java.util.LinkedList;
 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

@@ -18,13 +18,9 @@
 import io.kubernetes.client.openapi.models.V1Pod;
 import java.util.Arrays;
 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

@@ -17,14 +17,10 @@
 import io.kubernetes.client.informer.ResourceEventHandler;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
 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

@@ -34,18 +34,14 @@
 import java.util.concurrent.atomic.AtomicReference;
 import org.awaitility.Awaitility;
 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

@@ -20,14 +20,10 @@
 import io.kubernetes.client.openapi.models.V1Pod;
 import java.time.Duration;
 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 {