From 39ff689ad89107a69fabe7178a12d1850193b558 Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Sat, 3 Mar 2018 11:35:05 +1100 Subject: [PATCH] Rearange test code --- http-proxy.cabal | 160 ++++++++++++++------------- {Test => test/Test}/Gen.hs | 0 {Test => test/Test}/Request.hs | 0 {Test => test/Test}/ServerDef.hs | 0 {Test => test/Test}/TestServer.hs | 0 {Test => test/Test}/Util.hs | 0 {Test => test/Test}/Wai.hs | 0 {Test => test}/certificate.csr | 0 {Test => test}/certificate.pem | 0 {Test => test}/create_certificate.mk | 0 {Test => test}/key.pem | 0 Test/testsuite.hs => test/test-io.hs | 0 12 files changed, 85 insertions(+), 75 deletions(-) rename {Test => test/Test}/Gen.hs (100%) rename {Test => test/Test}/Request.hs (100%) rename {Test => test/Test}/ServerDef.hs (100%) rename {Test => test/Test}/TestServer.hs (100%) rename {Test => test/Test}/Util.hs (100%) rename {Test => test/Test}/Wai.hs (100%) rename {Test => test}/certificate.csr (100%) rename {Test => test}/certificate.pem (100%) rename {Test => test}/create_certificate.mk (100%) rename {Test => test}/key.pem (100%) rename Test/testsuite.hs => test/test-io.hs (100%) diff --git a/http-proxy.cabal b/http-proxy.cabal index f2aa257..1d1f87d 100644 --- a/http-proxy.cabal +++ b/http-proxy.cabal @@ -1,19 +1,19 @@ -Name: http-proxy -Version: 0.1.0.5 -License: BSD3 -License-file: LICENSE -Author: Michael Snoyman, Erik de Castro Lopo -Maintainer: erikd@mega-nerd.com -Homepage: https://github.com/erikd/http-proxy -Bug-reports: https://github.com/erikd/http-proxy/issues -Category: Web -Build-Type: Simple -Cabal-Version: >=1.8 -Stability: Experimental +name: http-proxy +version: 0.1.0.5 +license: BSD3 +license-file: LICENSE +author: Michael Snoyman, Erik de Castro Lopo +maintainer: erikd@mega-nerd.com +homepage: https://github.com/erikd/http-proxy +bug-reports: https://github.com/erikd/http-proxy/issues +category: Web +build-type: Simple +cabal-version: >= 1.10 +stability: Experimental -Synopsis: A library for writing HTTP and HTTPS proxies +synopsis: A library for writing HTTP and HTTPS proxies -Description: +description: http-proxy is a library for writing HTTP and HTTPS proxies. . Use of the Conduit library provides file streaming via the proxy in both @@ -25,73 +25,83 @@ Description: a functions for exception reporting and request re-writing. Eventually, this capability will be expanded to allow optional logging, disk caching etc. -Library - Build-Depends: base >= 4 && < 5 - , async >= 2.0 - , blaze-builder >= 0.4 - , bytestring >= 0.10 - , bytestring-lexing >= 0.4 - , case-insensitive >= 1.2 - , conduit >= 1.2 - , conduit-extra >= 1.1 - , http-client >= 0.5 && < 0.6 - , http-conduit >= 2.2 && < 2.3 - , http-types >= 0.8 - , mtl >= 2.1 - , network >= 2.6 - , resourcet >= 1.1 - , tls >= 1.2 - , text >= 1.2 - , transformers >= 0.3 - , wai >= 3.2 - , wai-conduit >= 3.0 - , warp >= 3.0 - , warp-tls >= 3.0 +library + default-language: Haskell2010 + ghc-options: -Wall -fwarn-tabs + if os(windows) + cpp-options: -DWINDOWS - Exposed-modules: Network.HTTP.Proxy - Other-modules: Network.HTTP.Proxy.Request + exposed-modules: Network.HTTP.Proxy + Network.HTTP.Proxy.Request - ghc-options: -Wall -fwarn-tabs - if os(windows) - Cpp-options: -DWINDOWS + build-depends: base >= 4 && < 5 + , async >= 2.0 + , blaze-builder >= 0.4 + , bytestring >= 0.10 + , bytestring-lexing >= 0.4 + , case-insensitive >= 1.2 + , conduit >= 1.2 + , conduit-extra >= 1.1 && < 1.3 + , http-client >= 0.5 && < 0.6 + , http-conduit >= 2.2 && < 2.3 + , http-types >= 0.8 + , mtl >= 2.1 + , network >= 2.6 + , resourcet >= 1.1 + -- Not used directly but necessary to enforce < 0.2 + , streaming-commons >= 0.1 && < 0.2 + , tls >= 1.2 + , text >= 1.2 + , transformers >= 0.3 + , wai >= 3.2 + , wai-conduit >= 3.0 + , warp >= 3.0 + , warp-tls >= 3.0 -Test-Suite testsuite - Type: exitcode-stdio-1.0 - Main-is: Test/testsuite.hs - build-depends: base - , async - , blaze-builder - , bytestring - , bytestring-lexing - , case-insensitive - , conduit - , connection >= 0.2 - , conduit-extra - , http-client - , http-conduit - , http-types - , hspec >= 2.1 - , network - , QuickCheck >= 2.7 - , random >= 1.1 - , resourcet - , text - , vault - , wai - , wai-conduit - , warp - , warp-tls - Other-modules: Test.Gen - , Test.Request - , Test.ServerDef - , Test.TestServer - , Test.Util - , Test.Wai - ghc-options: -Wall -fwarn-tabs +test-suite test-io + type: exitcode-stdio-1.0 + ghc-options: -Wall -fwarn-tabs -threaded if os(windows) - Cpp-options: -DWINDOWS + cpp-options: -DWINDOWS + default-language: Haskell2010 + hs-source-dirs: test + main-is: test-io.hs + + other-modules: Test.Gen + , Test.Request + , Test.ServerDef + , Test.TestServer + , Test.Util + , Test.Wai + + build-depends: base + , async + , blaze-builder + , bytestring + , bytestring-lexing + , case-insensitive + , conduit + , connection >= 0.2 + , conduit-extra + , http-client + , http-conduit + , http-proxy + , http-types + , hspec >= 2.1 + , network + , QuickCheck >= 2.7 + , random >= 1.1 + , resourcet + , text + , vault + , wai + , wai-conduit + , warp + , warp-tls + + source-repository head type: git diff --git a/Test/Gen.hs b/test/Test/Gen.hs similarity index 100% rename from Test/Gen.hs rename to test/Test/Gen.hs diff --git a/Test/Request.hs b/test/Test/Request.hs similarity index 100% rename from Test/Request.hs rename to test/Test/Request.hs diff --git a/Test/ServerDef.hs b/test/Test/ServerDef.hs similarity index 100% rename from Test/ServerDef.hs rename to test/Test/ServerDef.hs diff --git a/Test/TestServer.hs b/test/Test/TestServer.hs similarity index 100% rename from Test/TestServer.hs rename to test/Test/TestServer.hs diff --git a/Test/Util.hs b/test/Test/Util.hs similarity index 100% rename from Test/Util.hs rename to test/Test/Util.hs diff --git a/Test/Wai.hs b/test/Test/Wai.hs similarity index 100% rename from Test/Wai.hs rename to test/Test/Wai.hs diff --git a/Test/certificate.csr b/test/certificate.csr similarity index 100% rename from Test/certificate.csr rename to test/certificate.csr diff --git a/Test/certificate.pem b/test/certificate.pem similarity index 100% rename from Test/certificate.pem rename to test/certificate.pem diff --git a/Test/create_certificate.mk b/test/create_certificate.mk similarity index 100% rename from Test/create_certificate.mk rename to test/create_certificate.mk diff --git a/Test/key.pem b/test/key.pem similarity index 100% rename from Test/key.pem rename to test/key.pem diff --git a/Test/testsuite.hs b/test/test-io.hs similarity index 100% rename from Test/testsuite.hs rename to test/test-io.hs