Testing infrastructure

Author: Isweet

TODO.md

@@ -1,3 +1,4 @@
 # TODO
 
-- Write real tests, using exposed Internal module
+- More tests (including Internal module)
+- Available Expression Analysis

ppa.cabal

@@ -20,12 +20,14 @@ library
   exposed-modules:     PPA.Lang.While.Syntax PPA.Lang.While.Internal.Syntax PPA.Lang.While.Util
 --  other-modules:
   other-extensions:    FlexibleContexts
-  build-depends:       base >=4.8 && <4.9, mtl >=2.2 && <2.3, parsec >=3.1 && <3.2, containers >=0.5 && <0.6
+  build-depends:       base == 4.8.*, parsec == 3.1.*, containers == 0.5.*
   hs-source-dirs:      src
   default-language:    Haskell2010
 
 test-suite tests
   type:                exitcode-stdio-1.0
+  other-modules:       PPATest.Common
   main-is:             Main.hs
   hs-source-dirs:      test
-  build-depends:       base, containers >=0.5 && <0.6, ppa
+  build-depends:       base == 4.8.*, containers == 0.5.*, hspec == 2.2.*, ppa
+  default-language:    Haskell2010

test/Main.hs

@@ -1,84 +1,17 @@
 module Main (main) where
 
-import Prelude hiding (init)
+import Test.Hspec
 
-import qualified Data.Set as Set
-import qualified Data.List as List
+import qualified PPATest.Lang.While.SyntaxSpec
+import qualified PPATest.Lang.While.UtilSpec
 
-import PPA.Lang.While.Internal.Syntax
-import PPA.Lang.While.Util
-
--- Convenience
-
-printStmt :: Stmt -> IO ()
-printStmt = putStrLn . showL
-
-printSet :: (Show a) => Set.Set a -> IO ()
-printSet s = putStrLn $ "{" ++ es ++ "}"
-    where es = concat $ List.intersperse ", " $ map show $ Set.toList s
-
-printCase :: String -> String -> IO ()
-printCase name prog = do
-    let s = read prog
-    putStr $ name ++ ": "
-    printStmt s
-    putStr $ "labels(" ++ name ++ ") = "
-    printSet $ labels s
-    putStr $ "init(" ++ name ++ ")   = "
-    print $ init s
-    putStr $ "flow(" ++ name ++ ")   = "
-    printSet $ flow s
-    putStr $ "final(" ++ name ++ ")  = "
-    printSet $ final s
-
--- Progs
-
-ifBasic :: String
-ifBasic =
-    "   if (a > 0 || a < 0) then \
-      \     (x := -2)            \
-      \ else                     \
-      \     (skip)"
-
-ifTwice :: String
-ifTwice = 
-    "   if (a > 0 || a < 0) then \ 
-      \     (x := -2)            \ 
-      \ else                     \ 
-      \     (skip);              \ 
-      \ if (b < 5) then          \
-      \     (y := 1)             \
-      \ else                     \
-      \     (skip)"
-
-{- y^x
- - result stored in z -}
-power :: String
-power = 
-    "   z := 1;             \
-      \ while (x > 0) do    \
-      \     (z := z * y;    \
-      \      x := x - 1)"
-
-{- x!
- - result stored in z -}
-factorial :: String
-factorial = 
-    "   y := x;             \
-      \ z := 1;             \
-      \ while (y > 1) do    \
-      \     (z := z * y;    \
-      \      y := y - 1);   \
-      \ y := 0"
-
--- Harness
+import qualified PPATest.Lang.While.Internal.SyntaxSpec
 
 main :: IO ()
-main = do
-    printCase "power" power
-    putStrLn ""
-    printCase "factorial" factorial
-    putStrLn ""
-    printCase "ifBasic" ifBasic
-    putStrLn ""
-    printCase "ifTwice" ifTwice
+main = hspec spec
+
+spec :: Spec
+spec = do
+  describe "Lang.While.SyntaxSpec"              PPATest.Lang.While.SyntaxSpec.spec
+  describe "Lang.While.UtilSpec"                PPATest.Lang.While.UtilSpec.spec
+  describe "Lang.While.Internal.SyntaxSpec"     PPATest.Lang.While.Internal.SyntaxSpec.spec

test/PPATest/Common.hs

@@ -0,0 +1,43 @@
+module PPATest.Common where
+
+-- Progs
+
+ifBasic :: String
+ifBasic =
+    "   if (a > 0 || a < 0) then \
+      \     (x := -2)            \
+      \ else                     \
+      \     (skip)"
+
+ifTwice :: String
+ifTwice = 
+    "   if (a > 0 || a < 0) then \ 
+      \     (x := -2)            \ 
+      \ else                     \ 
+      \     (skip);              \ 
+      \ if (b < 5) then          \
+      \     (y := 1)             \
+      \ else                     \
+      \     (skip)"
+
+{- y^x
+ - result stored in z -}
+power :: String
+power = 
+    "   z := 1;             \
+      \ while (x > 0) do    \
+      \     (z := z * y;    \
+      \      x := x - 1)"
+
+{- x!
+ - result stored in z -}
+factorial :: String
+factorial = 
+    "   y := x;             \
+      \ z := 1;             \
+      \ while (y > 1) do    \
+      \     (z := z * y;    \
+      \      y := y - 1);   \
+      \ y := 0"
+
+

test/PPATest/Lang/While/Internal/SyntaxSpec.hs

@@ -0,0 +1,6 @@
+module PPATest.Lang.While.Internal.SyntaxSpec (spec) where
+
+import Test.Hspec
+
+spec :: Spec
+spec = return ()

test/PPATest/Lang/While/SyntaxSpec.hs

@@ -0,0 +1,19 @@
+module PPATest.Lang.While.SyntaxSpec (spec) where
+
+import Test.Hspec
+
+import PPATest.Common
+
+import PPA.Lang.While.Syntax
+
+spec :: Spec
+spec = do
+    describe "read . show" $ do
+        it "-- ifBasic" $
+            (read . show) ifBasic `shouldBe` ifBasic
+        it "-- ifTwice" $
+            (read . show) ifTwice `shouldBe` ifTwice
+        it "-- power" $
+            (read . show) power `shouldBe` power
+        it "-- factorial" $
+            (read . show) factorial `shouldBe` factorial

test/PPATest/Lang/While/UtilSpec.hs

@@ -0,0 +1,17 @@
+module PPATest.Lang.While.UtilSpec (spec) where
+
+import Test.Hspec
+
+import PPATest.Common
+
+import qualified Data.Set as Set
+
+import PPA.Lang.While.Util
+
+spec :: Spec
+spec = do
+    describe "flow" $ do
+        it "-- factorial" $
+            (flow $ read factorial) `shouldBe` Set.fromList [(1,2), (2,3), (3,4), (3,6), (4,5), (5,3)]
+        it "-- power" $
+            (flow $ read power) `shouldBe` Set.fromList [(1,2), (2,3), (3,4), (4,2)]