Skip to content

Commit 083315a

Browse files
authored
Launcher for quick tests (#6437)
1 parent ec1d18d commit 083315a

File tree

34 files changed

+242
-116
lines changed

34 files changed

+242
-116
lines changed

.junit.run/Not Slow.run.xml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<component name="ProjectRunConfigurationManager">
2+
<configuration default="false" name="Not Slow" type="JUnit" factoryName="JUnit" singleton="false">
3+
<useClassPathOnly />
4+
<option name="MAIN_CLASS_NAME" value="" />
5+
<option name="METHOD_NAME" value="" />
6+
<option name="TEST_OBJECT" value="tags" />
7+
<option name="VM_PARAMETERS" value="-ea -Djunit.jupiter.extensions.autodetection.enabled=true" />
8+
<option name="PARAMETERS" value="" />
9+
<option name="TEST_SEARCH_SCOPE">
10+
<value defaultName="wholeProject" />
11+
</option>
12+
<tag value="!Slow &amp; !Slowish &amp; !Remote &amp; !Android" />
13+
<method v="2">
14+
<option name="Make" enabled="true" />
15+
</method>
16+
</configuration>
17+
</component>

android-test/src/androidTest/java/okhttp/android/test/OkHttpTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ import org.junit.jupiter.api.Assertions.fail
6060
import org.junit.jupiter.api.Assumptions.assumeTrue
6161
import org.junit.jupiter.api.BeforeEach
6262
import org.junit.jupiter.api.Disabled
63+
import org.junit.jupiter.api.Tag
6364
import org.junit.jupiter.api.Test
6465
import org.junit.jupiter.api.extension.ExtendWith
6566
import org.junit.jupiter.api.extension.RegisterExtension
@@ -88,6 +89,7 @@ import javax.net.ssl.X509TrustManager
8889
* Run with "./gradlew :android-test:connectedCheck" and make sure ANDROID_SDK_ROOT is set.
8990
*/
9091
@ExtendWith(MockWebServerExtension::class)
92+
@Tag("Slow")
9193
class OkHttpTest(val server: MockWebServer) {
9294
@Suppress("RedundantVisibilityModifier")
9395
@JvmField

android-test/src/androidTest/java/okhttp/android/test/letsencrypt/LetsEncryptClientTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,14 @@ import okhttp3.Request
2222
import okhttp3.tls.HandshakeCertificates
2323
import okhttp3.tls.decodeCertificatePem
2424
import org.assertj.core.api.Assertions.assertThat
25+
import org.junit.jupiter.api.Tag
2526
import org.junit.jupiter.api.Test
2627
import java.security.cert.X509Certificate
2728

2829
/**
2930
* Test for new Let's Encrypt Root Certificate.
3031
*/
32+
@Tag("Remote")
3133
class LetsEncryptClientTest {
3234
@Test fun get() {
3335
// These tests wont actually run before Android 8.0 as per

mockwebserver-deprecated/src/test/java/okhttp3/mockwebserver/MockWebServerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import org.junit.jupiter.api.AfterEach;
4545
import org.junit.jupiter.api.BeforeEach;
4646
import org.junit.jupiter.api.Disabled;
47+
import org.junit.jupiter.api.Tag;
4748
import org.junit.jupiter.api.Test;
4849
import org.junit.jupiter.api.Timeout;
4950
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -63,6 +64,7 @@
6364

6465
@SuppressWarnings({"ArraysAsListWithZeroOrOneArgument", "deprecation"})
6566
@Timeout(30)
67+
@Tag("Slow")
6668
public final class MockWebServerTest {
6769
@RegisterExtension public PlatformRule platform = new PlatformRule();
6870

mockwebserver/src/test/java/mockwebserver3/MockWebServerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
import org.junit.jupiter.api.AfterEach;
4444
import org.junit.jupiter.api.BeforeEach;
4545
import org.junit.jupiter.api.Disabled;
46+
import org.junit.jupiter.api.Tag;
4647
import org.junit.jupiter.api.Test;
4748
import org.junit.jupiter.api.Timeout;
4849
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -60,6 +61,7 @@
6061

6162
@SuppressWarnings({"ArraysAsListWithZeroOrOneArgument", "deprecation"})
6263
@Timeout(30)
64+
@Tag("Slow")
6365
public final class MockWebServerTest {
6466
@RegisterExtension public PlatformRule platform = new PlatformRule();
6567

native-image-tests/src/main/kotlin/okhttp3/SampleTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ class SampleTest {
2828
@JvmField @RegisterExtension val clientRule = OkHttpClientTestRule()
2929

3030
@Test
31-
fun failingTest() {
32-
assertThat("hello").isEqualTo("goodbye")
31+
fun passingTest() {
32+
assertThat("hello").isEqualTo("hello")
3333
}
3434

3535
@Test

okhttp-dnsoverhttps/src/test/java/okhttp3/dnsoverhttps/DnsOverHttpsTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
import okio.Buffer;
3737
import okio.ByteString;
3838
import org.junit.jupiter.api.BeforeEach;
39+
import org.junit.jupiter.api.Tag;
3940
import org.junit.jupiter.api.Test;
4041
import org.junit.jupiter.api.extension.ExtendWith;
4142
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -46,6 +47,7 @@
4647
import static org.junit.jupiter.api.Assertions.fail;
4748

4849
@ExtendWith(MockWebServerExtension.class)
50+
@Tag("Slowish")
4951
public class DnsOverHttpsTest {
5052
@RegisterExtension public final PlatformRule platform = new PlatformRule();
5153

okhttp-sse/src/test/java/okhttp3/sse/internal/EventSourceHttpTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@
2828
import okhttp3.testing.PlatformRule;
2929
import org.junit.jupiter.api.AfterEach;
3030
import org.junit.jupiter.api.BeforeEach;
31+
import org.junit.jupiter.api.Tag;
3132
import org.junit.jupiter.api.Test;
3233
import org.junit.jupiter.api.extension.ExtendWith;
3334
import org.junit.jupiter.api.extension.RegisterExtension;
3435

3536
import static org.assertj.core.api.Assertions.assertThat;
3637

3738
@ExtendWith(MockWebServerExtension.class)
39+
@Tag("Slowish")
3840
public final class EventSourceHttpTest {
3941
@RegisterExtension public final PlatformRule platform = new PlatformRule();
4042

okhttp/src/test/java/okhttp3/CacheTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
import okio.Okio;
5050
import org.junit.jupiter.api.AfterEach;
5151
import org.junit.jupiter.api.BeforeEach;
52+
import org.junit.jupiter.api.Tag;
5253
import org.junit.jupiter.api.Test;
5354
import org.junit.jupiter.api.extension.RegisterExtension;
5455

@@ -59,6 +60,7 @@
5960
import static org.assertj.core.data.Offset.offset;
6061
import static org.junit.jupiter.api.Assertions.fail;
6162

63+
@Tag("Slow")
6264
public final class CacheTest {
6365
private static final HostnameVerifier NULL_HOSTNAME_VERIFIER = (name, session) -> true;
6466

okhttp/src/test/java/okhttp3/CallTest.java

+14
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
import org.junit.jupiter.api.AfterEach;
8484
import org.junit.jupiter.api.BeforeEach;
8585
import org.junit.jupiter.api.Disabled;
86+
import org.junit.jupiter.api.Tag;
8687
import org.junit.jupiter.api.Test;
8788
import org.junit.jupiter.api.Timeout;
8889
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -2215,6 +2216,7 @@ public void interceptorCallsProceedWithoutClosingPriorResponse() throws Exceptio
22152216
assertThat(server.takeRequest().getSequenceNumber()).isEqualTo(2);
22162217
}
22172218

2219+
@Tag("Slow")
22182220
@Test public void follow20Redirects() throws Exception {
22192221
for (int i = 0; i < 20; i++) {
22202222
server.enqueue(new MockResponse()
@@ -2229,6 +2231,7 @@ public void interceptorCallsProceedWithoutClosingPriorResponse() throws Exceptio
22292231
.assertBody("Success!");
22302232
}
22312233

2234+
@Tag("Slow")
22322235
@Test public void follow20Redirects_Async() throws Exception {
22332236
for (int i = 0; i < 20; i++) {
22342237
server.enqueue(new MockResponse()
@@ -2245,6 +2248,7 @@ public void interceptorCallsProceedWithoutClosingPriorResponse() throws Exceptio
22452248
.assertBody("Success!");
22462249
}
22472250

2251+
@Tag("Slow")
22482252
@Test public void doesNotFollow21Redirects() throws Exception {
22492253
for (int i = 0; i < 21; i++) {
22502254
server.enqueue(new MockResponse()
@@ -2261,6 +2265,7 @@ public void interceptorCallsProceedWithoutClosingPriorResponse() throws Exceptio
22612265
}
22622266
}
22632267

2268+
@Tag("Slow")
22642269
@Test public void doesNotFollow21Redirects_Async() throws Exception {
22652270
for (int i = 0; i < 21; i++) {
22662271
server.enqueue(new MockResponse()
@@ -2323,10 +2328,12 @@ private String stringFill(char fillChar, int length) {
23232328
assertThat(server.getRequestCount()).isEqualTo(0);
23242329
}
23252330

2331+
@Tag("Slowish")
23262332
@Test public void cancelDuringHttpConnect() throws Exception {
23272333
cancelDuringConnect("http");
23282334
}
23292335

2336+
@Tag("Slowish")
23302337
@Test public void cancelDuringHttpsConnect() throws Exception {
23312338
cancelDuringConnect("https");
23322339
}
@@ -2768,6 +2775,7 @@ public void cancelWhileRequestHeadersAreSent_HTTP_2() throws Exception {
27682775
expect100ContinueEmptyRequestBody();
27692776
}
27702777

2778+
@Tag("Slowish")
27712779
@Test public void expect100ContinueTimesOutWithoutContinue() throws Exception {
27722780
server.enqueue(new MockResponse()
27732781
.setSocketPolicy(SocketPolicy.NO_RESPONSE));
@@ -2793,6 +2801,7 @@ public void cancelWhileRequestHeadersAreSent_HTTP_2() throws Exception {
27932801
assertThat(recordedRequest.getBody().readUtf8()).isEqualTo("");
27942802
}
27952803

2804+
@Tag("Slowish")
27962805
@Test public void expect100ContinueTimesOutWithoutContinue_HTTP2() throws Exception {
27972806
enableProtocol(Protocol.HTTP_2);
27982807
expect100ContinueTimesOutWithoutContinue();
@@ -2820,6 +2829,7 @@ public void cancelWhileRequestHeadersAreSent_HTTP_2() throws Exception {
28202829
serverRespondsWithUnsolicited100Continue();
28212830
}
28222831

2832+
@Tag("Slow")
28232833
@Test public void serverRespondsWith100ContinueOnly() throws Exception {
28242834
client = client.newBuilder()
28252835
.readTimeout(Duration.ofSeconds(1))
@@ -2844,6 +2854,7 @@ public void cancelWhileRequestHeadersAreSent_HTTP_2() throws Exception {
28442854
assertThat(recordedRequest.getBody().readUtf8()).isEqualTo("abc");
28452855
}
28462856

2857+
@Tag("Slow")
28472858
@Test public void serverRespondsWith100ContinueOnly_HTTP2() throws Exception {
28482859
enableProtocol(Protocol.HTTP_2);
28492860
serverRespondsWith100ContinueOnly();
@@ -2867,11 +2878,13 @@ public void cancelWhileRequestHeadersAreSent_HTTP_2() throws Exception {
28672878
assertThat(server.takeRequest().getSequenceNumber()).isEqualTo(1);
28682879
}
28692880

2881+
@Tag("Slow")
28702882
@Test public void successfulExpectContinuePermitsConnectionReuseWithHttp2() throws Exception {
28712883
enableProtocol(Protocol.HTTP_2);
28722884
successfulExpectContinuePermitsConnectionReuse();
28732885
}
28742886

2887+
@Tag("Slow")
28752888
@Test public void unsuccessfulExpectContinuePreventsConnectionReuse() throws Exception {
28762889
server.enqueue(new MockResponse());
28772890
server.enqueue(new MockResponse());
@@ -3604,6 +3617,7 @@ private RequestBody requestBody(final boolean chunked, final long size, final in
36043617
+ " Did you forget to close a response body?");
36053618
}
36063619

3620+
@Tag("Slowish")
36073621
@Test public void asyncLeakedResponseBodyLogsStackTrace() throws Exception {
36083622
server.enqueue(new MockResponse()
36093623
.setBody("This gets leaked."));

okhttp/src/test/java/okhttp3/ConnectionCoalescingTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,15 @@
3434
import okhttp3.tls.HandshakeCertificates;
3535
import okhttp3.tls.HeldCertificate;
3636
import org.junit.jupiter.api.BeforeEach;
37+
import org.junit.jupiter.api.Tag;
3738
import org.junit.jupiter.api.Test;
3839
import org.junit.jupiter.api.extension.RegisterExtension;
3940

4041
import static java.util.Arrays.asList;
4142
import static org.assertj.core.api.Assertions.assertThat;
4243
import static org.junit.jupiter.api.Assertions.fail;
4344

45+
@Tag("Slowish")
4446
public final class ConnectionCoalescingTest {
4547
@RegisterExtension public final PlatformRule platform = new PlatformRule();
4648
@RegisterExtension public final OkHttpClientTestRule clientTestRule = new OkHttpClientTestRule();

okhttp/src/test/java/okhttp3/ConnectionReuseTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import okhttp3.testing.PlatformRule;
2626
import okhttp3.tls.HandshakeCertificates;
2727
import org.junit.jupiter.api.BeforeEach;
28+
import org.junit.jupiter.api.Tag;
2829
import org.junit.jupiter.api.Test;
2930
import org.junit.jupiter.api.Timeout;
3031
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -36,6 +37,7 @@
3637
import static org.junit.jupiter.api.Assertions.fail;
3738

3839
@Timeout(30)
40+
@Tag("Slowish")
3941
public final class ConnectionReuseTest {
4042
@RegisterExtension public final PlatformRule platform = new PlatformRule();
4143
@RegisterExtension public final OkHttpClientTestRule clientTestRule = new OkHttpClientTestRule();

okhttp/src/test/java/okhttp3/DispatcherTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,15 @@
55
import java.util.concurrent.CountDownLatch;
66
import java.util.concurrent.atomic.AtomicBoolean;
77
import org.junit.jupiter.api.BeforeEach;
8+
import org.junit.jupiter.api.Tag;
89
import org.junit.jupiter.api.Test;
910
import org.junit.jupiter.api.extension.RegisterExtension;
1011

1112
import static java.util.concurrent.TimeUnit.SECONDS;
1213
import static org.assertj.core.api.Assertions.assertThat;
1314
import static org.junit.jupiter.api.Assertions.fail;
1415

16+
@Tag("Slowish")
1517
public final class DispatcherTest {
1618
@RegisterExtension public final OkHttpClientTestRule clientTestRule = new OkHttpClientTestRule();
1719

okhttp/src/test/java/okhttp3/DuplexTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import org.jetbrains.annotations.Nullable;
3838
import org.junit.jupiter.api.BeforeEach;
3939
import org.junit.jupiter.api.Disabled;
40+
import org.junit.jupiter.api.Tag;
4041
import org.junit.jupiter.api.Test;
4142
import org.junit.jupiter.api.Timeout;
4243
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -48,6 +49,7 @@
4849
import static org.junit.jupiter.api.Assertions.fail;
4950

5051
@Timeout(30)
52+
@Tag("Slowish")
5153
public final class DuplexTest {
5254
@RegisterExtension public final PlatformRule platform = new PlatformRule();
5355
@RegisterExtension public OkHttpClientTestRule clientTestRule = new OkHttpClientTestRule();

okhttp/src/test/java/okhttp3/EventListenerTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
import org.junit.Assert;
7070
import org.junit.jupiter.api.AfterEach;
7171
import org.junit.jupiter.api.BeforeEach;
72+
import org.junit.jupiter.api.Tag;
7273
import org.junit.jupiter.api.Test;
7374
import org.junit.jupiter.api.Timeout;
7475
import org.junit.jupiter.api.extension.RegisterExtension;
@@ -83,6 +84,7 @@
8384

8485
@Flaky // STDOUT logging enabled for test
8586
@Timeout(30)
87+
@Tag("Slow")
8688
public final class EventListenerTest {
8789
public static final Matcher<Response> anyResponse = CoreMatchers.any(Response.class);
8890

okhttp/src/test/java/okhttp3/InterceptorTest.java

+2
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@
4141
import okio.Sink;
4242
import okio.Source;
4343
import org.junit.jupiter.api.BeforeEach;
44+
import org.junit.jupiter.api.Tag;
4445
import org.junit.jupiter.api.Test;
4546
import org.junit.jupiter.api.extension.RegisterExtension;
4647

4748
import static org.assertj.core.api.Assertions.assertThat;
4849
import static org.junit.jupiter.api.Assertions.fail;
4950

51+
@Tag("Slow")
5052
public final class InterceptorTest {
5153
@RegisterExtension public final OkHttpClientTestRule clientTestRule = new OkHttpClientTestRule();
5254

okhttp/src/test/java/okhttp3/KotlinSourceModernTest.kt

+7
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,8 @@ import okio.BufferedSink
7676
import okio.BufferedSource
7777
import okio.ByteString
7878
import okio.Timeout
79+
import org.junit.jupiter.api.Assumptions.assumeFalse
80+
import org.junit.jupiter.api.BeforeEach
7981
import org.junit.jupiter.api.Disabled
8082
import org.junit.jupiter.api.Test
8183

@@ -95,6 +97,11 @@ import org.junit.jupiter.api.Test
9597
)
9698
@Disabled
9799
class KotlinSourceModernTest {
100+
@BeforeEach
101+
fun disabled() {
102+
assumeFalse(true)
103+
}
104+
98105
@Test
99106
fun address() {
100107
val address: Address = newAddress()

0 commit comments

Comments
 (0)