Refactor tests

Move cli-test back to test

elocrypt.cabal

@@ -75,9 +75,9 @@ test-suite ui-test
                        tasty-quickcheck,
                        tasty-th >= 0.1.7
   default-language:    Haskell2010
-  hs-source-dirs:      cli-test
-  main-is:             CliTests.hs
-  other-modules:       Test.Elocrypt.Instances,
-                       Test.Elocrypt.PassphraseTest
-                       Test.Elocrypt.PasswordTest
+  hs-source-dirs:      test
+  main-is:             IntegTests.hs
+  other-modules:       IntegTest.Elocrypt.PassphraseTest,
+                       IntegTest.Elocrypt.PasswordTest,
+                       Test.Elocrypt.Instances
   type:                exitcode-stdio-1.0

cli-test/Test/Elocrypt/PassphraseTest.hs → test/IntegTest/Elocrypt/PassphraseTest.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
-module Test.Elocrypt.PassphraseTest where
+module IntegTest.Elocrypt.PassphraseTest where
 
 import Control.Monad
 import Data.List

cli-test/Test/Elocrypt/PasswordTest.hs → test/IntegTest/Elocrypt/PasswordTest.hs

@@ -1,5 +1,5 @@
 {-# LANGUAGE TemplateHaskell #-}
-module Test.Elocrypt.PasswordTest where
+module IntegTest.Elocrypt.PasswordTest where
 
 import Data.List
 import Data.Maybe

cli-test/CliTests.hs → test/IntegTests.hs

@@ -15,8 +15,8 @@ import Test.Tasty hiding (Timeout)
 import Test.Tasty.QuickCheck (QuickCheckTests(..), testProperty)
 import Test.Tasty.TH
 
-import qualified Test.Elocrypt.PasswordTest as PasswordTest
-import qualified Test.Elocrypt.PassphraseTest as PassphraseTest
+import qualified IntegTest.Elocrypt.PasswordTest as PasswordTest
+import qualified IntegTest.Elocrypt.PassphraseTest as PassphraseTest
 
 main :: IO ()
 main = defaultMain (options tests)
@@ -25,7 +25,7 @@ options :: TestTree -> TestTree
 options = localOption (QuickCheckTests 10)
 
 tests :: TestTree
-tests = testGroup "CLI Tests" [
+tests = testGroup "Integration Tests" [
       PasswordTest.tests,
       PassphraseTest.tests
   ]

test/Test/Elocrypt/Instances.hs

@@ -2,14 +2,52 @@ module Test.Elocrypt.Instances where
 
 import Control.Monad
 import System.Random
+import Text.Printf
+
 import Test.QuickCheck
 
+newtype CliArgs
+  = CliArgs  { getArgs :: [String] }
+  deriving Eq
+
+instance Show CliArgs where
+  show = unwords . getArgs
+
+instance Arbitrary CliArgs where
+  arbitrary = do
+    len  <- arbitrary `suchThat` (>0) `suchThat` (<=40) :: Gen Int
+    num  <- arbitrary `suchThat` (>2) `suchThat` (<=20) :: Gen Int
+    args <- sublistOf ["-n %d" `printf` num,
+                       show len]
+    return (CliArgs args)
+
+newtype PhraseCliArgs
+  = PhraseCliArgs { getPhraseArgs :: [String] }
+  deriving Eq
+
+instance Show PhraseCliArgs where
+  show = unwords . getPhraseArgs
+
+instance Arbitrary PhraseCliArgs where
+  arbitrary = do
+    num    <- arbitrary `suchThat` (>2) `suchThat` (<=20) :: Gen Int
+    minLen <- arbitrary `suchThat` (>0) `suchThat` (<=40) :: Gen Int
+    maxLen <- arbitrary `suchThat` (>0) `suchThat` (<=40) :: Gen Int
+
+    -- Need Either [], [num], or [num, minLength, maxLength]
+    args <- sublistOf ["-n %d" `printf` num,
+                       show minLen,
+                       show (maxLen + minLen)]
+
+    return $ PhraseCliArgs ("-p" : args)
+
+-- Uh oh! I copy/pasted this!
 instance Arbitrary StdGen where
   arbitrary = mkStdGen `liftM` arbitrary
 
 newtype AlphaChar = Alpha Char
                   deriving (Eq, Ord, Show)
-
+-- 
 instance Arbitrary AlphaChar where
   arbitrary = Alpha `liftM` elements ['a'..'z']
 

test/Tests.hs

@@ -10,5 +10,5 @@ main :: IO ()
 main = defaultMain tests
 
 tests :: TestTree
-tests = testGroup "All Tests" [PasswordTest.tests,
-                               TrigraphTest.tests]
+tests = testGroup "Unit Tests" [PasswordTest.tests,
+                                TrigraphTest.tests]