android/okhttp
1
0
Fork 0
mirror of https://github.com/square/okhttp.git synced 2025-04-19 07:42:15 +03:00
Code Releases Activity

Move tests from okhttp-tests/src/test/java to okhttp/src/test/java

Browse Source 
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.
This commit is contained in:
Jesse Wilson 2019-03-25 21:01:32 -05:00
parent b650c4e954
commit 9837fea768
95 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
okhttp-tests/fuzzingserver-config.json → fuzzing/fuzzingserver-config.json
View File

0
okhttp-tests/fuzzingserver-expected.txt → fuzzing/fuzzingserver-expected.txt
View File

0
okhttp-tests/fuzzingserver-test.sh → fuzzing/fuzzingserver-test.sh
View File

0
okhttp-tests/fuzzingserver-update-expected.sh → fuzzing/fuzzingserver-update-expected.sh
View File

13
okhttp-tests/build.gradle
View File

@ -1,13 +0,0 @@
dependencies {
testImplementation deps.okio
testImplementation project(':okhttp')
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
}

8
okhttp/build.gradle
View File

@ -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'

0
okhttp-tests/src/test/java/okhttp3/AddressTest.java → okhttp/src/test/java/okhttp3/AddressTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/AutobahnTester.java → okhttp/src/test/java/okhttp3/AutobahnTester.java
View File

0
okhttp-tests/src/test/java/okhttp3/CacheControlTest.java → okhttp/src/test/java/okhttp3/CacheControlTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/CacheTest.java → okhttp/src/test/java/okhttp3/CacheTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/CallTest.java → okhttp/src/test/java/okhttp3/CallTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/CertificateChainCleanerTest.java → okhttp/src/test/java/okhttp3/CertificateChainCleanerTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/CertificatePinnerTest.java → okhttp/src/test/java/okhttp3/CertificatePinnerTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/CipherSuiteTest.java → okhttp/src/test/java/okhttp3/CipherSuiteTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/ConnectionCoalescingTest.java → okhttp/src/test/java/okhttp3/ConnectionCoalescingTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/ConnectionReuseTest.java → okhttp/src/test/java/okhttp3/ConnectionReuseTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/ConnectionSpecTest.java → okhttp/src/test/java/okhttp3/ConnectionSpecTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/ConscryptTest.java → okhttp/src/test/java/okhttp3/ConscryptTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/CookieTest.java → okhttp/src/test/java/okhttp3/CookieTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/CookiesTest.java → okhttp/src/test/java/okhttp3/CookiesTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/DelegatingSSLSocket.java → okhttp/src/test/java/okhttp3/DelegatingSSLSocket.java
View File

0
okhttp-tests/src/test/java/okhttp3/DelegatingSSLSocketFactory.java → okhttp/src/test/java/okhttp3/DelegatingSSLSocketFactory.java
View File

0
okhttp-tests/src/test/java/okhttp3/DelegatingServerSocketFactory.java → okhttp/src/test/java/okhttp3/DelegatingServerSocketFactory.java
View File

0
okhttp-tests/src/test/java/okhttp3/DelegatingSocketFactory.java → okhttp/src/test/java/okhttp3/DelegatingSocketFactory.java
View File

0
okhttp-tests/src/test/java/okhttp3/DispatcherTest.java → okhttp/src/test/java/okhttp3/DispatcherTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/DuplexTest.java → okhttp/src/test/java/okhttp3/DuplexTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/EventListenerTest.java → okhttp/src/test/java/okhttp3/EventListenerTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/FallbackTestClientSocketFactory.java → okhttp/src/test/java/okhttp3/FallbackTestClientSocketFactory.java
View File

0
okhttp-tests/src/test/java/okhttp3/FormBodyTest.java → okhttp/src/test/java/okhttp3/FormBodyTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/HeadersTest.java → okhttp/src/test/java/okhttp3/HeadersTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/HttpUrlTest.java → okhttp/src/test/java/okhttp3/HttpUrlTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/InterceptorTest.java → okhttp/src/test/java/okhttp3/InterceptorTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/MediaTypeTest.java → okhttp/src/test/java/okhttp3/MediaTypeTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/MultipartBodyTest.java → okhttp/src/test/java/okhttp3/MultipartBodyTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/OkHttpClientTest.java → okhttp/src/test/java/okhttp3/OkHttpClientTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/ProtocolTest.java → okhttp/src/test/java/okhttp3/ProtocolTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/RecordedResponse.java → okhttp/src/test/java/okhttp3/RecordedResponse.java
View File

0
okhttp-tests/src/test/java/okhttp3/RecordingCallback.java → okhttp/src/test/java/okhttp3/RecordingCallback.java
View File

0
okhttp-tests/src/test/java/okhttp3/RecordingEventListener.java → okhttp/src/test/java/okhttp3/RecordingEventListener.java
View File

0
okhttp-tests/src/test/java/okhttp3/RecordingWebSocketListener.java → okhttp/src/test/java/okhttp3/RecordingWebSocketListener.java
View File

0
okhttp-tests/src/test/java/okhttp3/RequestTest.java → okhttp/src/test/java/okhttp3/RequestTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/ResponseBodyTest.java → okhttp/src/test/java/okhttp3/ResponseBodyTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/ResponseTest.java → okhttp/src/test/java/okhttp3/ResponseTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/SocksProxy.java → okhttp/src/test/java/okhttp3/SocksProxy.java
View File

0
okhttp-tests/src/test/java/okhttp3/SocksProxyTest.java → okhttp/src/test/java/okhttp3/SocksProxyTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/TestLogHandler.java → okhttp/src/test/java/okhttp3/TestLogHandler.java
View File

