Commit 4e3729183bf9ac5f7f6de5ad7c3e16a6e9efadca - Falderal

+3

-1

Test/Falderal/Demo.lhs less more

31	31	> parseBits ('0':rest) = (False:parseBits rest)
32	32	> parseBits ('1':rest) = (True:parseBits rest)
33	33	> parseBits ('\n':rest) = parseBits rest
	34
	35	> showParseBits = show . parseBits
34	36
35	37	The Falderal Driver
36	38	-------------------

110	112	Tests for parseBits
111	113	-------------------
112	114
113		-> Tests for Haskell function Test.Falderal.Demo:parseBits
	115	-> Tests for Haskell function Test.Falderal.Demo:showParseBits
114	116
115	117	We can test functions of type
116	118

+14

-12

Test/Falderal/Formatter/Haskell.hs less more

37	37	-- Formatting function which compiles a Falderal file to Haskell source.
38	38	--
39	39
40		formatBlocks (test@(Test desc text expectation):rest) =
41		" " ++ (show test) ++ ",\n" ++ (formatBlocks rest)
	40	formatBlocks ((functionName, test@(Test desc text expectation)):rest) =
	41	" (" ++ functionName ++ ", " ++ (show test) ++ "),\n" ++ (formatBlocks rest)
42	42	formatBlocks (_:rest) =
43	43	formatBlocks rest
44	44	formatBlocks [] =
45	45	""
46	46
47	47	format _ blocks =
48		(prelude blocks) ++ (formatBlocks blocks) ++ postlude
	48	(prelude blocks) ++ (formatBlocks (transformBlocks blocks "")) ++ postlude
49	49
50	50	gatherImports ((HaskellDirective moduleName functionName):rest) =
51		"import " ++ moduleName ++ "\n" ++ gatherImports rest
	51	"import qualified " ++ moduleName ++ "\n" ++ gatherImports rest
52	52	gatherImports (_:rest) =
53	53	gatherImports rest
54	54	gatherImports [] =
55	55	""
56	56
57		--
58		-- XXX this hard-codes some stuff, just to see things running
59		-- XXX instead, scan list for HaskellDirectives, pluck out module
60		-- names and turn them into imports. Put function names in
61		-- list somehow.
62		--
	57	transformBlocks ((HaskellDirective moduleName functionName):rest) _ =
	58	transformBlocks rest (moduleName ++ "." ++ functionName)
	59	transformBlocks (test@(Test _ _ _):rest) functionName =
	60	(functionName, test):(transformBlocks rest functionName)
	61	transformBlocks (_:rest) functionName =
	62	transformBlocks rest functionName
	63	transformBlocks [] _ =
	64	[]
63	65
64	66	prelude blocks =
65	67	"module GeneratedFalderalTests where\n\

67	69	\import Test.Falderal.Common\n\
68	70	\import Test.Falderal.Runner\n" ++ (gatherImports blocks) ++ "\
69	71	\\n\
70		\testModule = runTests [] (everySecond) [\n"
	72	\testModule = runTests' [\n"
71	73
72	74	postlude =
73		" (Section \"DONE\")\n\
	75	" (id, (Section \"DONE\"))\n\
74	76	\ ]\n"

+20

-1

Test/Falderal/Runner.hs less more

0		module Test.Falderal.Runner (run, runTests) where
	0	module Test.Falderal.Runner (run, runTests, runTests') where
1	1
2	2	--
3	3	-- Test.Falderal.Runner -- The Falderal Test Runner

136	136	putStrLn text
137	137	else do
138	138	putStrLn ((pad fieldName width) ++ ": " ++ text)
	139
	140	--
	141	-- This is the new interface
	142	--
	143
	144	runTests' [] = do
	145	return []
	146	runTests' ((fun, Section sectionText):rest) = do
	147	runTests' rest
	148	runTests' ((fun, HaskellDirective _ _):rest) = do
	149	runTests' rest
	150	runTests' ((testFun, Test literalText inputText expected):rest) = do
	151	actual <- runFun (testFun) inputText
	152	case compareTestOutcomes actual expected of
	153	True ->
	154	runTests' rest
	155	False -> do
	156	remainder <- runTests' rest
	157	return ((Failure literalText inputText expected actual):remainder)

+3

-0

test.sh less more

64	64	rm -f formatted.txt
65	65
66	66	exit $E
	67
	68	# ghc Test/Falderal/Formatter.hs -e 'formatFile "haskell" "Test/Falderal/Demo.lhs"' > GeneratedFalderalTests.hs
	69	# ghc GeneratedFalderalTests.hs -e testModule