Skip to content

Commit 9837fea

Browse files
squarejessesquarejesse
committed
Move tests from okhttp-tests/src/test/java to okhttp/src/test/java
The previous module structure was necessary because Maven wouldn't allow mockwebserver to depend on okhttp/src and for okhttp/test to depend on mockwebserver. With Gradle this constraint is lifted and we can fold everything into a single module. I'm in a rush to do this now because it's necessary for Kotlin 'internal' tests to be in the same module.
1 parent b650c4e commit 9837fea

File tree

95 files changed

+8
-14
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+8
-14
lines changed

Diff for: ‎okhttp-tests/fuzzingserver-config.json renamed to ‎fuzzing/fuzzingserver-config.json

File renamed without changes.

Diff for: ‎okhttp-tests/fuzzingserver-expected.txt renamed to ‎fuzzing/fuzzingserver-expected.txt

File renamed without changes.

Diff for: ‎okhttp-tests/fuzzingserver-test.sh renamed to ‎fuzzing/fuzzingserver-test.sh

File renamed without changes.

Diff for: ‎okhttp-tests/fuzzingserver-update-expected.sh renamed to ‎fuzzing/fuzzingserver-update-expected.sh

File renamed without changes.

Diff for: ‎okhttp-tests/build.gradle

-13
This file was deleted.

Diff for: ‎okhttp/build.gradle

+8
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,16 @@ dependencies {
2929
compileOnly deps.jsr305
3030
compileOnly deps.animalSniffer
3131

32+
testImplementation deps.okio
33+
testImplementation project(':okhttp-testing-support')
34+
testImplementation project(':okhttp-tls')
35+
testImplementation project(':okhttp-urlconnection')
36+
testImplementation project(':mockwebserver')
37+
testImplementation project(':okhttp-logging-interceptor')
38+
testImplementation deps.conscrypt
3239
testImplementation deps.junit
3340
testImplementation deps.assertj
41+
testCompileOnly deps.jsr305
3442
}
3543

3644
apply plugin: 'me.champeau.gradle.japicmp'

