Permalink
Browse files

#66 removed Jetty from even test dependencies

  • Loading branch information...
1 parent 1302adc commit be17d1b4f0c2dd552d8ea6de59ca725fe31779f5 Rob Fletcher committed Oct 28, 2013
Showing with 741 additions and 1,035 deletions.
  1. +3 −3 betamax-core/src/test/groovy/co/freeside/betamax/recorder/SequentialTapeWritingSpec.groovy
  2. +4 −3 betamax-core/src/test/groovy/co/freeside/betamax/recorder/TapeModeSpec.groovy
  3. +5 −7 betamax-core/src/test/groovy/co/freeside/betamax/tape/MultiThreadedTapeWritingSpec.groovy
  4. +145 −148 betamax-httpclient/src/test/groovy/co/freeside/betamax/httpclient/BetamaxHttpClientSpec.groovy
  5. +0 −14 betamax-netty/betamax-netty.gradle
  6. +0 −62 betamax-netty/src/main/java/co/freeside/betamax/proxy/netty/NettyBetamaxServer.java
  7. +0 −53 betamax-netty/src/test/groovy/co/freeside/betamax/proxy/netty/EchoServerHandler.java
  8. +4 −4 betamax-proxy/src/test/groovy/co/freeside/betamax/AnnotationSpec.groovy
  9. +8 −9 betamax-proxy/src/test/groovy/co/freeside/betamax/AnnotationTest.groovy
  10. +3 −3 betamax-proxy/src/test/groovy/co/freeside/betamax/LocalhostSpec.groovy
  11. +3 −3 betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpBuilderSpec.groovy
  12. +3 −3 betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpClient3Spec.groovy
  13. +84 −80 betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpClientSpec.groovy
  14. +28 −29 betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/HttpURLConnectionSpec.groovy
  15. +38 −32 betamax-proxy/src/test/groovy/co/freeside/betamax/compatibility/WsLiteSpec.groovy
  16. +3 −4 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/CustomSecureSocketFactorySpec.groovy
  17. +61 −59 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/HttpsSpec.groovy
  18. +6 −7 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/IgnoreHostsSpec.groovy
  19. +19 −20 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/NoTapeSpec.groovy
  20. +25 −26 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/PreExistingProxySpec.groovy
  21. +5 −6 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/ProxyRecordAndPlaybackSpec.groovy
  22. +1 −1 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/ProxyTimeoutSpec.groovy
  23. +4 −5 betamax-proxy/src/test/groovy/co/freeside/betamax/proxy/RequestMethodsSpec.groovy
  24. +1 −1 betamax-test-support/betamax-test-support.gradle
  25. +0 −31 betamax-test-support/src/main/groovy/co/freeside/betamax/util/FileUtils.groovy
  26. +18 −0 betamax-test-support/src/main/groovy/co/freeside/betamax/util/FileUtils.java
  27. +32 −51 betamax-test-support/src/main/groovy/co/freeside/betamax/util/server/EchoHandler.groovy
  28. +31 −13 betamax-test-support/src/main/groovy/co/freeside/betamax/util/server/HelloHandler.groovy
  29. +3 −8 ...betamax-test-support/src/main/groovy/co/freeside/betamax/util/server}/HttpChannelInitializer.java
  30. +48 −0 betamax-test-support/src/main/groovy/co/freeside/betamax/util/server/HttpsChannelInitializer.java
  31. +31 −14 betamax-test-support/src/main/groovy/co/freeside/betamax/util/server/IncrementingHandler.groovy
  32. +13 −22 betamax-test-support/src/main/groovy/co/freeside/betamax/util/server/SimpleSecureServer.groovy
  33. +80 −0 betamax-test-support/src/main/groovy/co/freeside/betamax/util/server/SimpleServer.java
  34. +28 −25 betamax-test-support/src/main/groovy/co/freeside/betamax/util/server/SlowHandler.groovy
  35. +0 −190 betamax-test-support/src/main/groovy/co/freeside/betamax/util/servlet/MockHttpServletResponse.groovy
  36. +0 −45 betamax-test-support/src/main/groovy/co/freeside/betamax/util/servlet/MockServletInputStream.groovy
  37. +0 −49 betamax-test-support/src/main/groovy/co/freeside/betamax/util/servlet/MockServletOutputStream.groovy
  38. +4 −4 ...ty → betamax-test-support}/src/test/groovy/co/freeside/betamax/proxy/netty/NettyServerSpec.groovy
  39. +0 −1 settings.gradle
