Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Added line numbers to diff output in tests.

Browse source
This commit is contained in:
John MacFarlane 2011-01-12 08:29:13 -08:00
parent a2f562719d
commit 3ebfcd0cea
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tests/Old.hs
View file

@ -17,6 +17,7 @@ import Text.Pandoc.Highlighting ( languages )
import Prelude hiding ( readFile ) import Prelude hiding ( readFile )
import qualified Data.ByteString.Lazy as B import qualified Data.ByteString.Lazy as B
import Data.ByteString.Lazy.UTF8 (toString) import Data.ByteString.Lazy.UTF8 (toString)
import Text.Printf
readFileUTF8 :: FilePath -> IO String readFileUTF8 :: FilePath -> IO String
readFileUTF8 f = B.readFile f >>= return . toString readFileUTF8 f = B.readFile f >>= return . toString
@ -33,13 +34,13 @@ instance Show TestResult where
show TestPassed = "PASSED" show TestPassed = "PASSED"
show (TestError ec) = "ERROR " ++ show ec show (TestError ec) = "ERROR " ++ show ec
show (TestFailed cmd file d) = "\n--- " ++ file ++ show (TestFailed cmd file d) = "\n--- " ++ file ++
"\n+++ " ++ cmd ++ "\n" ++ showDiff d "\n+++ " ++ cmd ++ "\n" ++ showDiff (1,1) d
showDiff :: [(DI, String)] -> String showDiff :: (Int,Int) -> [(DI, String)] -> String
showDiff [] = "" showDiff _ [] = ""
showDiff ((F, ln) : ds) = "+ " ++ ln ++ "\n" ++ showDiff ds showDiff (l,r) ((F, ln) : ds) = printf "%4d +" l ++ ln ++ "\n" ++ showDiff (l+1,r) ds
showDiff ((S, ln) : ds) = "- " ++ ln ++ "\n" ++ showDiff ds showDiff (l,r) ((S, ln) : ds) = printf "%4d -" r ++ ln ++ "\n" ++ showDiff (l,r+1) ds
showDiff ((B, _ ) : ds) = showDiff ds showDiff (l,r) ((B, _ ) : ds) = showDiff (l+1,r+1) ds
tests :: [Test] tests :: [Test]
tests = [ testGroup "markdown" [ testGroup "writer" (writerTests "markdown" ++ lhsWriterTests "markdown") tests = [ testGroup "markdown" [ testGroup "writer" (writerTests "markdown" ++ lhsWriterTests "markdown")