Diff for: ‎okhttp-tests/src/test/java/okhttp3/AddressTest.java renamed to ‎okhttp/src/test/java/okhttp3/AddressTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/AutobahnTester.java renamed to ‎okhttp/src/test/java/okhttp3/AutobahnTester.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CacheControlTest.java renamed to ‎okhttp/src/test/java/okhttp3/CacheControlTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CacheTest.java renamed to ‎okhttp/src/test/java/okhttp3/CacheTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CallTest.java renamed to ‎okhttp/src/test/java/okhttp3/CallTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CertificateChainCleanerTest.java renamed to ‎okhttp/src/test/java/okhttp3/CertificateChainCleanerTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CertificatePinnerTest.java renamed to ‎okhttp/src/test/java/okhttp3/CertificatePinnerTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CipherSuiteTest.java renamed to ‎okhttp/src/test/java/okhttp3/CipherSuiteTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/ConnectionCoalescingTest.java renamed to ‎okhttp/src/test/java/okhttp3/ConnectionCoalescingTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/ConnectionReuseTest.java renamed to ‎okhttp/src/test/java/okhttp3/ConnectionReuseTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/ConnectionSpecTest.java renamed to ‎okhttp/src/test/java/okhttp3/ConnectionSpecTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/ConscryptTest.java renamed to ‎okhttp/src/test/java/okhttp3/ConscryptTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CookieTest.java renamed to ‎okhttp/src/test/java/okhttp3/CookieTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/CookiesTest.java renamed to ‎okhttp/src/test/java/okhttp3/CookiesTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/DelegatingSSLSocket.java renamed to ‎okhttp/src/test/java/okhttp3/DelegatingSSLSocket.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/DelegatingSSLSocketFactory.java renamed to ‎okhttp/src/test/java/okhttp3/DelegatingSSLSocketFactory.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/DelegatingServerSocketFactory.java renamed to ‎okhttp/src/test/java/okhttp3/DelegatingServerSocketFactory.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/DelegatingSocketFactory.java renamed to ‎okhttp/src/test/java/okhttp3/DelegatingSocketFactory.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/DispatcherTest.java renamed to ‎okhttp/src/test/java/okhttp3/DispatcherTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/DuplexTest.java renamed to ‎okhttp/src/test/java/okhttp3/DuplexTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/EventListenerTest.java renamed to ‎okhttp/src/test/java/okhttp3/EventListenerTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/FallbackTestClientSocketFactory.java renamed to ‎okhttp/src/test/java/okhttp3/FallbackTestClientSocketFactory.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/FormBodyTest.java renamed to ‎okhttp/src/test/java/okhttp3/FormBodyTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/HeadersTest.java renamed to ‎okhttp/src/test/java/okhttp3/HeadersTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/HttpUrlTest.java renamed to ‎okhttp/src/test/java/okhttp3/HttpUrlTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/InterceptorTest.java renamed to ‎okhttp/src/test/java/okhttp3/InterceptorTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/MediaTypeTest.java renamed to ‎okhttp/src/test/java/okhttp3/MediaTypeTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/MultipartBodyTest.java renamed to ‎okhttp/src/test/java/okhttp3/MultipartBodyTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/OkHttpClientTest.java renamed to ‎okhttp/src/test/java/okhttp3/OkHttpClientTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/ProtocolTest.java renamed to ‎okhttp/src/test/java/okhttp3/ProtocolTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/RecordedResponse.java renamed to ‎okhttp/src/test/java/okhttp3/RecordedResponse.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/RecordingCallback.java renamed to ‎okhttp/src/test/java/okhttp3/RecordingCallback.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/RecordingEventListener.java renamed to ‎okhttp/src/test/java/okhttp3/RecordingEventListener.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/RecordingWebSocketListener.java renamed to ‎okhttp/src/test/java/okhttp3/RecordingWebSocketListener.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/RequestTest.java renamed to ‎okhttp/src/test/java/okhttp3/RequestTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/ResponseBodyTest.java renamed to ‎okhttp/src/test/java/okhttp3/ResponseBodyTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/ResponseTest.java renamed to ‎okhttp/src/test/java/okhttp3/ResponseTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/SocksProxy.java renamed to ‎okhttp/src/test/java/okhttp3/SocksProxy.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/SocksProxyTest.java renamed to ‎okhttp/src/test/java/okhttp3/SocksProxyTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/TestLogHandler.java renamed to ‎okhttp/src/test/java/okhttp3/TestLogHandler.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/TestTls13Request.java renamed to ‎okhttp/src/test/java/okhttp3/TestTls13Request.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/URLConnectionTest.java renamed to ‎okhttp/src/test/java/okhttp3/URLConnectionTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/UrlComponentEncodingTester.java renamed to ‎okhttp/src/test/java/okhttp3/UrlComponentEncodingTester.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/WebPlatformUrlTest.java renamed to ‎okhttp/src/test/java/okhttp3/WebPlatformUrlTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/WebPlatformUrlTestData.java renamed to ‎okhttp/src/test/java/okhttp3/WebPlatformUrlTestData.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/WholeOperationTimeoutTest.java renamed to ‎okhttp/src/test/java/okhttp3/WholeOperationTimeoutTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/DoubleInetAddressDns.java renamed to ‎okhttp/src/test/java/okhttp3/internal/DoubleInetAddressDns.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/RecordingAuthenticator.java renamed to ‎okhttp/src/test/java/okhttp3/internal/RecordingAuthenticator.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/RecordingOkAuthenticator.java renamed to ‎okhttp/src/test/java/okhttp3/internal/RecordingOkAuthenticator.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/SocketRecorder.java renamed to ‎okhttp/src/test/java/okhttp3/internal/SocketRecorder.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/UtilTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/UtilTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/cache/DiskLruCacheTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/cache/DiskLruCacheTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/cache2/FileOperatorTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/cache2/FileOperatorTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/cache2/RelayTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/cache2/RelayTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/connection/ConnectionPoolTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/connection/ConnectionPoolTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/connection/ConnectionSpecSelectorTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/connection/ConnectionSpecSelectorTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/connection/RouteExceptionTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/connection/RouteExceptionTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/connection/RouteSelectorTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/connection/RouteSelectorTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http/CancelTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http/CancelTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http/ExternalHttp2Example.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http/ExternalHttp2Example.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http/HttpDateTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http/RecordingProxySelector.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http/RecordingProxySelector.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http/StatusLineTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/BaseTestHandler.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/BaseTestHandler.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/FrameLogTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/FrameLogTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/HpackTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/HpackTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/Http2ConnectionTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/Http2ConnectionTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/Http2Test.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/Http2Test.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/HttpOverHttp2Test.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/HttpOverHttp2Test.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/HuffmanTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/HuffmanTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/MockHttp2Peer.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/MockHttp2Peer.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/http2/SettingsTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/http2/SettingsTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/io/FaultyFileSystem.java renamed to ‎okhttp/src/test/java/okhttp3/internal/io/FaultyFileSystem.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/platform/Jdk9PlatformTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/platform/Jdk9PlatformTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/platform/PlatformTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/platform/PlatformTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/tls/ClientAuthTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/tls/ClientAuthTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/tls/DistinguishedNameParserTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/tls/DistinguishedNameParserTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketRecorder.java renamed to ‎okhttp/src/test/java/okhttp3/internal/ws/WebSocketRecorder.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java renamed to ‎okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java

File renamed without changes.

Diff for: ‎okhttp-tests/src/test/resources/web-platform-test-urltestdata.txt renamed to ‎okhttp/src/test/resources/web-platform-test-urltestdata.txt

File renamed without changes.

Diff for: ‎settings.gradle

-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ include ':okhttp-hpacktests'
66
include ':okhttp-logging-interceptor'
77
include ':okhttp-sse'
88
include ':okhttp-testing-support'
9-
include ':okhttp-tests'
109
include ':okhttp-tls'
1110
include ':okhttp-urlconnection'
1211
include ':samples:crawler'

0 commit comments

Comments
 (0)