From 8d5f207c8d3dc1995574aaa927b75efc52148cb7 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 10 Mar 2013 15:21:54 +0200
Subject: [PATCH] Removed Yesod.Internal.TestApi

---
 yesod-core/Yesod/{ => Core}/Internal/Request.hs  |  2 +-
 yesod-core/Yesod/Core/Run.hs                     |  2 +-
 yesod-core/Yesod/Handler.hs                      |  2 +-
 yesod-core/Yesod/Internal/Core.hs                |  2 +-
 yesod-core/Yesod/Internal/TestApi.hs             | 11 -----------
 yesod-core/test/YesodCoreTest/InternalRequest.hs |  2 +-
 yesod-core/yesod-core.cabal                      |  3 +--
 7 files changed, 6 insertions(+), 18 deletions(-)
 rename yesod-core/Yesod/{ => Core}/Internal/Request.hs (99%)
 delete mode 100644 yesod-core/Yesod/Internal/TestApi.hs

diff --git a/yesod-core/Yesod/Internal/Request.hs b/yesod-core/Yesod/Core/Internal/Request.hs
similarity index 99%
rename from yesod-core/Yesod/Internal/Request.hs
rename to yesod-core/Yesod/Core/Internal/Request.hs
index 5dbc242a..f52d07fc 100644
--- a/yesod-core/Yesod/Internal/Request.hs
+++ b/yesod-core/Yesod/Core/Internal/Request.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE CPP #-}
-module Yesod.Internal.Request
+module Yesod.Core.Internal.Request
     ( parseWaiRequest
     , RequestBodyContents
     , FileInfo
diff --git a/yesod-core/Yesod/Core/Run.hs b/yesod-core/Yesod/Core/Run.hs
index b2af0d4b..e13356af 100644
--- a/yesod-core/Yesod/Core/Run.hs
+++ b/yesod-core/Yesod/Core/Run.hs
@@ -43,7 +43,7 @@ import           Web.Cookie                   (renderSetCookie)
 import           Yesod.Content
 import           Yesod.Core.Class
 import           Yesod.Core.Types
-import           Yesod.Internal.Request       (parseWaiRequest, tokenKey,
+import           Yesod.Core.Internal.Request  (parseWaiRequest, tokenKey,
                                                tooLargeResponse)
 import           Yesod.Routes.Class           (Route, renderRoute)
 
diff --git a/yesod-core/Yesod/Handler.hs b/yesod-core/Yesod/Handler.hs
index fa898fb6..15e21751 100644
--- a/yesod-core/Yesod/Handler.hs
+++ b/yesod-core/Yesod/Handler.hs
@@ -129,7 +129,7 @@ module Yesod.Handler
     ) where
 
 import Prelude hiding (catch)
-import Yesod.Internal.Request
+import Yesod.Core.Internal.Request
 import Data.Time (UTCTime, getCurrentTime, addUTCTime)
 
 import Control.Exception hiding (Handler, catch, finally)
diff --git a/yesod-core/Yesod/Internal/Core.hs b/yesod-core/Yesod/Internal/Core.hs
index 7aaab853..4a8a3a4e 100644
--- a/yesod-core/Yesod/Internal/Core.hs
+++ b/yesod-core/Yesod/Internal/Core.hs
@@ -47,7 +47,7 @@ import Yesod.Routes.Class
 
 import qualified Network.Wai as W
 import Yesod.Internal.Session
-import Yesod.Internal.Request
+import Yesod.Core.Internal.Request
 import Data.Text (Text)
 import qualified Paths_yesod_core
 import Data.Version (showVersion)
diff --git a/yesod-core/Yesod/Internal/TestApi.hs b/yesod-core/Yesod/Internal/TestApi.hs
deleted file mode 100644
index bbb352ef..00000000
--- a/yesod-core/Yesod/Internal/TestApi.hs
+++ /dev/null
@@ -1,11 +0,0 @@
---
--- | WARNING: This module exposes internal interfaces solely for the
--- purpose of facilitating cabal-driven testing of said interfaces.
--- This module is NOT part of the public Yesod API and should NOT be
--- imported by library users.
---
-module Yesod.Internal.TestApi
-  ( randomString, parseWaiRequest
-  ) where
-
-import Yesod.Internal.Request (randomString, parseWaiRequest)
diff --git a/yesod-core/test/YesodCoreTest/InternalRequest.hs b/yesod-core/test/YesodCoreTest/InternalRequest.hs
index 0c3df884..90834485 100644
--- a/yesod-core/test/YesodCoreTest/InternalRequest.hs
+++ b/yesod-core/test/YesodCoreTest/InternalRequest.hs
@@ -6,7 +6,7 @@ import System.Random (StdGen, mkStdGen)
 
 import Network.Wai as W
 import Network.Wai.Test
-import Yesod.Internal.TestApi (randomString, parseWaiRequest)
+import Yesod.Core.Internal.Request (randomString, parseWaiRequest)
 import Test.Hspec
 import Data.Monoid (mempty)
 import Data.Map (singleton)
diff --git a/yesod-core/yesod-core.cabal b/yesod-core/yesod-core.cabal
index 370530b2..0285a672 100644
--- a/yesod-core/yesod-core.cabal
+++ b/yesod-core/yesod-core.cabal
@@ -94,10 +94,9 @@ library
                      Yesod.Dispatch
                      Yesod.Handler
                      Yesod.Widget
-                     Yesod.Internal.TestApi
+                     Yesod.Core.Internal.Request
     other-modules:   Yesod.Internal.Core
                      Yesod.Internal.Session
-                     Yesod.Internal.Request
                      Yesod.Core.Time
                      Yesod.Core.Trans.Class
                      Yesod.Core.Run