Merge pull request #1214 from hugares/remove-junit-deprecated

KostyaSha · web-flow · commit 9684b9659310 · 2019-07-10T22:18:37.000+03:00
Remove usage of JUnit deprecated methods
diff --git a/src/test/java/com/github/dockerjava/api/model/DeviceTest.java b/src/test/java/com/github/dockerjava/api/model/DeviceTest.java
@@ -8,10 +8,10 @@
 import java.util.List;
 import java.util.Map;
 
-import static junit.framework.Assert.fail;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
+import static org.junit.Assert.fail;
 
 /**
  * @author Kanstantsin Shautsou
diff --git a/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java b/src/test/java/com/github/dockerjava/api/model/PortsAddBindingsTest.java
@@ -6,7 +6,9 @@
 
 import java.util.Map;
 
+import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 /**
  * As there may be several {@link Binding}s per {@link ExposedPort}, it makes a difference if you add {@link PortBinding}s for the same or
@@ -35,8 +37,8 @@ public void addTwoBindingsForDifferentExposedPorts() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // two keys with one value each
         assertEquals(bindings.size(), 2);
-        assertEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080});
-        assertEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090});
+        assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080});
+        assertArrayEquals(bindings.get(TCP_90), new Binding[] {BINDING_9090});
     }
 
     @Test
@@ -46,7 +48,7 @@ public void addTwoBindingsForSameExposedPort() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // one key with two values
         assertEquals(bindings.size(), 1);
-        assertEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090});
+        assertArrayEquals(bindings.get(TCP_80), new Binding[] {BINDING_8080, BINDING_9090});
     }
 
     @Test
@@ -55,6 +57,6 @@ public void addNullBindings() {
         Map<ExposedPort, Binding[]> bindings = ports.getBindings();
         // one key with two values
         assertEquals(bindings.size(), 1);
-        assertEquals(bindings.get(TCP_80), null);
+        assertNull(bindings.get(TCP_80));
     }
 }
diff --git a/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java b/src/test/java/com/github/dockerjava/api/model/PortsSerializingTest.java
@@ -7,6 +7,7 @@
 import java.util.Map;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
 
 public class PortsSerializingTest {
     private final ObjectMapper objectMapper = new ObjectMapper();
@@ -47,7 +48,7 @@ public void deserializingPortWithNullBindings() throws Exception {
         Map<ExposedPort, Binding[]> map = ports.getBindings();
         assertEquals(map.size(), 1);
 
-        assertEquals(map.get(ExposedPort.tcp(80)), null);
+        assertNull(map.get(ExposedPort.tcp(80)));
     }
 
     @Test
diff --git a/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java b/src/test/java/com/github/dockerjava/core/GoLangFileMatchTest.java
@@ -4,12 +4,14 @@
 package com.github.dockerjava.core;
 
 import com.github.dockerjava.core.exception.GoLangFileMatchException;
-import junit.framework.Assert;
 import org.apache.commons.io.FilenameUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.io.IOException;
 
 @RunWith(Parameterized.class)
@@ -97,9 +99,9 @@ public void testMatch() throws IOException {
         try {
             Boolean matched = GoLangFileMatch.match(pattern, s);
             if (testCase.expectException) {
-                Assert.fail("Expected GoFileMatchException");
+                fail("Expected GoFileMatchException");
             }
-            Assert.assertEquals(testCase.toString(), testCase.matches, matched);
+            assertEquals(testCase.toString(), testCase.matches, matched);
         } catch (GoLangFileMatchException e) {
             if (!testCase.expectException) {
                 throw e;
