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.
square · Mar 26, 2019 · 9837fea · 9837fea
1 parent b650c4e
commit 9837fea
Show file tree

Hide file tree

Showing 95 changed files with 8 additions and 14 deletions.
diff --git a/okhttp-tests/fuzzingserver-config.json → fuzzing/fuzzingserver-config.json b/okhttp-tests/fuzzingserver-config.json → fuzzing/fuzzingserver-config.json
diff --git a/okhttp-tests/fuzzingserver-expected.txt → fuzzing/fuzzingserver-expected.txt b/okhttp-tests/fuzzingserver-expected.txt → fuzzing/fuzzingserver-expected.txt
diff --git a/okhttp-tests/fuzzingserver-test.sh → fuzzing/fuzzingserver-test.sh b/okhttp-tests/fuzzingserver-test.sh → fuzzing/fuzzingserver-test.sh
diff --git a/...tp-tests/fuzzingserver-update-expected.sh → fuzzing/fuzzingserver-update-expected.sh b/...tp-tests/fuzzingserver-update-expected.sh → fuzzing/fuzzingserver-update-expected.sh
diff --git a/okhttp-tests/build.gradle b/okhttp-tests/build.gradle
diff --git a/okhttp/build.gradle b/okhttp/build.gradle
@@ -29,8 +29,16 @@ dependencies {
   compileOnly deps.jsr305
   compileOnly deps.animalSniffer
 
+  testImplementation deps.okio
+  testImplementation project(':okhttp-testing-support')
+  testImplementation project(':okhttp-tls')
+  testImplementation project(':okhttp-urlconnection')
+  testImplementation project(':mockwebserver')
+  testImplementation project(':okhttp-logging-interceptor')
+  testImplementation deps.conscrypt
   testImplementation deps.junit
   testImplementation deps.assertj
+  testCompileOnly deps.jsr305
 }
 
 apply plugin: 'me.champeau.gradle.japicmp'

