Refactoring and bugfix in Show instance

Author: schoettl

shelltestrunner.cabal

@@ -46,6 +46,7 @@ executable shelltest
     Import
     Parse
     Preprocessor
+    Print
     Types
     Utils
     Utils.Debug

src/Types.hs

@@ -44,8 +44,8 @@ instance Show Matcher where show = showMatcherTrimmed
 showMatcherTrimmed :: Matcher -> String
 showMatcherTrimmed (PositiveRegex r)   = "/"++(trim r)++"/"
 showMatcherTrimmed (NegativeRegex r)   = "!/"++(trim r)++"/"
-showMatcherTrimmed (Numeric s)         = trim (show s)
-showMatcherTrimmed (NegativeNumeric s) = "!"++ trim (show s)
+showMatcherTrimmed (Numeric s)         = trim s
+showMatcherTrimmed (NegativeNumeric s) = "!"++ trim s
 showMatcherTrimmed (Lines _ s)         = trim s
 
 showMatcher :: Matcher -> String

src/shelltest.hs

@@ -147,7 +147,7 @@ main = do
 
 
 printShellTestsWithResults :: Args -> Either ParseError [ShellTest] -> IO ()
-printShellTestsWithResults args (Right ts) = mapM_ (prepareShellTest args True) ts
+printShellTestsWithResults args (Right ts) = mapM_ (prepareShellTest args) ts
 printShellTestsWithResults _ (Left e) = putStrLn $ "*** parse error in " ++ (sourceName $ errorPos e)
 
 -- | Additional argument checking.
@@ -157,20 +157,18 @@ checkArgs args = do
        warn $ printf "Please specify at least one test file or directory, eg: %s tests" progname
   when (isJust (actual args) && not (isJust (print_ args))) $
        warn "Option --actual can only be used with --print."
-  when (fromMaybe "v3" (print_ args) /= "v3") $
-       warn "Currently, --print only supports test format v3."
   return args
 
 -- running tests
 
 testFileParseToHUnitTest :: Args -> Either ParseError [ShellTest] -> Test.HUnit.Test
-testFileParseToHUnitTest args (Right ts) = TestList $ map (\t -> testname t ~: prepareShellTest args False t) ts
+testFileParseToHUnitTest args (Right ts) = TestList $ map (\t -> testname t ~: prepareShellTest args t) ts
 testFileParseToHUnitTest _ (Left e) = ("parse error in " ++ (sourceName $ errorPos e)) ~: (assertFailure :: (String -> IO ())) $ show e
 
 -- | Prepare test as IO action and optionally print it (as specified in args).
-prepareShellTest :: Args -> Bool -> ShellTest -> IO ()
-prepareShellTest args printTests st@ShellTest{testname=n,command=c,stdin=i,stdoutExpected=o_expected,
-                                stderrExpected=e_expected,exitCodeExpected=x_expected,lineNumber=ln} =
+prepareShellTest :: Args -> ShellTest -> IO ()
+prepareShellTest args st@ShellTest{testname=n,command=c,stdin=i,stdoutExpected=o_expected,
+                       stderrExpected=e_expected,exitCodeExpected=x_expected,lineNumber=ln} =
  do
   let e = with args
       cmd = case (e,c) of (_:_, ReplaceableCommand s) -> e ++ " " ++ dropWhile (/=' ') s
@@ -188,11 +186,11 @@ prepareShellTest args printTests st@ShellTest{testname=n,command=c,stdin=i,stdou
   let outputMatch = maybe True (o_actual `matches`) o_expected
   let errorMatch = maybe True (e_actual `matches`) e_expected
   let exitCodeMatch = show x_actual `matches` x_expected
-  if printTests
-   then printShellTest (actual args) st (mkEither outputMatch o_actual) (mkEither errorMatch e_actual) (mkEither exitCodeMatch x_actual)
-   else if (x_actual == 127) -- catch bad executable - should work on posix systems at least
-     then ioError $ userError $ unwords $ filter (not . null) [e_actual, printf "Command: '%s' Exit code: %i" cmd x_actual] -- XXX still a test failure; should be an error
-     else assertString $ concat $ filter (not . null) [
+  case print_ args of
+    Just format -> printShellTest format (actual args) st (mkEither outputMatch o_actual) (mkEither errorMatch e_actual) (mkEither exitCodeMatch x_actual)
+    Nothing -> if (x_actual == 127) -- catch bad executable - should work on posix systems at least
+           then ioError $ userError $ unwords $ filter (not . null) [e_actual, printf "Command: '%s' Exit code: %i" cmd x_actual] -- XXX still a test failure; should be an error
+           else assertString $ concat $ filter (not . null) [
              if any not [outputMatch, errorMatch, exitCodeMatch]
                then printf "Command (at line %s):\n%s\n" (show ln) cmd
                else ""