migration (wip)

Author: zohl

default.nix

@@ -1,6 +1,6 @@
 { mkDerivation, attoparsec, base, bytestring, case-conversion
-, heredoc, HUnit, postgresql-simple, stdenv, template-haskell, text
-, time
+, heredoc, hspec2, HUnit, postgresql-simple, stdenv
+, template-haskell, text, time
 }:
 mkDerivation {
   pname = "postgresql-simple-bind";
@@ -11,8 +11,8 @@ mkDerivation {
     template-haskell text time
   ];
   testHaskellDepends = [
-    attoparsec base bytestring case-conversion HUnit postgresql-simple
-    text
+    attoparsec base bytestring case-conversion hspec2 HUnit
+    postgresql-simple text
   ];
   description = "A FFI-like bindings for PostgreSQL stored functions";
   license = stdenv.lib.licenses.gpl3;

postgresql-simple-bind.cabal

@@ -60,6 +60,8 @@ test-suite tests
   build-depends: base >= 4.8 && < 5.0
                , bytestring >= 0.10.8 && < 0.11
                , HUnit
+               , hspec2
+               , hspec-expectations
                , postgresql-simple >= 0.5.2 && < 0.6
                , postgresql-simple-bind
                , text >= 1.2.2 && < 1.3

tests/Main.hs

@@ -1,23 +1,31 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE NamedFieldPuns    #-}
 
-import Test.HUnit
-import Control.Monad
-import System.IO
-import System.Exit
+import Control.Monad (unless)
+-- import Data.WithLocation (WithLocation)
+import Test.Hspec
+import Test.Hspec.Expectations (expectationFailure)
+-- import Test.Hspec.Wai (with)
+import Database.PostgreSQL.Simple.Bind.Representation
+import Data.Text ()
 
-import TestRepresentation
+main :: IO ()
+main = hspec spec
 
+spec :: Spec
+spec = do
+  describe "simple signatures" $ do
+    it "works with simple signatures" $ do
+      (parsePGFunction "function f(x bigint) returns bigint") `shouldBe`
+        (PGFunction "" "f" [PGArgument "x" "bigint" False] (PGSingle "bigint"))
 
-tests :: [Test]
-tests = [
-      TestLabel "Representation" testRepresentation
-    ]
+      (parsePGFunction "function g(x bigint, y varchar) returns void") `shouldBe`
+        (PGFunction "" "g" [PGArgument "x" "bigint" False, PGArgument "y" "varchar" False]
+          (PGSingle "void"))
 
-main :: IO ()
-main = do
-  mapM_ (`hSetBuffering` LineBuffering) [stdout, stderr]
+      (parsePGFunction "function h() returns varchar") `shouldBe`
+        (PGFunction "" "h" [] (PGSingle "varchar"))
 
-  Counts {cases, tried, errors, failures} <- runTestTT $ TestList tests
-  when (cases /= tried || errors /= 0 || failures /= 0) $ exitFailure
+      (parsePGFunction "FUNCTION H(Z VARCHAR) RETURNS BIGINT") `shouldBe`
+        (PGFunction "" "h" [PGArgument "z" "varchar" False] (PGSingle "bigint"))
 

tests/TestRepresentation.hs

@@ -11,23 +11,6 @@ import Data.Text ()
 import TestTypes
 
 
-simpleTests :: Test
-simpleTests = "simple" ~: [
-    (parsePGFunction "function f(x bigint) returns bigint")
-    ~?= (PGFunction "" "f" [PGArgument "x" "bigint" False] (PGSingle "bigint"))
-
-  , (parsePGFunction "function g(x bigint, y varchar) returns void")
-    ~?= (PGFunction "" "g"
-          [PGArgument "x" "bigint" False, PGArgument "y" "varchar" False ] (PGSingle "void"))
-
-  , (parsePGFunction "function h() returns varchar")
-    ~?= (PGFunction "" "h" [] (PGSingle "varchar"))
-
-  , (parsePGFunction "FUNCTION H(Z VARCHAR) RETURNS BIGINT")
-    ~?= (PGFunction "" "h" [PGArgument "z" "varchar" False] (PGSingle "bigint"))
-  ]
-
-
 defaultValuesTests :: Test
 defaultValuesTests = "default values" ~: [
     (parsePGFunction "function f(x bigint default 0::bigint) returns void")