@@ -21,7 +21,7 @@ import co.freeside.betamax.handler.*
import co.freeside.betamax.junit.Betamax
import co.freeside.betamax.junit.RecorderRule
import co.freeside.betamax.message.Response
-import co.freeside.betamax.proxy.jetty.SimpleServer
+import co.freeside.betamax.util.server.SimpleServer
import co.freeside.betamax.util.message.BasicRequest
import co.freeside.betamax.util.server.IncrementingHandler
import org.junit.Rule
@@ -38,11 +38,11 @@ class SequentialTapeWritingSpec extends Specification {
@Shared @AutoCleanup('deleteDir') def tapeRoot = newTempDir('tapes')
def recorder = new Recorder(tapeRoot: tapeRoot)
@Rule RecorderRule recorderRule = new RecorderRule(recorder)
- @Shared @AutoCleanup('stop') def endpoint = new SimpleServer()
+ @Shared @AutoCleanup('stop') def endpoint = new SimpleServer(IncrementingHandler)
def handler = new DefaultHandlerChain(recorder)
void setupSpec() {
- endpoint.start(IncrementingHandler)
+ endpoint.start()
}
@Betamax(tape = 'sequential tape', mode = WRITE_SEQUENTIAL)
@@ -19,7 +19,8 @@ package co.freeside.betamax.recorder
import co.freeside.betamax.Recorder
import co.freeside.betamax.handler.*
import co.freeside.betamax.message.Request
-import co.freeside.betamax.proxy.jetty.SimpleServer
+import co.freeside.betamax.util.server.HelloHandler
+import co.freeside.betamax.util.server.SimpleServer
import co.freeside.betamax.util.message.BasicRequest
import co.freeside.betamax.util.server.EchoHandler
import spock.lang.*
@@ -32,12 +33,12 @@ class TapeModeSpec extends Specification {
@Shared @AutoCleanup('deleteDir') File tapeRoot = newTempDir('tapes')
@Shared Recorder recorder = new Recorder(tapeRoot: tapeRoot)
- @Shared @AutoCleanup('stop') SimpleServer endpoint = new SimpleServer()
+ @Shared @AutoCleanup('stop') SimpleServer endpoint = new SimpleServer(HelloHandler)
HttpHandler handler = new DefaultHandlerChain(recorder)
Request request = new BasicRequest('GET', endpoint.url)
void setupSpec() {
- endpoint.start(EchoHandler)
+ endpoint.start()
}
void cleanup() {
@@ -18,12 +18,10 @@ package co.freeside.betamax.tape
import java.util.concurrent.CountDownLatch
import co.freeside.betamax.*
-import co.freeside.betamax.handler.*
-import co.freeside.betamax.junit.Betamax
-import co.freeside.betamax.junit.RecorderRule
-import co.freeside.betamax.proxy.jetty.SimpleServer
+import co.freeside.betamax.handler.DefaultHandlerChain
+import co.freeside.betamax.junit.*
import co.freeside.betamax.util.message.BasicRequest
-import co.freeside.betamax.util.server.HelloHandler
+import co.freeside.betamax.util.server.*
import org.junit.Rule
import spock.lang.*
import static co.freeside.betamax.util.FileUtils.newTempDir
@@ -37,10 +35,10 @@ class MultiThreadedTapeWritingSpec extends Specification {
@Rule RecorderRule recorderRule = new RecorderRule(recorder)
def handler = new DefaultHandlerChain(recorder)
- @Shared @AutoCleanup('stop') SimpleServer endpoint = new SimpleServer()
+ @Shared @AutoCleanup('stop') SimpleServer endpoint = new SimpleServer(HelloHandler)
void setupSpec() {
- endpoint.start(HelloHandler)
+ endpoint.start()
}
@Betamax(tape = 'multi_threaded_tape_writing_spec', mode = TapeMode.READ_WRITE)
Oops, something went wrong.

0 comments on commit be17d1b

Please sign in to comment.