0
okhttp-tests/src/test/java/okhttp3/TestTls13Request.java → okhttp/src/test/java/okhttp3/TestTls13Request.java
View File

0
okhttp-tests/src/test/java/okhttp3/URLConnectionTest.java → okhttp/src/test/java/okhttp3/URLConnectionTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/UrlComponentEncodingTester.java → okhttp/src/test/java/okhttp3/UrlComponentEncodingTester.java
View File

0
okhttp-tests/src/test/java/okhttp3/WebPlatformUrlTest.java → okhttp/src/test/java/okhttp3/WebPlatformUrlTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/WebPlatformUrlTestData.java → okhttp/src/test/java/okhttp3/WebPlatformUrlTestData.java
View File

0
okhttp-tests/src/test/java/okhttp3/WholeOperationTimeoutTest.java → okhttp/src/test/java/okhttp3/WholeOperationTimeoutTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/DoubleInetAddressDns.java → okhttp/src/test/java/okhttp3/internal/DoubleInetAddressDns.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/RecordingAuthenticator.java → okhttp/src/test/java/okhttp3/internal/RecordingAuthenticator.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/RecordingOkAuthenticator.java → okhttp/src/test/java/okhttp3/internal/RecordingOkAuthenticator.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/SocketRecorder.java → okhttp/src/test/java/okhttp3/internal/SocketRecorder.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/UtilTest.java → okhttp/src/test/java/okhttp3/internal/UtilTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/cache/DiskLruCacheTest.java → okhttp/src/test/java/okhttp3/internal/cache/DiskLruCacheTest.java vendored
View File

0
okhttp-tests/src/test/java/okhttp3/internal/cache2/FileOperatorTest.java → okhttp/src/test/java/okhttp3/internal/cache2/FileOperatorTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/cache2/RelayTest.java → okhttp/src/test/java/okhttp3/internal/cache2/RelayTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/connection/ConnectionPoolTest.java → okhttp/src/test/java/okhttp3/internal/connection/ConnectionPoolTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/connection/ConnectionSpecSelectorTest.java → okhttp/src/test/java/okhttp3/internal/connection/ConnectionSpecSelectorTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/connection/RouteExceptionTest.java → okhttp/src/test/java/okhttp3/internal/connection/RouteExceptionTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/connection/RouteSelectorTest.java → okhttp/src/test/java/okhttp3/internal/connection/RouteSelectorTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http/CancelTest.java → okhttp/src/test/java/okhttp3/internal/http/CancelTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http/ExternalHttp2Example.java → okhttp/src/test/java/okhttp3/internal/http/ExternalHttp2Example.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http/HttpDateTest.java → okhttp/src/test/java/okhttp3/internal/http/HttpDateTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http/RecordingProxySelector.java → okhttp/src/test/java/okhttp3/internal/http/RecordingProxySelector.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http/StatusLineTest.java → okhttp/src/test/java/okhttp3/internal/http/StatusLineTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java → okhttp/src/test/java/okhttp3/internal/http/ThreadInterruptTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/BaseTestHandler.java → okhttp/src/test/java/okhttp3/internal/http2/BaseTestHandler.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/FrameLogTest.java → okhttp/src/test/java/okhttp3/internal/http2/FrameLogTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/HpackTest.java → okhttp/src/test/java/okhttp3/internal/http2/HpackTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/Http2ConnectionTest.java → okhttp/src/test/java/okhttp3/internal/http2/Http2ConnectionTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/Http2Test.java → okhttp/src/test/java/okhttp3/internal/http2/Http2Test.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/HttpOverHttp2Test.java → okhttp/src/test/java/okhttp3/internal/http2/HttpOverHttp2Test.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/HuffmanTest.java → okhttp/src/test/java/okhttp3/internal/http2/HuffmanTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/MockHttp2Peer.java → okhttp/src/test/java/okhttp3/internal/http2/MockHttp2Peer.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/http2/SettingsTest.java → okhttp/src/test/java/okhttp3/internal/http2/SettingsTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/io/FaultyFileSystem.java → okhttp/src/test/java/okhttp3/internal/io/FaultyFileSystem.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java → okhttp/src/test/java/okhttp3/internal/platform/Jdk8WithJettyBootPlatformTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/platform/Jdk9PlatformTest.java → okhttp/src/test/java/okhttp3/internal/platform/Jdk9PlatformTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/platform/PlatformTest.java → okhttp/src/test/java/okhttp3/internal/platform/PlatformTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.java → okhttp/src/test/java/okhttp3/internal/publicsuffix/PublicSuffixDatabaseTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java → okhttp/src/test/java/okhttp3/internal/tls/CertificatePinnerChainValidationTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/tls/ClientAuthTest.java → okhttp/src/test/java/okhttp3/internal/tls/ClientAuthTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/tls/DistinguishedNameParserTest.java → okhttp/src/test/java/okhttp3/internal/tls/DistinguishedNameParserTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java → okhttp/src/test/java/okhttp3/internal/tls/HostnameVerifierTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java → okhttp/src/test/java/okhttp3/internal/ws/RealWebSocketTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java → okhttp/src/test/java/okhttp3/internal/ws/WebSocketHttpTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java → okhttp/src/test/java/okhttp3/internal/ws/WebSocketReaderTest.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketRecorder.java → okhttp/src/test/java/okhttp3/internal/ws/WebSocketRecorder.java
View File

0
okhttp-tests/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java → okhttp/src/test/java/okhttp3/internal/ws/WebSocketWriterTest.java
View File

0
okhttp-tests/src/test/resources/web-platform-test-urltestdata.txt → okhttp/src/test/resources/web-platform-test-urltestdata.txt
View File

1
settings.gradle
View File

@ -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'