diff --git a/...ts/src/test/java/okhttp3/AddressTest.java → ...tp/src/test/java/okhttp3/AddressTest.java b/...ts/src/test/java/okhttp3/AddressTest.java → ...tp/src/test/java/okhttp3/AddressTest.java
diff --git a/...src/test/java/okhttp3/AutobahnTester.java → ...src/test/java/okhttp3/AutobahnTester.java b/...src/test/java/okhttp3/AutobahnTester.java → ...src/test/java/okhttp3/AutobahnTester.java
diff --git a/...c/test/java/okhttp3/CacheControlTest.java → ...c/test/java/okhttp3/CacheControlTest.java b/...c/test/java/okhttp3/CacheControlTest.java → ...c/test/java/okhttp3/CacheControlTest.java
diff --git a/...ests/src/test/java/okhttp3/CacheTest.java → okhttp/src/test/java/okhttp3/CacheTest.java b/...ests/src/test/java/okhttp3/CacheTest.java → okhttp/src/test/java/okhttp3/CacheTest.java
diff --git a/...tests/src/test/java/okhttp3/CallTest.java → okhttp/src/test/java/okhttp3/CallTest.java b/...tests/src/test/java/okhttp3/CallTest.java → okhttp/src/test/java/okhttp3/CallTest.java
diff --git a/.../okhttp3/CertificateChainCleanerTest.java → .../okhttp3/CertificateChainCleanerTest.java b/.../okhttp3/CertificateChainCleanerTest.java → .../okhttp3/CertificateChainCleanerTest.java
diff --git a/...t/java/okhttp3/CertificatePinnerTest.java → ...t/java/okhttp3/CertificatePinnerTest.java b/...t/java/okhttp3/CertificatePinnerTest.java → ...t/java/okhttp3/CertificatePinnerTest.java
diff --git a/...rc/test/java/okhttp3/CipherSuiteTest.java → ...rc/test/java/okhttp3/CipherSuiteTest.java b/...rc/test/java/okhttp3/CipherSuiteTest.java → ...rc/test/java/okhttp3/CipherSuiteTest.java
diff --git a/...ava/okhttp3/ConnectionCoalescingTest.java → ...ava/okhttp3/ConnectionCoalescingTest.java b/...ava/okhttp3/ConnectionCoalescingTest.java → ...ava/okhttp3/ConnectionCoalescingTest.java
diff --git a/...est/java/okhttp3/ConnectionReuseTest.java → ...est/java/okhttp3/ConnectionReuseTest.java b/...est/java/okhttp3/ConnectionReuseTest.java → ...est/java/okhttp3/ConnectionReuseTest.java
diff --git a/...test/java/okhttp3/ConnectionSpecTest.java → ...test/java/okhttp3/ConnectionSpecTest.java b/...test/java/okhttp3/ConnectionSpecTest.java → ...test/java/okhttp3/ConnectionSpecTest.java
diff --git a/.../src/test/java/okhttp3/ConscryptTest.java → .../src/test/java/okhttp3/ConscryptTest.java b/.../src/test/java/okhttp3/ConscryptTest.java → .../src/test/java/okhttp3/ConscryptTest.java
diff --git a/...sts/src/test/java/okhttp3/CookieTest.java → okhttp/src/test/java/okhttp3/CookieTest.java b/...sts/src/test/java/okhttp3/CookieTest.java → okhttp/src/test/java/okhttp3/CookieTest.java
diff --git a/...ts/src/test/java/okhttp3/CookiesTest.java → ...tp/src/test/java/okhttp3/CookiesTest.java b/...ts/src/test/java/okhttp3/CookiesTest.java → ...tp/src/test/java/okhttp3/CookiesTest.java
diff --git a/...est/java/okhttp3/DelegatingSSLSocket.java → ...est/java/okhttp3/DelegatingSSLSocket.java b/...est/java/okhttp3/DelegatingSSLSocket.java → ...est/java/okhttp3/DelegatingSSLSocket.java
diff --git a/...a/okhttp3/DelegatingSSLSocketFactory.java → ...a/okhttp3/DelegatingSSLSocketFactory.java b/...a/okhttp3/DelegatingSSLSocketFactory.java → ...a/okhttp3/DelegatingSSLSocketFactory.java
diff --git a/...khttp3/DelegatingServerSocketFactory.java → ...khttp3/DelegatingServerSocketFactory.java b/...khttp3/DelegatingServerSocketFactory.java → ...khttp3/DelegatingServerSocketFactory.java
diff --git a/...java/okhttp3/DelegatingSocketFactory.java → ...java/okhttp3/DelegatingSocketFactory.java b/...java/okhttp3/DelegatingSocketFactory.java → ...java/okhttp3/DelegatingSocketFactory.java
diff --git a/...src/test/java/okhttp3/DispatcherTest.java → ...src/test/java/okhttp3/DispatcherTest.java b/...src/test/java/okhttp3/DispatcherTest.java → ...src/test/java/okhttp3/DispatcherTest.java
diff --git a/...sts/src/test/java/okhttp3/DuplexTest.java → okhttp/src/test/java/okhttp3/DuplexTest.java b/...sts/src/test/java/okhttp3/DuplexTest.java → okhttp/src/test/java/okhttp3/DuplexTest.java
diff --git a/.../test/java/okhttp3/EventListenerTest.java → .../test/java/okhttp3/EventListenerTest.java b/.../test/java/okhttp3/EventListenerTest.java → .../test/java/okhttp3/EventListenerTest.java
diff --git a/...ttp3/FallbackTestClientSocketFactory.java → ...ttp3/FallbackTestClientSocketFactory.java b/...ttp3/FallbackTestClientSocketFactory.java → ...ttp3/FallbackTestClientSocketFactory.java
diff --git a/...s/src/test/java/okhttp3/FormBodyTest.java → ...p/src/test/java/okhttp3/FormBodyTest.java b/...s/src/test/java/okhttp3/FormBodyTest.java → ...p/src/test/java/okhttp3/FormBodyTest.java
diff --git a/...ts/src/test/java/okhttp3/HeadersTest.java → ...tp/src/test/java/okhttp3/HeadersTest.java b/...ts/src/test/java/okhttp3/HeadersTest.java → ...tp/src/test/java/okhttp3/HeadersTest.java
diff --git a/...ts/src/test/java/okhttp3/HttpUrlTest.java → ...tp/src/test/java/okhttp3/HttpUrlTest.java b/...ts/src/test/java/okhttp3/HttpUrlTest.java → ...tp/src/test/java/okhttp3/HttpUrlTest.java
diff --git a/...rc/test/java/okhttp3/InterceptorTest.java → ...rc/test/java/okhttp3/InterceptorTest.java b/...rc/test/java/okhttp3/InterceptorTest.java → ...rc/test/java/okhttp3/InterceptorTest.java
diff --git a/.../src/test/java/okhttp3/MediaTypeTest.java → .../src/test/java/okhttp3/MediaTypeTest.java b/.../src/test/java/okhttp3/MediaTypeTest.java → .../src/test/java/okhttp3/MediaTypeTest.java
diff --git a/.../test/java/okhttp3/MultipartBodyTest.java → .../test/java/okhttp3/MultipartBodyTest.java b/.../test/java/okhttp3/MultipartBodyTest.java → .../test/java/okhttp3/MultipartBodyTest.java
diff --git a/...c/test/java/okhttp3/OkHttpClientTest.java → ...c/test/java/okhttp3/OkHttpClientTest.java b/...c/test/java/okhttp3/OkHttpClientTest.java → ...c/test/java/okhttp3/OkHttpClientTest.java
diff --git a/...s/src/test/java/okhttp3/ProtocolTest.java → ...p/src/test/java/okhttp3/ProtocolTest.java b/...s/src/test/java/okhttp3/ProtocolTest.java → ...p/src/test/java/okhttp3/ProtocolTest.java
diff --git a/...c/test/java/okhttp3/RecordedResponse.java → ...c/test/java/okhttp3/RecordedResponse.java b/...c/test/java/okhttp3/RecordedResponse.java → ...c/test/java/okhttp3/RecordedResponse.java
diff --git a/.../test/java/okhttp3/RecordingCallback.java → .../test/java/okhttp3/RecordingCallback.java b/.../test/java/okhttp3/RecordingCallback.java → .../test/java/okhttp3/RecordingCallback.java
diff --git a/.../java/okhttp3/RecordingEventListener.java → .../java/okhttp3/RecordingEventListener.java b/.../java/okhttp3/RecordingEventListener.java → .../java/okhttp3/RecordingEventListener.java
diff --git a/...a/okhttp3/RecordingWebSocketListener.java → ...a/okhttp3/RecordingWebSocketListener.java b/...a/okhttp3/RecordingWebSocketListener.java → ...a/okhttp3/RecordingWebSocketListener.java
diff --git a/...ts/src/test/java/okhttp3/RequestTest.java → ...tp/src/test/java/okhttp3/RequestTest.java b/...ts/src/test/java/okhttp3/RequestTest.java → ...tp/src/test/java/okhttp3/RequestTest.java
diff --git a/...c/test/java/okhttp3/ResponseBodyTest.java → ...c/test/java/okhttp3/ResponseBodyTest.java b/...c/test/java/okhttp3/ResponseBodyTest.java → ...c/test/java/okhttp3/ResponseBodyTest.java
diff --git a/...s/src/test/java/okhttp3/ResponseTest.java → ...p/src/test/java/okhttp3/ResponseTest.java b/...s/src/test/java/okhttp3/ResponseTest.java → ...p/src/test/java/okhttp3/ResponseTest.java
diff --git a/...sts/src/test/java/okhttp3/SocksProxy.java → okhttp/src/test/java/okhttp3/SocksProxy.java b/...sts/src/test/java/okhttp3/SocksProxy.java → okhttp/src/test/java/okhttp3/SocksProxy.java
diff --git a/...src/test/java/okhttp3/SocksProxyTest.java → ...src/test/java/okhttp3/SocksProxyTest.java b/...src/test/java/okhttp3/SocksProxyTest.java → ...src/test/java/okhttp3/SocksProxyTest.java
diff --git a/...src/test/java/okhttp3/TestLogHandler.java → ...src/test/java/okhttp3/TestLogHandler.java b/...src/test/java/okhttp3/TestLogHandler.java → ...src/test/java/okhttp3/TestLogHandler.java
diff --git a/...c/test/java/okhttp3/TestTls13Request.java → ...c/test/java/okhttp3/TestTls13Request.java b/...c/test/java/okhttp3/TestTls13Request.java → ...c/test/java/okhttp3/TestTls13Request.java
diff --git a/.../test/java/okhttp3/URLConnectionTest.java → .../test/java/okhttp3/URLConnectionTest.java b/.../test/java/okhttp3/URLConnectionTest.java → .../test/java/okhttp3/URLConnectionTest.java
diff --git a/...a/okhttp3/UrlComponentEncodingTester.java → ...a/okhttp3/UrlComponentEncodingTester.java b/...a/okhttp3/UrlComponentEncodingTester.java → ...a/okhttp3/UrlComponentEncodingTester.java
diff --git a/...test/java/okhttp3/WebPlatformUrlTest.java → ...test/java/okhttp3/WebPlatformUrlTest.java b/...test/java/okhttp3/WebPlatformUrlTest.java → ...test/java/okhttp3/WebPlatformUrlTest.java
diff --git a/.../java/okhttp3/WebPlatformUrlTestData.java → .../java/okhttp3/WebPlatformUrlTestData.java b/.../java/okhttp3/WebPlatformUrlTestData.java → .../java/okhttp3/WebPlatformUrlTestData.java
diff --git a/...va/okhttp3/WholeOperationTimeoutTest.java → ...va/okhttp3/WholeOperationTimeoutTest.java b/...va/okhttp3/WholeOperationTimeoutTest.java → ...va/okhttp3/WholeOperationTimeoutTest.java
diff --git a/...khttp3/internal/DoubleInetAddressDns.java → ...khttp3/internal/DoubleInetAddressDns.java b/...khttp3/internal/DoubleInetAddressDns.java → ...khttp3/internal/DoubleInetAddressDns.java
diff --git a/...ttp3/internal/RecordingAuthenticator.java → ...ttp3/internal/RecordingAuthenticator.java b/...ttp3/internal/RecordingAuthenticator.java → ...ttp3/internal/RecordingAuthenticator.java
diff --git a/...p3/internal/RecordingOkAuthenticator.java → ...p3/internal/RecordingOkAuthenticator.java b/...p3/internal/RecordingOkAuthenticator.java → ...p3/internal/RecordingOkAuthenticator.java
diff --git a/...java/okhttp3/internal/SocketRecorder.java → ...java/okhttp3/internal/SocketRecorder.java b/...java/okhttp3/internal/SocketRecorder.java → ...java/okhttp3/internal/SocketRecorder.java
diff --git a/.../test/java/okhttp3/internal/UtilTest.java → .../test/java/okhttp3/internal/UtilTest.java b/.../test/java/okhttp3/internal/UtilTest.java → .../test/java/okhttp3/internal/UtilTest.java
diff --git a/...ttp3/internal/cache/DiskLruCacheTest.java → ...ttp3/internal/cache/DiskLruCacheTest.java b/...ttp3/internal/cache/DiskLruCacheTest.java → ...ttp3/internal/cache/DiskLruCacheTest.java
diff --git a/...tp3/internal/cache2/FileOperatorTest.java → ...tp3/internal/cache2/FileOperatorTest.java b/...tp3/internal/cache2/FileOperatorTest.java → ...tp3/internal/cache2/FileOperatorTest.java
diff --git a/...va/okhttp3/internal/cache2/RelayTest.java → ...va/okhttp3/internal/cache2/RelayTest.java b/...va/okhttp3/internal/cache2/RelayTest.java → ...va/okhttp3/internal/cache2/RelayTest.java
diff --git a/...ternal/connection/ConnectionPoolTest.java → ...ternal/connection/ConnectionPoolTest.java b/...ternal/connection/ConnectionPoolTest.java → ...ternal/connection/ConnectionPoolTest.java
diff --git a/...onnection/ConnectionSpecSelectorTest.java → ...onnection/ConnectionSpecSelectorTest.java b/...onnection/ConnectionSpecSelectorTest.java → ...onnection/ConnectionSpecSelectorTest.java
diff --git a/...ternal/connection/RouteExceptionTest.java → ...ternal/connection/RouteExceptionTest.java b/...ternal/connection/RouteExceptionTest.java → ...ternal/connection/RouteExceptionTest.java
diff --git a/...nternal/connection/RouteSelectorTest.java → ...nternal/connection/RouteSelectorTest.java b/...nternal/connection/RouteSelectorTest.java → ...nternal/connection/RouteSelectorTest.java
diff --git a/...ava/okhttp3/internal/http/CancelTest.java → ...ava/okhttp3/internal/http/CancelTest.java b/...ava/okhttp3/internal/http/CancelTest.java → ...ava/okhttp3/internal/http/CancelTest.java
diff --git a/...3/internal/http/ExternalHttp2Example.java → ...3/internal/http/ExternalHttp2Example.java b/...3/internal/http/ExternalHttp2Example.java → ...3/internal/http/ExternalHttp2Example.java
diff --git a/...a/okhttp3/internal/http/HttpDateTest.java → ...a/okhttp3/internal/http/HttpDateTest.java b/...a/okhttp3/internal/http/HttpDateTest.java → ...a/okhttp3/internal/http/HttpDateTest.java
diff --git a/...internal/http/RecordingProxySelector.java → ...internal/http/RecordingProxySelector.java b/...internal/http/RecordingProxySelector.java → ...internal/http/RecordingProxySelector.java
diff --git a/...okhttp3/internal/http/StatusLineTest.java → ...okhttp3/internal/http/StatusLineTest.java b/...okhttp3/internal/http/StatusLineTest.java → ...okhttp3/internal/http/StatusLineTest.java
diff --git a/...p3/internal/http/ThreadInterruptTest.java → ...p3/internal/http/ThreadInterruptTest.java b/...p3/internal/http/ThreadInterruptTest.java → ...p3/internal/http/ThreadInterruptTest.java
diff --git a/...http3/internal/http2/BaseTestHandler.java → ...http3/internal/http2/BaseTestHandler.java b/...http3/internal/http2/BaseTestHandler.java → ...http3/internal/http2/BaseTestHandler.java
diff --git a/.../okhttp3/internal/http2/FrameLogTest.java → .../okhttp3/internal/http2/FrameLogTest.java b/.../okhttp3/internal/http2/FrameLogTest.java → .../okhttp3/internal/http2/FrameLogTest.java
diff --git a/...ava/okhttp3/internal/http2/HpackTest.java → ...ava/okhttp3/internal/http2/HpackTest.java b/...ava/okhttp3/internal/http2/HpackTest.java → ...ava/okhttp3/internal/http2/HpackTest.java
diff --git a/...3/internal/http2/Http2ConnectionTest.java → ...3/internal/http2/Http2ConnectionTest.java b/...3/internal/http2/Http2ConnectionTest.java → ...3/internal/http2/Http2ConnectionTest.java
diff --git a/...ava/okhttp3/internal/http2/Http2Test.java → ...ava/okhttp3/internal/http2/Http2Test.java b/...ava/okhttp3/internal/http2/Http2Test.java → ...ava/okhttp3/internal/http2/Http2Test.java
diff --git a/...tp3/internal/http2/HttpOverHttp2Test.java → ...tp3/internal/http2/HttpOverHttp2Test.java b/...tp3/internal/http2/HttpOverHttp2Test.java → ...tp3/internal/http2/HttpOverHttp2Test.java
diff --git a/...a/okhttp3/internal/http2/HuffmanTest.java → ...a/okhttp3/internal/http2/HuffmanTest.java b/...a/okhttp3/internal/http2/HuffmanTest.java → ...a/okhttp3/internal/http2/HuffmanTest.java
diff --git a/...okhttp3/internal/http2/MockHttp2Peer.java → ...okhttp3/internal/http2/MockHttp2Peer.java b/...okhttp3/internal/http2/MockHttp2Peer.java → ...okhttp3/internal/http2/MockHttp2Peer.java
diff --git a/.../okhttp3/internal/http2/SettingsTest.java → .../okhttp3/internal/http2/SettingsTest.java b/.../okhttp3/internal/http2/SettingsTest.java → .../okhttp3/internal/http2/SettingsTest.java
diff --git a/...okhttp3/internal/io/FaultyFileSystem.java → ...okhttp3/internal/io/FaultyFileSystem.java b/...okhttp3/internal/io/FaultyFileSystem.java → ...okhttp3/internal/io/FaultyFileSystem.java
diff --git a/...atform/Jdk8WithJettyBootPlatformTest.java → ...atform/Jdk8WithJettyBootPlatformTest.java b/...atform/Jdk8WithJettyBootPlatformTest.java → ...atform/Jdk8WithJettyBootPlatformTest.java
diff --git a/...3/internal/platform/Jdk9PlatformTest.java → ...3/internal/platform/Jdk9PlatformTest.java b/...3/internal/platform/Jdk9PlatformTest.java → ...3/internal/platform/Jdk9PlatformTest.java
diff --git a/...http3/internal/platform/PlatformTest.java → ...http3/internal/platform/PlatformTest.java b/...http3/internal/platform/PlatformTest.java → ...http3/internal/platform/PlatformTest.java
diff --git a/...ublicsuffix/PublicSuffixDatabaseTest.java → ...ublicsuffix/PublicSuffixDatabaseTest.java b/...ublicsuffix/PublicSuffixDatabaseTest.java → ...ublicsuffix/PublicSuffixDatabaseTest.java
diff --git a/...CertificatePinnerChainValidationTest.java → ...CertificatePinnerChainValidationTest.java b/...CertificatePinnerChainValidationTest.java → ...CertificatePinnerChainValidationTest.java
diff --git a/.../okhttp3/internal/tls/ClientAuthTest.java → .../okhttp3/internal/tls/ClientAuthTest.java b/.../okhttp3/internal/tls/ClientAuthTest.java → .../okhttp3/internal/tls/ClientAuthTest.java
diff --git a/...rnal/tls/DistinguishedNameParserTest.java → ...rnal/tls/DistinguishedNameParserTest.java b/...rnal/tls/DistinguishedNameParserTest.java → ...rnal/tls/DistinguishedNameParserTest.java
diff --git a/...p3/internal/tls/HostnameVerifierTest.java → ...p3/internal/tls/HostnameVerifierTest.java b/...p3/internal/tls/HostnameVerifierTest.java → ...p3/internal/tls/HostnameVerifierTest.java
diff --git a/...khttp3/internal/ws/RealWebSocketTest.java → ...khttp3/internal/ws/RealWebSocketTest.java b/...khttp3/internal/ws/RealWebSocketTest.java → ...khttp3/internal/ws/RealWebSocketTest.java
diff --git a/...khttp3/internal/ws/WebSocketHttpTest.java → ...khttp3/internal/ws/WebSocketHttpTest.java b/...khttp3/internal/ws/WebSocketHttpTest.java → ...khttp3/internal/ws/WebSocketHttpTest.java
diff --git a/...ttp3/internal/ws/WebSocketReaderTest.java → ...ttp3/internal/ws/WebSocketReaderTest.java b/...ttp3/internal/ws/WebSocketReaderTest.java → ...ttp3/internal/ws/WebSocketReaderTest.java
diff --git a/...khttp3/internal/ws/WebSocketRecorder.java → ...khttp3/internal/ws/WebSocketRecorder.java b/...khttp3/internal/ws/WebSocketRecorder.java → ...khttp3/internal/ws/WebSocketRecorder.java
diff --git a/...ttp3/internal/ws/WebSocketWriterTest.java → ...ttp3/internal/ws/WebSocketWriterTest.java b/...ttp3/internal/ws/WebSocketWriterTest.java → ...ttp3/internal/ws/WebSocketWriterTest.java
diff --git a/...sources/web-platform-test-urltestdata.txt → ...sources/web-platform-test-urltestdata.txt b/...sources/web-platform-test-urltestdata.txt → ...sources/web-platform-test-urltestdata.txt
diff --git a/settings.gradle b/settings.gradle
@@ -6,7 +6,6 @@ include ':okhttp-hpacktests'
 include ':okhttp-logging-interceptor'
 include ':okhttp-sse'
 include ':okhttp-testing-support'
-include ':okhttp-tests'
 include ':okhttp-tls'
 include ':okhttp-urlconnection'
 include ':samples:crawler'