android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-11-24 18:41:06 +03:00
Code Releases Activity

Use AssertJ in tests (#4713)

Browse Source
This commit is contained in:
Benoît Quenaudon
2019-03-13 21:07:33 -04:00
committed by Jesse Wilson
parent a217a390ee
commit 6c4855a7c7
92 changed files with 4937 additions and 4619 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
okhttp-testing-support/src/main/java/okhttp3/FakeDns.java
View File

@@ -18,12 +18,11 @@ package okhttp3;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
public final class FakeDns implements Dns {
private final Map<String, List<InetAddress>> hostAddresses = new LinkedHashMap<>();
@@ -56,7 +55,7 @@ public final class FakeDns implements Dns {
}
public void assertRequests(String... expectedHosts) {
assertEquals(Arrays.asList(expectedHosts), requestedHosts);
assertThat(requestedHosts).containsExactly(expectedHosts);
requestedHosts.clear();
}

4
okhttp-testing-support/src/main/java/okhttp3/RecordingCookieJar.java
View File

@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.Deque;
import java.util.List;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
public final class RecordingCookieJar implements CookieJar {
private final Deque<List<Cookie>> requestCookies = new ArrayDeque<>();
@@ -42,7 +42,7 @@ public final class RecordingCookieJar implements CookieJar {
for (Cookie cookie : actualCookies) {
actualCookieStrings.add(cookie.toString());
}
assertEquals(Arrays.asList(cookies), actualCookieStrings);
assertThat(actualCookieStrings).containsExactly(cookies);
}
@Override public void saveFromResponse(HttpUrl url, List<Cookie> cookies) {

4
okhttp-testing-support/src/main/java/okhttp3/TestUtil.java
View File

@@ -23,7 +23,7 @@ import java.util.Collections;
import java.util.List;
import okhttp3.internal.http2.Header;
import static org.junit.Assert.assertEquals;
import static org.assertj.core.api.Assertions.assertThat;
public final class TestUtil {
public static final InetSocketAddress UNREACHABLE_ADDRESS
@@ -88,6 +88,6 @@ public final class TestUtil {
public static void ensureAllConnectionsReleased(OkHttpClient client) {
client.connectionPool().evictAll();
assertEquals(0, client.connectionPool().idleConnectionCount());
assertThat(client.connectionPool().idleConnectionCount()).isEqualTo(0);
}
}