Merge pull request #3136 from codefromthecrypt/assertj

Migrate all test assertions to AssertJ

Author: k8s-ci-robot

e2e/pom.xml

@@ -39,6 +39,11 @@
             <artifactId>junit</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.slf4j</groupId>

e2e/src/test/java/io/kubernetes/client/e2e/extended/leaderelection/LeaderElectorTest.java

@@ -12,6 +12,8 @@
 */
 package io.kubernetes.client.e2e.extended.leaderelection;
 
+import static org.assertj.core.api.Assertions.assertThat;
+
 import io.kubernetes.client.extended.leaderelection.LeaderElectionConfig;
 import io.kubernetes.client.extended.leaderelection.LeaderElector;
 import io.kubernetes.client.extended.leaderelection.Lock;
@@ -34,7 +36,6 @@
 import java.util.concurrent.CyclicBarrier;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
-import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -165,8 +166,8 @@ public void testMultiCandidateLeaderElection() throws Exception {
 
     // wait till someone becomes leader
     startBeingLeader.await();
-    Assert.assertNotNull(leaderRef.get());
-    Assert.assertTrue(candidate1.equals(leaderRef.get()) || candidate2.equals(leaderRef.get()));
+    assertThat(leaderRef).doesNotHaveNullValue();
+    assertThat(candidate1.equals(leaderRef.get()) || candidate2.equals(leaderRef.get())).isTrue();
 
     // stop both LeaderElectors, in order .. non-leader, then leader so that
     // non-leader doesn't get to become leader
@@ -181,8 +182,8 @@ public void testMultiCandidateLeaderElection() throws Exception {
     stopBeingLeader.await();
 
     // make sure that only one candidate became leader
-    Assert.assertEquals(1, startBeingLeaderCount.get());
-    Assert.assertEquals(1, stopBeingLeaderCount.get());
+    assertThat(startBeingLeaderCount).hasValue(1);
+    assertThat(stopBeingLeaderCount).hasValue(1);
   }
 
   @Test(timeout = 45000L)

examples/examples-release-17/src/test/java/io/kubernetes/client/examples/ExampleTest.java

@@ -25,7 +25,6 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
-import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -34,7 +33,7 @@ public class ExampleTest {
   @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
 
   @Test
-  public void exactUrlOnly() throws IOException, ApiException {
+  public void exactUrlOnly() throws ApiException {
     ApiClient client = new ApiClient();
     client.setBasePath("http://localhost:" + PORT);
     Configuration.setDefaultApiClient(client);

examples/examples-release-18/src/test/java/io/kubernetes/client/examples/ExampleTest.java

@@ -25,7 +25,6 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
-import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -34,7 +33,7 @@ public class ExampleTest {
   @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
 
   @Test
-  public void exactUrlOnly() throws IOException, ApiException {
+  public void exactUrlOnly() throws ApiException {
     ApiClient client = new ApiClient();
     client.setBasePath("http://localhost:" + PORT);
     Configuration.setDefaultApiClient(client);

examples/examples-release-19/src/test/java/io/kubernetes/client/examples/ExampleTest.java

@@ -25,7 +25,6 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
-import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -34,7 +33,7 @@ public class ExampleTest {
   @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
 
   @Test
-  public void exactUrlOnly() throws IOException, ApiException {
+  public void exactUrlOnly() throws ApiException {
     ApiClient client = new ApiClient();
     client.setBasePath("http://localhost:" + PORT);
     Configuration.setDefaultApiClient(client);

examples/examples-release-20/src/test/java/io/kubernetes/client/examples/ExampleTest.java

@@ -25,7 +25,6 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
-import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -34,7 +33,7 @@ public class ExampleTest {
   @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
 
   @Test
-  public void exactUrlOnly() throws IOException, ApiException {
+  public void exactUrlOnly() throws ApiException {
     ApiClient client = new ApiClient();
     client.setBasePath("http://localhost:" + PORT);
     Configuration.setDefaultApiClient(client);

examples/examples-release-latest/src/test/java/io/kubernetes/client/examples/ExampleTest.java

@@ -25,7 +25,6 @@
 import io.kubernetes.client.openapi.apis.CoreV1Api;
 import io.kubernetes.client.openapi.models.V1Namespace;
 import io.kubernetes.client.openapi.models.V1ObjectMeta;
-import java.io.IOException;
 import org.junit.Rule;
 import org.junit.Test;
 
@@ -34,7 +33,7 @@ public class ExampleTest {
   @Rule public WireMockRule wireMockRule = new WireMockRule(PORT);
 
   @Test
-  public void exactUrlOnly() throws IOException, ApiException {
+  public void exactUrlOnly() throws ApiException {
     ApiClient client = new ApiClient();
     client.setBasePath("http://localhost:" + PORT);
     Configuration.setDefaultApiClient(client);

extended/pom.xml

@@ -76,6 +76,11 @@
             <artifactId>commons-collections4</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

extended/src/test/java/io/kubernetes/client/extended/controller/ControllerManagerTest.java

@@ -12,7 +12,7 @@
 */
 package io.kubernetes.client.extended.controller;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.kubernetes.client.informer.SharedInformerFactory;
 import org.junit.Test;
@@ -27,12 +27,12 @@ public void testControllerStartShutdown() {
     ControllerManager cm = new ControllerManager(new SharedInformerFactory(), dummy1, dummy2);
 
     cm.run();
-    assertTrue(dummy1.started);
-    assertTrue(dummy2.started);
+    assertThat(dummy1.started).isTrue();
+    assertThat(dummy2.started).isTrue();
 
     cm.shutdown();
-    assertTrue(dummy1.stopped);
-    assertTrue(dummy2.stopped);
+    assertThat(dummy1.stopped).isTrue();
+    assertThat(dummy2.stopped).isTrue();
   }
 
   static class DummyController implements Controller {

extended/src/test/java/io/kubernetes/client/extended/controller/ControllerWatchTest.java

@@ -12,7 +12,7 @@
 */
 package io.kubernetes.client.extended.controller;
 
-import static org.junit.Assert.*;
+import static org.assertj.core.api.Assertions.assertThat;
 
 import io.kubernetes.client.extended.controller.reconciler.Request;
 import io.kubernetes.client.extended.workqueue.DefaultWorkQueue;
@@ -34,11 +34,11 @@ public void testOnAdd() {
         new DefaultControllerWatch(
             V1Pod.class, workQueue, Controllers.defaultReflectiveKeyFunc(), Duration.ZERO);
     controllerWatch.getResourceEventHandler().onAdd(testPod);
-    assertEquals(1, workQueue.length());
+    assertThat(workQueue.length()).isEqualTo(1);
 
     controllerWatch.setOnAddFilterPredicate((V1Pod addedPod) -> false);
     controllerWatch.getResourceEventHandler().onAdd(testPod);
-    assertEquals(1, workQueue.length());
+    assertThat(workQueue.length()).isEqualTo(1);
   }
 
   @Test
@@ -48,11 +48,11 @@ public void testOnUpdate() {
         new DefaultControllerWatch(
             V1Pod.class, workQueue, Controllers.defaultReflectiveKeyFunc(), Duration.ZERO);
     controllerWatch.getResourceEventHandler().onUpdate(null, testPod);
-    assertEquals(1, workQueue.length());
+    assertThat(workQueue.length()).isEqualTo(1);
 
     controllerWatch.setOnUpdateFilterPredicate((V1Pod oldPod, V1Pod newPod) -> false);
     controllerWatch.getResourceEventHandler().onUpdate(null, testPod);
-    assertEquals(1, workQueue.length());
+    assertThat(workQueue.length()).isEqualTo(1);
   }
 
   @Test
@@ -62,10 +62,10 @@ public void testOnDelete() {
         new DefaultControllerWatch(
             V1Pod.class, workQueue, Controllers.defaultReflectiveKeyFunc(), Duration.ZERO);
     controllerWatch.getResourceEventHandler().onDelete(testPod, false);
-    assertEquals(1, workQueue.length());
+    assertThat(workQueue.length()).isEqualTo(1);
 
     controllerWatch.setOnDeleteFilterPredicate((V1Pod newPod, Boolean stateUnknown) -> false);
     controllerWatch.getResourceEventHandler().onDelete(testPod, false);
-    assertEquals(1, workQueue.length());
+    assertThat(workQueue.length()).isEqualTo(1);
   }
 }