@@ -1,4 +1,5 @@
1{-# LANGUAGE QuasiQuotes #-}
1{-# LANGUAGE QuasiQuotes #-}
2+{-# LANGUAGE ScopedTypeVariables #-}
2module Main where
3module Main where
4import Graphics.Vty
5import Graphics.Vty
@@ -17,18 +18,18 @@ import Data.Monoid
17import Data.String.QQ
18import Data.String.QQ
18import Data.Word
19import Data.Word
20−import Foreign.Marshal.Array
21+import Foreign.Marshal.Array
22import qualified System.Environment as Env
23import qualified System.Environment as Env
24import System.IO ( hFlush, hPutStr, hPutBuf, stdout )
25import System.IO ( hFlush, hPutStr, hPutBuf, stdout )
27− print_intro
28+ printIntro
29−output_file_path = "test_results.list"
30+outputFilePath = "test_results.list"
31−print_intro = do
32+printIntro = do
32 putStr $ [s|
33 putStr $ [s|
33This is an interactive verification program for the terminal input and output
34This is an interactive verification program for the terminal input and output
34support of the VTY library. This will ask a series of questions about what you
35support of the VTY library. This will ask a series of questions about what you
@@ -36,7 +37,7 @@ see on screen. The goal is to verify that VTY's output and input support
36performs as expected with your terminal.
37performs as expected with your terminal.
38This program produces a file named
39This program produces a file named
39− |] ++ output_file_path ++ [s|
40+ |] ++ outputFilePath ++ [s|
40in the current directory that contains the results for each test assertion. This
41in the current directory that contains the results for each test assertion. This
41can be emailed to coreyoconnor@gmail.com and used by the VTY authors to improve
42can be emailed to coreyoconnor@gmail.com and used by the VTY authors to improve
42support for your terminal. No personal information is contained in the report.
43support for your terminal. No personal information is contained in the report.
@@ -65,41 +66,40 @@ All the tests assume the following about the terminal display:
65Thanks for the help! :-D
66Thanks for the help! :-D
66To exit the test early enter "q" anytime at the following menu screen.
67To exit the test early enter "q" anytime at the following menu screen.
68−If any test failed then please post an issue to
69+If any test fails then please post an issue to
69 https://github.com/coreyoconnor/vty/issues
70 https://github.com/coreyoconnor/vty/issues
70−with the test_results.list file pasted into the issue. The issue summary can
71+with the test_results.list file pasted into the issue. A suitable summary is:
71−mention the specific tests that failed or just say "interactive terminal test
72+"interactive terminal test failure".
74− wait_for_return
74+ waitForReturn
75− results <- do_test_menu 1
75+ results <- doTestMenu 1
76− env_attributes <- mapM ( \env_name -> Control.Exception.catch ( Env.getEnv env_name >>= return . (,) env_name )
76+ envAttributes <- mapM ( \envName -> Control.Exception.catch ( Env.getEnv envName >>= return . (,) envName )
77− ( \ (_ :: SomeException) -> return (env_name, "") )
77+ ( \ (_ :: SomeException) -> return (envName, "") )
79− [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
79+ [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
80− t <- output_for_current_terminal
80+ t <- standardIOConfig >>= outputForConfig
81− let results_txt = show env_attributes ++ "\n"
81+ let resultsTxt = show envAttributes ++ "\n"
82− ++ terminal_ID t ++ "\n"
82+ ++ terminalID t ++ "\n"
83− ++ show results ++ "\n"
83+ ++ show results ++ "\n"
84− release_terminal t
84+ releaseTerminal t
85− writeFile output_file_path results_txt
85+ writeFile outputFilePath resultsTxt
87−wait_for_return = do
87+waitForReturn = do
88 putStr "\n(press return to continue)"
88 putStr "\n(press return to continue)"
89 hFlush stdout
89 hFlush stdout
92−test_menu :: [(String, Test)]
92+testMenu :: [(String, Test)]
93−test_menu = zip (map show [1..]) all_tests
93+testMenu = zip (map show [1..]) allTests
95−do_test_menu :: Int -> IO [(String, Bool)]
95+doTestMenu :: Int -> IO [(String, Bool)]
96−do_test_menu next_ID
96+doTestMenu nextID
97− | next_ID > length all_tests = do
97+ | nextID > length allTests = do
98− putStrLn $ "Done! Please email the " ++ output_file_path ++ " file to coreyoconnor@gmail.com"
98+ putStrLn $ "Done! Please email the " ++ outputFilePath ++ " file to coreyoconnor@gmail.com"
100 | otherwise = do
100 | otherwise = do
101− display_test_menu
101+ displayTestMenu
102− putStrLn $ "Press return to start with #" ++ show next_ID ++ "."
102+ putStrLn $ "Press return to start with #" ++ show nextID ++ "."
103 putStrLn "Enter a test number to perform only that test."
103 putStrLn "Enter a test number to perform only that test."
104 putStrLn "q (or control-C) to quit."
104 putStrLn "q (or control-C) to quit."
105 putStr "> "
105 putStr "> "
@@ -107,102 +107,102 @@ do_test_menu next_ID
107 s <- getLine >>= return . filter (/= '\n')
107 s <- getLine >>= return . filter (/= '\n')
108 case s of
108 case s of
109 "q" -> return mempty
109 "q" -> return mempty
110− "" -> do
110+ "" -> do
111− r <- run_test $ show next_ID
111+ r <- runTest $ show nextID
112− rs <- do_test_menu ( next_ID + 1 )
112+ rs <- doTestMenu ( nextID + 1 )
113 return $ r : rs
113 return $ r : rs
114− i | isJust ( lookup i test_menu ) -> do
114+ i | isJust ( lookup i testMenu ) -> do
115− r <- run_test i
115+ r <- runTest i
116− rs <- do_test_menu ( read i + 1 )
116+ rs <- doTestMenu ( read i + 1 )
117 return $ r : rs
117 return $ r : rs
119− display_test_menu
119+ displayTestMenu
120− = mapM_ display_test_menu' test_menu
120+ = mapM_ displayTestMenu' testMenu
121− display_test_menu' ( i, t )
121+ displayTestMenu' ( i, t )
122− = putStrLn $ ( if i == show next_ID
122+ = putStrLn $ ( if i == show nextID
123− then "> "
123+ then "> "
125− ) ++ i ++ ". " ++ test_name t
125+ ) ++ i ++ ". " ++ testName t
127−run_test :: String -> IO (String, Bool)
127+runTest :: String -> IO (String, Bool)
128−run_test i = do
128+runTest i = do
129− let t = fromJust $ lookup i test_menu
129+ let t = fromJust $ lookup i testMenu
130− print_summary t
130+ printSummary t
131− wait_for_return
131+ waitForReturn
132− test_action t
132+ testAction t
133− r <- confirm_results t
133+ r <- confirmResults t
134− return (test_ID t, r)
134+ return (testID t, r)
136−default_success_confirm_results = do
136+defaultSuccessConfirmResults = do
137 putStr "\n"
137 putStr "\n"
138 putStr "[Y/n] "
138 putStr "[Y/n] "
139 hFlush stdout
139 hFlush stdout
140 r <- getLine
140 r <- getLine
141 case r of
141 case r of
142− "" -> return True
142+ "" -> return True
143 "y" -> return True
143 "y" -> return True
144 "Y" -> return True
144 "Y" -> return True
145 "n" -> return False
145 "n" -> return False
147data Test = Test
147data Test = Test
148− { test_name :: String
148+ { testName :: String
149− , test_ID :: String
149+ , testID :: String
150− , test_action :: IO ()
150+ , testAction :: IO ()
151− , print_summary :: IO ()
151+ , printSummary :: IO ()
152− , confirm_results :: IO Bool
152+ , confirmResults :: IO Bool
155−all_tests
155+allTests
156− = [ reserve_output_test
156+ = [ reserveOutputTest
157− , display_bounds_test_0
157+ , displayBoundsTest0
158− , display_bounds_test_1
158+ , displayBoundsTest1
159− , display_bounds_test_2
159+ , displayBoundsTest2
160− , display_bounds_test_3
160+ , displayBoundsTest3
161− , unicode_single_width_0
161+ , unicodeSingleWidth0
162− , unicode_single_width_1
162+ , unicodeSingleWidth1
163− , unicode_double_width_0
163+ , unicodeDoubleWidth0
164− , unicode_double_width_1
164+ , unicodeDoubleWidth1
165− , attributes_test_0
165+ , attributesTest0
166− , attributes_test_1
166+ , attributesTest1
167− , attributes_test_2
167+ , attributesTest2
168− , attributes_test_3
168+ , attributesTest3
169− , attributes_test_4
169+ , attributesTest4
170− , attributes_test_5
170+ , attributesTest5
171− , inline_test_0
171+ , inlineTest0
172− , inline_test_1
172+ , inlineTest1
173− , inline_test_2
173+ , inlineTest2
174− , cursor_hide_test_0
174+ , cursorHideTest0
175− , vert_crop_test_0
175+ , vertCropTest0
176− , vert_crop_test_1
176+ , vertCropTest1
177− , vert_crop_test_2
177+ , vertCropTest2
178− , vert_crop_test_3
178+ , vertCropTest3
179− , horiz_crop_test_0
179+ , horizCropTest0
180− , horiz_crop_test_1
180+ , horizCropTest1
181− , horiz_crop_test_2
181+ , horizCropTest2
182− , horiz_crop_test_3
182+ , horizCropTest3
183− , layer_0
183+ , layer0
184− , layer_1
184+ , layer1
187−reserve_output_test = Test
187+reserveOutputTest = Test
188− { test_name = "Initialize and reserve terminal output then restore previous state."
188+ { testName = "Initialize and reserve terminal output then restore previous state."
189− , test_ID = "reserve_output_test"
189+ , testID = "reserveOutputTest"
190− , test_action = do
190+ , testAction = do
191− t <- output_for_current_terminal
191+ t <- standardIOConfig >>= outputForConfig
192− reserve_display t
192+ reserveDisplay t
193 putStrLn "Line 1"
193 putStrLn "Line 1"
194 putStrLn "Line 2"
194 putStrLn "Line 2"
195 putStrLn "Line 3"
195 putStrLn "Line 3"
196 putStrLn "Line 4 (press return)"
196 putStrLn "Line 4 (press return)"
197 hFlush stdout
197 hFlush stdout
199− release_display t
199+ releaseDisplay t
200− release_terminal t
200+ releaseTerminal t
201 return ()
201 return ()
202− , print_summary = do
202+ , printSummary = do
203 putStr $ [s|
203 putStr $ [s|
204Once return is pressed:
204Once return is pressed:
205− 0. The screen will be cleared.
205+ 0. The screen will be cleared.
206 1. Four lines of text should be visible.
206 1. Four lines of text should be visible.
207 1. The cursor should be visible and at the start of the fifth line.
207 1. The cursor should be visible and at the start of the fifth line.
@@ -210,123 +210,123 @@ After return is pressed for the second time this test then:
210 * The screen containing the test summary should be restored;
210 * The screen containing the test summary should be restored;
211 * The cursor is visible.
211 * The cursor is visible.
213− , confirm_results = do
213+ , confirmResults = do
214 putStr $ [s|
214 putStr $ [s|
215Did the test output match the description?
215Did the test output match the description?
217− default_success_confirm_results
217+ defaultSuccessConfirmResults
220−display_bounds_test_0 = Test
220+displayBoundsTest0 = Test
221− { test_name = "Verify display bounds are correct test 0: Using spaces."
221+ { testName = "Verify display bounds are correct test 0: Using spaces."
222− , test_ID = "display_bounds_test_0"
222+ , testID = "displayBoundsTest0"
223− , test_action = do
223+ , testAction = do
224− t <- output_for_current_terminal
224+ t <- standardIOConfig >>= outputForConfig
225− reserve_display t
225+ reserveDisplay t
226− (w,h) <- display_bounds t
226+ (w,h) <- displayBounds t
227− let row_0 = replicate (fromEnum w) 'X' ++ "\n"
227+ let row0 = replicate (fromEnum w) 'X' ++ "\n"
228− row_h = replicate (fromEnum w - 1) 'X'
228+ rowH = replicate (fromEnum w - 1) 'X'
229− row_n = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
229+ rowN = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
230− image = row_0 ++ (concat $ replicate (fromEnum h - 2) row_n) ++ row_h
230+ image = row0 ++ (concat $ replicate (fromEnum h - 2) rowN) ++ rowH
231 putStr image
231 putStr image
232 hFlush stdout
232 hFlush stdout
234− release_display t
234+ releaseDisplay t
235− release_terminal t
235+ releaseTerminal t
236 return ()
236 return ()
237− , print_summary = display_bounds_test_summary True
237+ , printSummary = displayBoundsTestSummary True
238− , confirm_results = generic_output_match_confirm
238+ , confirmResults = genericOutputMatchConfirm
241−display_bounds_test_1 = Test
241+displayBoundsTest1 = Test
242− { test_name = "Verify display bounds are correct test 0: Using cursor movement."
242+ { testName = "Verify display bounds are correct test 0: Using cursor movement."
243− , test_ID = "display_bounds_test_1"
243+ , testID = "displayBoundsTest1"
244− , test_action = do
244+ , testAction = do
245− t <- output_for_current_terminal
245+ t <- standardIOConfig >>= outputForConfig
246− reserve_display t
246+ reserveDisplay t
247− (w,h) <- display_bounds t
247+ (w,h) <- displayBounds t
248− set_cursor_pos t 0 0
248+ setCursorPos t 0 0
249− let row_0 = replicate (fromEnum w) 'X' ++ "\n"
249+ let row0 = replicate (fromEnum w) 'X' ++ "\n"
250− putStr row_0
250+ putStr row0
251 forM_ [1 .. h - 2] $ \y -> do
251 forM_ [1 .. h - 2] $ \y -> do
252− set_cursor_pos t 0 y
252+ setCursorPos t 0 y
253 putStr "X"
253 putStr "X"
254 hFlush stdout
254 hFlush stdout
255− set_cursor_pos t (w - 1) y
255+ setCursorPos t (w - 1) y
256 putStr "X"
256 putStr "X"
257 hFlush stdout
257 hFlush stdout
258− set_cursor_pos t 0 (h - 1)
258+ setCursorPos t 0 (h - 1)
259− let row_h = replicate (fromEnum w - 1) 'X'
259+ let rowH = replicate (fromEnum w - 1) 'X'
260− putStr row_h
260+ putStr rowH
261 hFlush stdout
261 hFlush stdout
263− release_display t
263+ releaseDisplay t
264− release_terminal t
264+ releaseTerminal t
265 return ()
265 return ()
266− , print_summary = display_bounds_test_summary True
266+ , printSummary = displayBoundsTestSummary True
267− , confirm_results = generic_output_match_confirm
267+ , confirmResults = genericOutputMatchConfirm
270−display_bounds_test_2 = Test
270+displayBoundsTest2 = Test
271− { test_name = "Verify display bounds are correct test 0: Using Image ops."
271+ { testName = "Verify display bounds are correct test 0: Using Image ops."
272− , test_ID = "display_bounds_test_2"
272+ , testID = "displayBoundsTest2"
273− , test_action = do
273+ , testAction = do
274− t <- output_for_current_terminal
274+ t <- standardIOConfig >>= outputForConfig
275− reserve_display t
275+ reserveDisplay t
276− bounds@(w,h) <- display_bounds t
276+ bounds@(w,h) <- displayBounds t
277− let first_row = horiz_cat $ replicate (fromEnum w) (char def_attr 'X')
277+ let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
278− middle_rows = vert_cat $ replicate (fromEnum h - 2) middle_row
278+ middleRows = vertCat $ replicate (fromEnum h - 2) middleRow
279− middle_row = (char def_attr 'X') <|> background_fill (w - 2) 1 <|> (char def_attr 'X')
279+ middleRow = (char defAttr 'X') <|> backgroundFill (w - 2) 1 <|> (char defAttr 'X')
280− end_row = first_row
280+ endRow = firstRow
281− image = first_row <-> middle_rows <-> end_row
281+ image = firstRow <-> middleRows <-> endRow
282− pic = (pic_for_image image) { pic_cursor = Cursor (w - 1) (h - 1) }
282+ pic = (picForImage image) { picCursor = Cursor (w - 1) (h - 1) }
283− d <- display_context t bounds
283+ d <- displayContext t bounds
284− output_picture d pic
284+ outputPicture d pic
286− release_display t
286+ releaseDisplay t
287− release_terminal t
287+ releaseTerminal t
288 return ()
288 return ()
289− , print_summary = display_bounds_test_summary True
289+ , printSummary = displayBoundsTestSummary True
290− , confirm_results = generic_output_match_confirm
290+ , confirmResults = genericOutputMatchConfirm
293−display_bounds_test_3 = Test
293+displayBoundsTest3 = Test
294− { test_name = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
294+ { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295− , test_ID = "display_bounds_test_3"
295+ , testID = "displayBoundsTest3"
296− , test_action = do
296+ , testAction = do
297− t <- output_for_current_terminal
297+ t <- standardIOConfig >>= outputForConfig
298− reserve_display t
298+ reserveDisplay t
299− (w,h) <- display_bounds t
299+ (w,h) <- displayBounds t
300− hide_cursor t
300+ hideCursor t
301− set_cursor_pos t 0 0
301+ setCursorPos t 0 0
302− let row_0 = replicate (fromEnum w) 'X'
302+ let row0 = replicate (fromEnum w) 'X'
303− putStrLn row_0
303+ putStrLn row0
304 forM_ [1 .. h - 2] $ \y -> do
304 forM_ [1 .. h - 2] $ \y -> do
305− set_cursor_pos t 0 y
305+ setCursorPos t 0 y
306 putStr "X"
306 putStr "X"
307 hFlush stdout
307 hFlush stdout
308− set_cursor_pos t (w - 1) y
308+ setCursorPos t (w - 1) y
309 putStr "X"
309 putStr "X"
310 hFlush stdout
310 hFlush stdout
311− set_cursor_pos t 0 (h - 1)
311+ setCursorPos t 0 (h - 1)
312− let row_h = row_0
312+ let rowH = row0
313− putStr row_h
313+ putStr rowH
314 hFlush stdout
314 hFlush stdout
316− show_cursor t
316+ showCursor t
317− release_display t
317+ releaseDisplay t
318− release_terminal t
318+ releaseTerminal t
319 return ()
319 return ()
320− , print_summary = display_bounds_test_summary False
320+ , printSummary = displayBoundsTestSummary False
321− , confirm_results = generic_output_match_confirm
321+ , confirmResults = genericOutputMatchConfirm
324−display_bounds_test_summary has_cursor = do
324+displayBoundsTestSummary hasCursor = do
325 putStr $ [s|
325 putStr $ [s|
326Once return is pressed:
326Once return is pressed:
327 0. The screen will be cleared.
327 0. The screen will be cleared.
329− if has_cursor
329+ if hasCursor
330 then putStr " 1. The cursor will be visible."
330 then putStr " 1. The cursor will be visible."
331 else putStr " 1. The cursor will NOT be visible."
331 else putStr " 1. The cursor will NOT be visible."
332 putStr [s|
332 putStr [s|
@@ -337,7 +337,7 @@ Once return is pressed:
337 |XXXXXXXXXXXXX|
337 |XXXXXXXXXXXXX|
340− if has_cursor
340+ if hasCursor
341 then putStr $ [s|
341 then putStr $ [s|
343 |XXXXXXXXXXXXC| |]
343 |XXXXXXXXXXXXC| |]
@@ -358,13 +358,13 @@ After return is pressed for the second time:
358 1. The cursor should be visible.
358 1. The cursor should be visible.
361−generic_output_match_confirm = do
361+genericOutputMatchConfirm = do
362 putStr $ [s|
362 putStr $ [s|
363Did the test output match the description?
363Did the test output match the description?
365− default_success_confirm_results
365+ defaultSuccessConfirmResults
367−-- Explicitely definethe bytes that encode each example text.
367+-- Explicitly define the bytes that encode each example text.
368-- This avoids any issues with how the compiler represents string literals.
368-- This avoids any issues with how the compiler represents string literals.
370-- This document is UTF-8 encoded so the UTF-8 string is still included for
370-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -373,24 +373,24 @@ Did the test output match the description?
373-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
373-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
374-- comments ;-)
374-- comments ;-)
376−-- txt_0 = ↑↑↓↓←→←→BA
376+-- txt0 = ↑↑↓↓←→←→BA
378−utf8_txt_0 :: [[Word8]]
378+utf8Txt0 :: [[Word8]]
379−utf8_txt_0 = [ [ 0xe2 , 0x86 , 0x91 ]
379+utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
380− , [ 0xe2 , 0x86 , 0x91 ]
380+ , [ 0xe2 , 0x86 , 0x91 ]
381− , [ 0xe2 , 0x86 , 0x93 ]
381+ , [ 0xe2 , 0x86 , 0x93 ]
382− , [ 0xe2 , 0x86 , 0x93 ]
382+ , [ 0xe2 , 0x86 , 0x93 ]
383− , [ 0xe2 , 0x86 , 0x90 ]
383+ , [ 0xe2 , 0x86 , 0x90 ]
384− , [ 0xe2 , 0x86 , 0x92 ]
384+ , [ 0xe2 , 0x86 , 0x92 ]
385− , [ 0xe2 , 0x86 , 0x90 ]
385+ , [ 0xe2 , 0x86 , 0x90 ]
386− , [ 0xe2 , 0x86 , 0x92 ]
386+ , [ 0xe2 , 0x86 , 0x92 ]
387− , [ 0x42 ]
387+ , [ 0x42 ]
388− , [ 0x41 ]
388+ , [ 0x41 ]
391−iso_10646_txt_0 :: String
391+iso10646Txt0 :: String
392−iso_10646_txt_0 = map toEnum
392+iso10646Txt0 = map toEnum
@@ -402,46 +402,46 @@ iso_10646_txt_0 = map toEnum
405−unicode_single_width_0 = Test
405+unicodeSingleWidth0 = Test
406− { test_name = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
406+ { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407− , test_ID = "unicode_single_width_0"
407+ , testID = "unicodeSingleWidth0"
408− , test_action = do
408+ , testAction = do
409− t <- output_for_current_terminal
409+ t <- standardIOConfig >>= outputForConfig
410− reserve_display t
410+ reserveDisplay t
411− hide_cursor t
411+ hideCursor t
412− withArrayLen (concat utf8_txt_0) (flip $ hPutBuf stdout)
412+ withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
413 hPutStr stdout "\n"
413 hPutStr stdout "\n"
414 hPutStr stdout "0123456789\n"
414 hPutStr stdout "0123456789\n"
415 hFlush stdout
415 hFlush stdout
417− release_display t
417+ releaseDisplay t
418− release_terminal t
418+ releaseTerminal t
419 return ()
419 return ()
420− , print_summary = unicode_single_width_summary
420+ , printSummary = unicodeSingleWidthSummary
421− , confirm_results = generic_output_match_confirm
421+ , confirmResults = genericOutputMatchConfirm
424−unicode_single_width_1 = Test
424+unicodeSingleWidth1 = Test
425− { test_name = "Verify terminal can display unicode single-width characters. (Image ops)"
425+ { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
426− , test_ID = "unicode_single_width_1"
426+ , testID = "unicodeSingleWidth1"
427− , test_action = do
427+ , testAction = do
428− t <- output_for_current_terminal
428+ t <- standardIOConfig >>= outputForConfig
429− reserve_display t
429+ reserveDisplay t
430− let pic = pic_for_image image
430+ let pic = picForImage image
431− image = line_0 <-> line_1
431+ image = line0 <-> line1
432− line_0 = iso_10646_string def_attr iso_10646_txt_0
432+ line0 = iso10646String defAttr iso10646Txt0
433− line_1 = string def_attr "0123456789"
433+ line1 = string defAttr "0123456789"
434− d <- display_bounds t >>= display_context t
434+ d <- displayBounds t >>= displayContext t
435− output_picture d pic
435+ outputPicture d pic
437− release_display t
437+ releaseDisplay t
438− release_terminal t
438+ releaseTerminal t
439 return ()
439 return ()
440− , print_summary = unicode_single_width_summary
440+ , printSummary = unicodeSingleWidthSummary
441− , confirm_results = generic_output_match_confirm
441+ , confirmResults = genericOutputMatchConfirm
444−unicode_single_width_summary = putStr [s|
444+unicodeSingleWidthSummary = putStr [s|
445Once return is pressed:
445Once return is pressed:
446 0. The screen will be cleared.
446 0. The screen will be cleared.
447 1. The cursor will be hidden.
447 1. The cursor will be hidden.
@@ -475,55 +475,55 @@ After return is pressed for the second time:
476-- The second example is a unicode string containing double-width glyphs
476-- The second example is a unicode string containing double-width glyphs
478−utf8_txt_1 :: [[Word8]]
478+utf8Txt1 :: [[Word8]]
479−utf8_txt_1 = [ [0xe4,0xbd,0xa0]
479+utf8Txt1 = [ [0xe4,0xbd,0xa0]
480− , [0xe5,0xa5,0xbd]
480+ , [0xe5,0xa5,0xbd]
481− , [0xe5,0x90,0x97]
481+ , [0xe5,0x90,0x97]
484−iso_10646_txt_1 :: String
484+iso10646Txt1 :: String
485−iso_10646_txt_1 = map toEnum [20320,22909,21527]
485+iso10646Txt1 = map toEnum [20320,22909,21527]
487−unicode_double_width_0 = Test
487+unicodeDoubleWidth0 = Test
488− { test_name = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
488+ { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489− , test_ID = "unicode_double_width_0"
489+ , testID = "unicodeDoubleWidth0"
490− , test_action = do
490+ , testAction = do
491− t <- output_for_current_terminal
491+ t <- standardIOConfig >>= outputForConfig
492− reserve_display t
492+ reserveDisplay t
493− hide_cursor t
493+ hideCursor t
494− withArrayLen (concat utf8_txt_1) (flip $ hPutBuf stdout)
494+ withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
495 hPutStr stdout "\n"
495 hPutStr stdout "\n"
496 hPutStr stdout "012345\n"
496 hPutStr stdout "012345\n"
497 hFlush stdout
497 hFlush stdout
499− release_display t
499+ releaseDisplay t
500− release_terminal t
500+ releaseTerminal t
501 return ()
501 return ()
502− , print_summary = unicode_double_width_summary
502+ , printSummary = unicodeDoubleWidthSummary
503− , confirm_results = generic_output_match_confirm
503+ , confirmResults = genericOutputMatchConfirm
506−unicode_double_width_1 = Test
506+unicodeDoubleWidth1 = Test
507− { test_name = "Verify terminal can display unicode double-width characters. (Image ops)"
507+ { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
508− , test_ID = "unicode_double_width_1"
508+ , testID = "unicodeDoubleWidth1"
509− , test_action = do
509+ , testAction = do
510− t <- output_for_current_terminal
510+ t <- standardIOConfig >>= outputForConfig
511− reserve_display t
511+ reserveDisplay t
512− let pic = pic_for_image image
512+ let pic = picForImage image
513− image = line_0 <-> line_1
513+ image = line0 <-> line1
514− line_0 = iso_10646_string def_attr iso_10646_txt_1
514+ line0 = iso10646String defAttr iso10646Txt1
515− line_1 = string def_attr "012345"
515+ line1 = string defAttr "012345"
516− d <- display_bounds t >>= display_context t
516+ d <- displayBounds t >>= displayContext t
517− output_picture d pic
517+ outputPicture d pic
519− release_display t
519+ releaseDisplay t
520− release_terminal t
520+ releaseTerminal t
521 return ()
521 return ()
522− , print_summary = unicode_double_width_summary
522+ , printSummary = unicodeDoubleWidthSummary
523− , confirm_results = generic_output_match_confirm
523+ , confirmResults = genericOutputMatchConfirm
526−unicode_double_width_summary = putStr [s|
526+unicodeDoubleWidthSummary = putStr [s|
527Once return is pressed:
527Once return is pressed:
528 0. The screen will be cleared.
528 0. The screen will be cleared.
529 1. The cursor will be hidden.
529 1. The cursor will be hidden.
@@ -550,32 +550,32 @@ After return is pressed for the second time:
550 1. The cursor should be visible.
550 1. The cursor should be visible.
553−all_colors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
553+allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554− [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
554+ [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
556−all_bright_colors
556+allBrightColors
557− = zip [ bright_black, bright_red, bright_green, bright_yellow, bright_blue, bright_magenta, bright_cyan, bright_white ]
557+ = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
558 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
558 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
560−attributes_test_0 = Test
560+attributesTest0 = Test
561− { test_name = "Character attributes: foreground colors."
561+ { testName = "Character attributes: foreground colors."
562− , test_ID = "attributes_test_0"
562+ , testID = "attributesTest0"
563− , test_action = do
563+ , testAction = do
564− t <- output_for_current_terminal
564+ t <- standardIOConfig >>= outputForConfig
565− reserve_display t
565+ reserveDisplay t
566− let pic = pic_for_image image
566+ let pic = picForImage image
567− image = border <|> column_0 <|> border <|> column_1 <|> border
567+ image = border <|> column0 <|> border <|> column1 <|> border
568− column_0 = vert_cat $ map line_with_color all_colors
568+ column0 = vertCat $ map lineWithColor allColors
569− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
569+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
570− column_1 = vert_cat $ map (string def_attr . snd) all_colors
570+ column1 = vertCat $ map (string defAttr . snd) allColors
571− line_with_color (c, c_name) = string (def_attr `with_fore_color` c) c_name
571+ lineWithColor (c, cName) = string (defAttr `withForeColor` c) cName
572− d <- display_bounds t >>= display_context t
572+ d <- displayBounds t >>= displayContext t
573− output_picture d pic
573+ outputPicture d pic
575− release_display t
575+ releaseDisplay t
576− release_terminal t
576+ releaseTerminal t
577 return ()
577 return ()
578− , print_summary = do
578+ , printSummary = do
579 putStr $ [s|
579 putStr $ [s|
580Once return is pressed:
580Once return is pressed:
581 0. The screen will be cleared.
581 0. The screen will be cleared.
@@ -596,32 +596,32 @@ After return is pressed for the second time:
596 0. The screen containing the test summary should be restored.
596 0. The screen containing the test summary should be restored.
597 1. The cursor should be visible.
597 1. The cursor should be visible.
599− , confirm_results = do
599+ , confirmResults = do
600 putStr $ [s|
600 putStr $ [s|
601Did the test output match the description?
601Did the test output match the description?
603− default_success_confirm_results
603+ defaultSuccessConfirmResults
606−attributes_test_1 = Test
606+attributesTest1 = Test
607− { test_name = "Character attributes: background colors."
607+ { testName = "Character attributes: background colors."
608− , test_ID = "attributes_test_1"
608+ , testID = "attributesTest1"
609− , test_action = do
609+ , testAction = do
610− t <- output_for_current_terminal
610+ t <- standardIOConfig >>= outputForConfig
611− reserve_display t
611+ reserveDisplay t
612− let pic = pic_for_image image
612+ let pic = picForImage image
613− image = border <|> column_0 <|> border <|> column_1 <|> border
613+ image = border <|> column0 <|> border <|> column1 <|> border
614− column_0 = vert_cat $ map line_with_color all_colors
614+ column0 = vertCat $ map lineWithColor allColors
615− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
615+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
616− column_1 = vert_cat $ map (string def_attr . snd) all_colors
616+ column1 = vertCat $ map (string defAttr . snd) allColors
617− line_with_color (c, c_name) = string (def_attr `with_back_color` c) c_name
617+ lineWithColor (c, cName) = string (defAttr `withBackColor` c) cName
618− d <- display_bounds t >>= display_context t
618+ d <- displayBounds t >>= displayContext t
619− output_picture d pic
619+ outputPicture d pic
621− release_display t
621+ releaseDisplay t
622− release_terminal t
622+ releaseTerminal t
623 return ()
623 return ()
624− , print_summary = do
624+ , printSummary = do
625 putStr $ [s|
625 putStr $ [s|
626Once return is pressed:
626Once return is pressed:
627 0. The screen will be cleared.
627 0. The screen will be cleared.
@@ -651,57 +651,57 @@ After return is pressed for the second time:
651 0. The screen containing the test summary should be restored.
651 0. The screen containing the test summary should be restored.
652 1. The cursor should be visible.
652 1. The cursor should be visible.
654− , confirm_results = do
654+ , confirmResults = do
655 putStr $ [s|
655 putStr $ [s|
656Did the test output match the description?
656Did the test output match the description?
658− default_success_confirm_results
658+ defaultSuccessConfirmResults
661−attributes_test_2 = Test
661+attributesTest2 = Test
662− { test_name = "Character attributes: Vivid foreground colors."
662+ { testName = "Character attributes: Vivid foreground colors."
663− , test_ID = "attributes_test_2"
663+ , testID = "attributesTest2"
664− , test_action = do
664+ , testAction = do
665− t <- output_for_current_terminal
665+ t <- standardIOConfig >>= outputForConfig
666− reserve_display t
666+ reserveDisplay t
667− let pic = pic_for_image image
667+ let pic = picForImage image
668− image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
668+ image = horizCat [border, column0, border, column1, border, column2, border]
669− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
669+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
670− column_0 = vert_cat $ map line_with_color_0 all_colors
670+ column0 = vertCat $ map lineWithColor0 allColors
671− column_1 = vert_cat $ map line_with_color_1 all_bright_colors
671+ column1 = vertCat $ map lineWithColor1 allBrightColors
672− column_2 = vert_cat $ map (string def_attr . snd) all_colors
672+ column2 = vertCat $ map (string defAttr . snd) allColors
673− line_with_color_0 (c, c_name) = string (def_attr `with_fore_color` c) c_name
673+ lineWithColor0 (c, cName) = string (defAttr `withForeColor` c) cName
674− line_with_color_1 (c, c_name) = string (def_attr `with_fore_color` c) c_name
674+ lineWithColor1 (c, cName) = string (defAttr `withForeColor` c) cName
675− d <- display_bounds t >>= display_context t
675+ d <- displayBounds t >>= displayContext t
676− output_picture d pic
676+ outputPicture d pic
678− release_display t
678+ releaseDisplay t
679− release_terminal t
679+ releaseTerminal t
680 return ()
680 return ()
681− , print_summary = do
681+ , printSummary = do
682 putStr $ [s|
682 putStr $ [s|
683Once return is pressed:
683Once return is pressed:
684 0. The screen will be cleared.
684 0. The screen will be cleared.
685 1. The cursor will be hidden.
685 1. The cursor will be hidden.
686 2. 9 lines of text in three columns will be drawn:
686 2. 9 lines of text in three columns will be drawn:
687 a. The first column will be a name of a standard color (for an 8 color
687 a. The first column will be a name of a standard color (for an 8 color
688− terminal) rendered with that color as the foreground color.
688+ terminal) rendered with that color as the foreground color.
689 b. The next column will be also be the name of a standard color rendered
689 b. The next column will be also be the name of a standard color rendered
690 with that color as the foreground color but the shade used should be
690 with that color as the foreground color but the shade used should be
691− more vivid than the shade used in the first column.
691+ more vivid than the shade used in the first column.
692 c. The final column will be the name of a color rendered with the
692 c. The final column will be the name of a color rendered with the
693 default attributes.
693 default attributes.
695For instance, one line will be the word "magenta" and that word should be
695For instance, one line will be the word "magenta" and that word should be
696−rendered in the magenta color.
696+rendered in the magenta color.
698I'm not actually sure exactly what "vivid" means in this context. For xterm the
698I'm not actually sure exactly what "vivid" means in this context. For xterm the
699−vivid colors are brighter.
699+vivid colors are brighter.
702 * The first column: The foreground color matches the named color.
702 * The first column: The foreground color matches the named color.
703 * The second column: The foreground color matches the named color but is
703 * The second column: The foreground color matches the named color but is
704− more vivid than the color used in the first column.
704+ more vivid than the color used in the first column.
705 * The third column: All text is rendered with the default attributes.
705 * The third column: All text is rendered with the default attributes.
706 * The vertical bars used in each line to mark the border of a column are
706 * The vertical bars used in each line to mark the border of a column are
707 lined up.
707 lined up.
@@ -710,34 +710,34 @@ After return is pressed for the second time:
710 0. The screen containing the test summary should be restored.
710 0. The screen containing the test summary should be restored.
711 1. The cursor should be visible.
711 1. The cursor should be visible.
713− , confirm_results = do
713+ , confirmResults = do
714 putStr $ [s|
714 putStr $ [s|
715Did the test output match the description?
715Did the test output match the description?
717− default_success_confirm_results
717+ defaultSuccessConfirmResults
720−attributes_test_3 = Test
720+attributesTest3 = Test
721− { test_name = "Character attributes: Vivid background colors."
721+ { testName = "Character attributes: Vivid background colors."
722− , test_ID = "attributes_test_3"
722+ , testID = "attributesTest3"
723− , test_action = do
723+ , testAction = do
724− t <- output_for_current_terminal
724+ t <- standardIOConfig >>= outputForConfig
725− reserve_display t
725+ reserveDisplay t
726− let pic = pic_for_image image
726+ let pic = picForImage image
727− image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
727+ image = horizCat [border, column0, border, column1, border, column2, border]
728− border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
728+ border = vertCat $ replicate (length allColors) $ string defAttr " | "
729− column_0 = vert_cat $ map line_with_color_0 all_colors
729+ column0 = vertCat $ map lineWithColor0 allColors
730− column_1 = vert_cat $ map line_with_color_1 all_bright_colors
730+ column1 = vertCat $ map lineWithColor1 allBrightColors
731− column_2 = vert_cat $ map (string def_attr . snd) all_colors
731+ column2 = vertCat $ map (string defAttr . snd) allColors
732− line_with_color_0 (c, c_name) = string (def_attr `with_back_color` c) c_name
732+ lineWithColor0 (c, cName) = string (defAttr `withBackColor` c) cName
733− line_with_color_1 (c, c_name) = string (def_attr `with_back_color` c) c_name
733+ lineWithColor1 (c, cName) = string (defAttr `withBackColor` c) cName
734− d <- display_bounds t >>= display_context t
734+ d <- displayBounds t >>= displayContext t
735− output_picture d pic
735+ outputPicture d pic
737− release_display t
737+ releaseDisplay t
738− release_terminal t
738+ releaseTerminal t
739 return ()
739 return ()
740− , print_summary = do
740+ , printSummary = do
741 putStr $ [s|
741 putStr $ [s|
742Once return is pressed:
742Once return is pressed:
743 0. The screen will be cleared.
743 0. The screen will be cleared.
@@ -745,23 +745,23 @@ Once return is pressed:
745 2. 9 lines of text in three columns will be drawn:
745 2. 9 lines of text in three columns will be drawn:
746 a. The first column will contain be a name of a standard color for an 8
746 a. The first column will contain be a name of a standard color for an 8
747 color terminal rendered with the default foreground color with a
747 color terminal rendered with the default foreground color with a
748− background the named color.
748+ background the named color.
749 b. The first column will contain be a name of a standard color for an 8
749 b. The first column will contain be a name of a standard color for an 8
750 color terminal rendered with the default foreground color with the
750 color terminal rendered with the default foreground color with the
751− background a vivid version of the named color.
751+ background a vivid version of the named color.
752 c. The third column will be the name of a standard color rendered with
752 c. The third column will be the name of a standard color rendered with
753 the default attributes.
753 the default attributes.
755For instance, one line will contain be the word "magenta" and the word should
755For instance, one line will contain be the word "magenta" and the word should
756−be rendered in the default foreground color over a magenta background.
756+be rendered in the default foreground color over a magenta background.
758I'm not actually sure exactly what "vivid" means in this context. For xterm the
758I'm not actually sure exactly what "vivid" means in this context. For xterm the
759vivid colors are brighter.
759vivid colors are brighter.
762 * The first column: The background color matches the named color.
762 * The first column: The background color matches the named color.
763 * The second column: The background color matches the named color and is
763 * The second column: The background color matches the named color and is
764− more vivid than the color used in the first column.
764+ more vivid than the color used in the first column.
765 * The third column column: All text is rendered with the default attributes.
765 * The third column column: All text is rendered with the default attributes.
766 * The vertical bars used in each line to mark the border of a column are
766 * The vertical bars used in each line to mark the border of a column are
767 lined up.
767 lined up.
@@ -777,51 +777,51 @@ After return is pressed for the second time:
777 0. The screen containing the test summary should be restored.
777 0. The screen containing the test summary should be restored.
778 1. The cursor should be visible.
778 1. The cursor should be visible.
780− , confirm_results = do
780+ , confirmResults = do
781 putStr $ [s|
781 putStr $ [s|
782Did the test output match the description?
782Did the test output match the description?
784− default_success_confirm_results
784+ defaultSuccessConfirmResults
787−attr_combos =
787+attrCombos =
788 [ ( "default", id )
788 [ ( "default", id )
789− , ( "bold", flip with_style bold )
789+ , ( "bold", flip withStyle bold )
790− , ( "blink", flip with_style blink )
790+ , ( "blink", flip withStyle blink )
791− , ( "underline", flip with_style underline )
791+ , ( "underline", flip withStyle underline )
792− , ( "bold + blink", flip with_style (bold + blink) )
792+ , ( "bold + blink", flip withStyle (bold + blink) )
793− , ( "bold + underline", flip with_style (bold + underline) )
793+ , ( "bold + underline", flip withStyle (bold + underline) )
794− , ( "underline + blink", flip with_style (underline + blink) )
794+ , ( "underline + blink", flip withStyle (underline + blink) )
795− , ( "bold + blink + underline", flip with_style (bold + blink + underline) )
795+ , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
798−attributes_test_4 = Test
798+attributesTest4 = Test
799− { test_name = "Character attributes: Bold; Blink; Underline."
799+ { testName = "Character attributes: Bold; Blink; Underline."
800− , test_ID = "attributes_test_4"
800+ , testID = "attributesTest4"
801− , test_action = do
801+ , testAction = do
802− t <- output_for_current_terminal
802+ t <- standardIOConfig >>= outputForConfig
803− reserve_display t
803+ reserveDisplay t
804− let pic = pic_for_image image
804+ let pic = picForImage image
805− image = horiz_cat [border, column_0, border, column_1, border]
805+ image = horizCat [border, column0, border, column1, border]
806− border = vert_cat $ replicate (length attr_combos) $ string def_attr " | "
806+ border = vertCat $ replicate (length attrCombos) $ string defAttr " | "
807− column_0 = vert_cat $ map line_with_attrs attr_combos
807+ column0 = vertCat $ map lineWithAttrs attrCombos
808− column_1 = vert_cat $ map (string def_attr . fst) attr_combos
808+ column1 = vertCat $ map (string defAttr . fst) attrCombos
809− line_with_attrs (desc, attr_f) = string (attr_f def_attr) desc
809+ lineWithAttrs (desc, attrF) = string (attrF defAttr) desc
810− d <- display_bounds t >>= display_context t
810+ d <- displayBounds t >>= displayContext t
811− output_picture d pic
811+ outputPicture d pic
813− release_display t
813+ releaseDisplay t
814− release_terminal t
814+ releaseTerminal t
815 return ()
815 return ()
816− , print_summary = do
816+ , printSummary = do
817 putStr $ [s|
817 putStr $ [s|
818Once return is pressed:
818Once return is pressed:
819 0. The screen will be cleared.
819 0. The screen will be cleared.
820 1. The cursor will be hidden.
820 1. The cursor will be hidden.
821− 2. 8 rows of text in two columns.
821+ 2. 8 rows of text in two columns.
822 The rows will contain the following text:
822 The rows will contain the following text:
826 underline
826 underline
827 bold + blink
827 bold + blink
@@ -830,8 +830,8 @@ Once return is pressed:
830 bold + blink + underline
830 bold + blink + underline
831 The first column will be rendered with the described attributes. The second
831 The first column will be rendered with the described attributes. The second
832 column will be rendered with the default attributes.
832 column will be rendered with the default attributes.
835 * The vertical bars used in each line to mark the border of a column are
835 * The vertical bars used in each line to mark the border of a column are
836 lined up.
836 lined up.
837 * The text in the first column is rendered as described.
837 * The text in the first column is rendered as described.
@@ -840,31 +840,31 @@ After return is pressed for the second time:
840 0. The screen containing the test summary should be restored.
840 0. The screen containing the test summary should be restored.
841 1. The cursor should be visible.
841 1. The cursor should be visible.
843− , confirm_results = do
843+ , confirmResults = do
844 putStr $ [s|
844 putStr $ [s|
845Did the test output match the description?
845Did the test output match the description?
847− default_success_confirm_results
847+ defaultSuccessConfirmResults
850−attributes_test_5 = Test
850+attributesTest5 = Test
851− { test_name = "Character attributes: 240 color palette"
851+ { testName = "Character attributes: 240 color palette"
852− , test_ID = "attributes_test_5"
852+ , testID = "attributesTest5"
853− , test_action = do
853+ , testAction = do
854− t <- output_for_current_terminal
854+ t <- standardIOConfig >>= outputForConfig
855− reserve_display t
855+ reserveDisplay t
856− let pic = pic_for_image image
856+ let pic = picForImage image
857− image = vert_cat $ map horiz_cat $ split_color_images color_images
857+ image = vertCat $ map horizCat $ splitColorImages colorImages
858− color_images = map (\i -> string (current_attr `with_back_color` Color240 i) " ") [0..239]
858+ colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
859− split_color_images [] = []
859+ splitColorImages [] = []
860− split_color_images is = (take 20 is ++ [string def_attr " "]) : (split_color_images (drop 20 is))
860+ splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
861− d <- display_bounds t >>= display_context t
861+ d <- displayBounds t >>= displayContext t
862− output_picture d pic
862+ outputPicture d pic
864− release_display t
864+ releaseDisplay t
865− release_terminal t
865+ releaseTerminal t
866 return ()
866 return ()
867− , print_summary = do
867+ , printSummary = do
868 putStr $ [s|
868 putStr $ [s|
869Once return is pressed:
869Once return is pressed:
870 0. The screen will be cleared.
870 0. The screen will be cleared.
@@ -872,296 +872,304 @@ Once return is pressed:
872 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
872 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
873 of some sort. I'm not exactly sure if all color terminals use the same palette. I doubt it...
873 of some sort. I'm not exactly sure if all color terminals use the same palette. I doubt it...
877After return is pressed for the second time:
877After return is pressed for the second time:
878 0. The screen containing the test summary should be restored.
878 0. The screen containing the test summary should be restored.
879 1. The cursor should be visible.
879 1. The cursor should be visible.
881− , confirm_results = do
881+ , confirmResults = do
882 putStr $ [s|
882 putStr $ [s|
883Did the test output match the description?
883Did the test output match the description?
885− default_success_confirm_results
885+ defaultSuccessConfirmResults
888−inline_test_0 = Test
888+inlineTest0 = Test
889− { test_name = "Verify styled output can be performed without clearing the screen."
889+ { testName = "Verify styled output can be performed without clearing the screen."
890− , test_ID = "inline_test_0"
890+ , testID = "inlineTest0"
891− , test_action = do
891+ , testAction = do
892 putStrLn "line 1."
892 putStrLn "line 1."
893− put_attr_change_ $ back_color red >> apply_style underline
893+ putAttrChange_ $ backColor red >> applyStyle underline
894 putStrLn "line 2."
894 putStrLn "line 2."
895− put_attr_change_ $ default_all
895+ putAttrChange_ $ defaultAll
896 putStrLn "line 3."
896 putStrLn "line 3."
897− , print_summary = putStr $ [s|
897+ , printSummary = putStr $ [s|
898lines are in order.
898lines are in order.
899The second line "line 2" should have a red background and the text underline.
899The second line "line 2" should have a red background and the text underline.
900The third line "line 3" should be drawn in the same style as the first line.
900The third line "line 3" should be drawn in the same style as the first line.
903− , confirm_results = generic_output_match_confirm
903+ , confirmResults = genericOutputMatchConfirm
906−inline_test_1 = Test
906+inlineTest1 = Test
907− { test_name = "Verify styled output can be performed without clearing the screen."
907+ { testName = "Verify styled output can be performed without clearing the screen."
908− , test_ID = "inline_test_1"
908+ , testID = "inlineTest1"
909− , test_action = do
909+ , testAction = do
910 putStr "Not styled. "
910 putStr "Not styled. "
911− put_attr_change_ $ back_color red >> apply_style underline
911+ putAttrChange_ $ backColor red >> applyStyle underline
912 putStr " Styled! "
912 putStr " Styled! "
913− put_attr_change_ $ default_all
913+ putAttrChange_ $ defaultAll
914 putStrLn "Not styled."
914 putStrLn "Not styled."
915− , print_summary = putStr $ [s|
915+ , printSummary = putStr $ [s|
918− , confirm_results = generic_output_match_confirm
918+ , confirmResults = genericOutputMatchConfirm
921−inline_test_2 = Test
921+inlineTest2 = Test
922− { test_name = "Verify styled output can be performed without clearing the screen."
922+ { testName = "Verify styled output can be performed without clearing the screen."
923− , test_ID = "inline_test_1"
923+ , testID = "inlineTest1"
924− , test_action = do
924+ , testAction = do
925 putStr "Not styled. "
925 putStr "Not styled. "
926− put_attr_change_ $ back_color red >> apply_style underline
926+ putAttrChange_ $ backColor red >> applyStyle underline
927 putStr " Styled! "
927 putStr " Styled! "
928− put_attr_change_ $ default_all
928+ putAttrChange_ $ defaultAll
929 putStr "Not styled.\n"
929 putStr "Not styled.\n"
930− , print_summary = putStr $ [s|
930+ , printSummary = putStr $ [s|
932− , confirm_results = generic_output_match_confirm
932+ , confirmResults = genericOutputMatchConfirm
935−cursor_hide_test_0 :: Test
935+cursorHideTest0 :: Test
936−cursor_hide_test_0 = Test
936+cursorHideTest0 = Test
937− { test_name = "Verify the cursor is hid and re-shown. issue #7"
937+ { testName = "Verify the cursor is hid and re-shown. issue #7"
938− , test_ID = "cursor_hide_test_0"
938+ , testID = "cursorHideTest0"
939− , test_action = do
939+ , testAction = do
940− vty <- mkVty
940+ vty <- mkVty defaultConfig
941− show_cursor $ output_iface vty
941+ showCursor $ outputIface vty
942− set_cursor_pos (output_iface vty) 5 5
942+ setCursorPos (outputIface vty) 5 5
943− next_event vty
943+ nextEvent vty
944− hide_cursor $ output_iface vty
944+ hideCursor $ outputIface vty
945− next_event vty
945+ nextEvent vty
946 shutdown vty
946 shutdown vty
947 return ()
947 return ()
948− , print_summary = putStr $ [s|
948+ , printSummary = putStr $ [s|
949 1. verify the cursor is displayed.
949 1. verify the cursor is displayed.
950 2. press enter
950 2. press enter
951 3. verify the cursor is hid.
951 3. verify the cursor is hid.
952 4. press enter.
952 4. press enter.
953 5. the display should return to the state before the test.
953 5. the display should return to the state before the test.
955− , confirm_results = generic_output_match_confirm
955+ , confirmResults = genericOutputMatchConfirm
958−output_image_and_wait :: Image -> IO ()
958+outputImageAndWait :: Image -> IO ()
959−output_image_and_wait image = do
959+outputImageAndWait image = do
960− let pic = pic_for_image image
960+ let pic = picForImage image
961− output_pic_and_wait pic
961+ outputPicAndWait pic
963−output_pic_and_wait :: Picture -> IO ()
963+outputPicAndWait :: Picture -> IO ()
964−output_pic_and_wait pic = do
964+outputPicAndWait pic = do
965− t <- output_for_current_terminal
965+ t <- standardIOConfig >>= outputForConfig
966− reserve_display t
966+ reserveDisplay t
967− d <- display_bounds t >>= display_context t
967+ d <- displayBounds t >>= displayContext t
968− output_picture d pic
968+ outputPicture d pic
970− release_display t
970+ releaseDisplay t
971− release_terminal t
971+ releaseTerminal t
972 return ()
972 return ()
974−vert_crop_test_0 :: Test
974+vertCropTest0 :: Test
975−vert_crop_test_0 = Test
975+vertCropTest0 = Test
976− { test_name = "Verify bottom cropping works as expected with single column chars"
976+ { testName = "Verify bottom cropping works as expected with single column chars"
977− , test_ID = "crop_test_0"
977+ , testID = "cropTest0"
978− , test_action = do
978+ , testAction = do
979− let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum
979+ let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsum
980− block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum
980+ block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsum
981− image = block_0 <-> background_fill 10 2 <-> block_1
981+ image = block0 <-> backgroundFill 10 2 <-> block1
982− output_image_and_wait image
982+ outputImageAndWait image
983− , print_summary = putStr $ [s|
983+ , printSummary = putStr $ [s|
984 1. Verify the two text blocks are identical.
984 1. Verify the two text blocks are identical.
985 2. press enter.
985 2. press enter.
986 3. the display should return to the state before the test.
986 3. the display should return to the state before the test.
988− , confirm_results = generic_output_match_confirm
988+ , confirmResults = genericOutputMatchConfirm
991−vert_crop_test_1 :: Test
991+vertCropTest1 :: Test
992−vert_crop_test_1 = Test
992+vertCropTest1 = Test
993− { test_name = "Verify bottom cropping works as expected with double column chars"
993+ { testName = "Verify bottom cropping works as expected with double column chars"
994− , test_ID = "crop_test_0"
994+ , testID = "cropTest0"
995− , test_action = do
995+ , testAction = do
996− let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum_chinese
996+ let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
997− block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum_chinese
997+ block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsumChinese
998− image = block_0 <-> background_fill 10 2 <-> block_1
998+ image = block0 <-> backgroundFill 10 2 <-> block1
999− output_image_and_wait image
999+ outputImageAndWait image
1000− , print_summary = putStr $ [s|
1000+ , printSummary = putStr $ [s|
1001 1. Verify the two text blocks are identical.
1001 1. Verify the two text blocks are identical.
1002 2. press enter.
1002 2. press enter.
1003 3. the display should return to the state before the test.
1003 3. the display should return to the state before the test.
1005− , confirm_results = generic_output_match_confirm
1005+ , confirmResults = genericOutputMatchConfirm
1008−vert_crop_test_2 :: Test
1008+vertCropTest2 :: Test
1009−vert_crop_test_2 = Test
1009+vertCropTest2 = Test
1010− { test_name = "Verify top cropping works as expected with single column chars"
1010+ { testName = "Verify top cropping works as expected with single column chars"
1011− , test_ID = "crop_test_0"
1011+ , testID = "cropTest2"
1012− , test_action = do
1012+ , testAction = do
1013− let block_0 = crop_top 2 $ vert_cat $ map (string def_attr) lorum_ipsum
1013+ let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsum
1014− block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum - 2) lorum_ipsum
1014+ block1 = vertCat $ map (string defAttr) $ drop (length lorumIpsum - 2) lorumIpsum
1015− image = block_0 <-> background_fill 10 2 <-> block_1
1015+ image = block0 <-> backgroundFill 10 2 <-> block1
1016− output_image_and_wait image
1016+ outputImageAndWait image
1017− , print_summary = putStr $ [s|
1017+ , printSummary = putStr $ [s|
1018 1. Verify the two text blocks are identical.
1018 1. Verify the two text blocks are identical.
1019 2. press enter.
1019 2. press enter.
1020 3. the display should return to the state before the test.
1020 3. the display should return to the state before the test.
1022− , confirm_results = generic_output_match_confirm
1022+ , confirmResults = genericOutputMatchConfirm
1025−vert_crop_test_3 :: Test
1025+vertCropTest3 :: Test
1026−vert_crop_test_3 = Test
1026+vertCropTest3 = Test
1027− { test_name = "Verify top cropping works as expected with double column chars"
1027+ { testName = "Verify top cropping works as expected with double column chars"
1028− , test_ID = "crop_test_0"
1028+ , testID = "cropTest0"
1029− , test_action = do
1029+ , testAction = do
1030− let block_0 = crop_top 2 $ vert_cat $ map (string def_attr) lorum_ipsum_chinese
1030+ let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
1031− block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum_chinese - 2 ) lorum_ipsum_chinese
1031+ block1 = vertCat $ map (string defAttr) $ drop (length lorumIpsumChinese - 2 ) lorumIpsumChinese
1032− image = block_0 <-> background_fill 10 2 <-> block_1
1032+ image = block0 <-> backgroundFill 10 2 <-> block1
1033− output_image_and_wait image
1033+ outputImageAndWait image
1034− , print_summary = putStr $ [s|
1034+ , printSummary = putStr $ [s|
1035 1. Verify the two text blocks are identical.
1035 1. Verify the two text blocks are identical.
1036 2. press enter.
1036 2. press enter.
1037 3. the display should return to the state before the test.
1037 3. the display should return to the state before the test.
1039− , confirm_results = generic_output_match_confirm
1039+ , confirmResults = genericOutputMatchConfirm
1042−horiz_crop_test_0 :: Test
1042+horizCropTest0 :: Test
1043−horiz_crop_test_0 = Test
1043+horizCropTest0 = Test
1044− { test_name = "Verify right cropping works as expected with single column chars"
1044+ { testName = "Verify right cropping works as expected with single column chars"
1045− , test_ID = "crop_test_0"
1045+ , testID = "cropTest0"
1046− , test_action = do
1046+ , testAction = do
1047− let base_image = vert_cat $ map (string def_attr) lorum_ipsum
1047+ let baseImage = vertCat $ map (string defAttr) lorumIpsum
1048− cropped_image = crop_right (image_width base_image `div` 2) base_image
1048+ croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1049− image = base_image <-> background_fill 10 2 <-> cropped_image
1049+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1050− output_image_and_wait image
1050+ outputImageAndWait image
1051− , print_summary = putStr $ [s|
1051+ , printSummary = putStr $ [s|
1052 1. Verify the bottom text block is about half the width of the top text block.
1052 1. Verify the bottom text block is about half the width of the top text block.
1053 2. press enter.
1053 2. press enter.
1054 3. the display should return to the state before the test.
1054 3. the display should return to the state before the test.
1056− , confirm_results = generic_output_match_confirm
1056+ , confirmResults = genericOutputMatchConfirm
1059−horiz_crop_test_1 :: Test
1059+horizCropTest1 :: Test
1060−horiz_crop_test_1 = Test
1060+horizCropTest1 = Test
1061− { test_name = "Verify right cropping works as expected with double column chars"
1061+ { testName = "Verify right cropping works as expected with double column chars"
1062− , test_ID = "crop_test_0"
1062+ , testID = "cropTest0"
1063− , test_action = do
1063+ , testAction = do
1064− let base_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1064+ let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1065− cropped_image = crop_right (image_width base_image `div` 2) base_image
1065+ croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1066− image = base_image <-> background_fill 10 2 <-> cropped_image
1066+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1067− output_image_and_wait image
1067+ outputImageAndWait image
1068− , print_summary = putStr $ [s|
1068+ , printSummary = putStr $ [s|
1069 1. Verify the bottom text block is the left half of the top block. Ellipses on the right edge are OK.
1069 1. Verify the bottom text block is the left half of the top block. Ellipses on the right edge are OK.
1070 2. press enter.
1070 2. press enter.
1071 3. the display should return to the state before the test.
1071 3. the display should return to the state before the test.
1073− , confirm_results = generic_output_match_confirm
1073+ , confirmResults = genericOutputMatchConfirm
1076−horiz_crop_test_2 :: Test
1076+horizCropTest2 :: Test
1077−horiz_crop_test_2 = Test
1077+horizCropTest2 = Test
1078− { test_name = "Verify left cropping works as expected with single column chars"
1078+ { testName = "Verify left cropping works as expected with single column chars"
1079− , test_ID = "crop_test_0"
1079+ , testID = "cropTest0"
1080− , test_action = do
1080+ , testAction = do
1081− let base_image = vert_cat $ map (string def_attr) lorum_ipsum
1081+ let baseImage = vertCat $ map (string defAttr) lorumIpsum
1082− cropped_image = crop_left (image_width base_image `div` 2) base_image
1082+ croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1083− image = base_image <-> background_fill 10 2 <-> cropped_image
1083+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1084− output_image_and_wait image
1084+ outputImageAndWait image
1085− , print_summary = putStr $ [s|
1085+ , printSummary = putStr $ [s|
1086 1. Verify the bottom text block is the right half of the top text block.
1086 1. Verify the bottom text block is the right half of the top text block.
1087 2. press enter.
1087 2. press enter.
1088 3. the display should return to the state before the test.
1088 3. the display should return to the state before the test.
1090− , confirm_results = generic_output_match_confirm
1090+ , confirmResults = genericOutputMatchConfirm
1093−horiz_crop_test_3 :: Test
1093+horizCropTest3 :: Test
1094−horiz_crop_test_3 = Test
1094+horizCropTest3 = Test
1095− { test_name = "Verify right cropping works as expected with double column chars"
1095+ { testName = "Verify right cropping works as expected with double column chars"
1096− , test_ID = "crop_test_0"
1096+ , testID = "cropTest0"
1097− , test_action = do
1097+ , testAction = do
1098− let base_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1098+ let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1099− cropped_image = crop_left (image_width base_image `div` 2) base_image
1099+ croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1100− image = base_image <-> background_fill 10 2 <-> cropped_image
1100+ image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1101− output_image_and_wait image
1101+ outputImageAndWait image
1102− , print_summary = putStr $ [s|
1102+ , printSummary = putStr $ [s|
1103 1. Verify the bottom text block is the right half of the top block. Ellipses on the left edge are OK.
1103 1. Verify the bottom text block is the right half of the top block. Ellipses on the left edge are OK.
1104 2. press enter.
1104 2. press enter.
1105 3. the display should return to the state before the test.
1105 3. the display should return to the state before the test.
1107− , confirm_results = generic_output_match_confirm
1107+ , confirmResults = genericOutputMatchConfirm
1110−layer_0 :: Test
1110+layer0 :: Test
1111−layer_0 = Test
1111+layer0 = Test
1112− { test_name = "verify layer 0"
1112+ { testName = "verify layer 0"
1113− , test_ID = "layer_0"
1113+ , testID = "layer0"
1114− , test_action = do
1114+ , testAction = do
1115− let upper_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1115+ let upperImage = vertCat $ map (string defAttr) lorumIpsumChinese
1116− lower_image = vert_cat $ map (string def_attr) lorum_ipsum
1116+ lowerImage = vertCat $ map (string defAttr) lorumIpsum
1117− p = pic_for_layers [upper_image, lower_image]
1117+ p = picForLayers [upperImage, lowerImage]
1118− output_pic_and_wait p
1118+ outputPicAndWait p
1119− , print_summary = putStr $ [s|
1119+ , printSummary = putStr $ [s|
1120 1. Verify the text block appears to be Chinese text placed on top Latin text.
1120 1. Verify the text block appears to be Chinese text placed on top Latin text.
1121 2. press enter.
1121 2. press enter.
1122 3. the display should return to the state before the test.
1122 3. the display should return to the state before the test.
1124− , confirm_results = generic_output_match_confirm
1124+ , confirmResults = genericOutputMatchConfirm
1127−layer_1 :: Test
1127+layer1 :: Test
1128−layer_1 = Test
1128+layer1 = Test
1129− { test_name = "verify layer 1"
1129+ { testName = "verify layer 1"
1130− , test_ID = "layer_1"
1130+ , testID = "layer1"
1131− , test_action = do
1131+ , testAction = do
1132− let upper_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1132+ let upperImage = vertCat $ map (string defAttr) lorumIpsumChinese
1133− block = resize 10 10 upper_image
1133+ block = resize 10 10 upperImage
1134− layer_0 = vert_cat $ map (string def_attr) lorum_ipsum
1134+ layer0 = vertCat $ map (string defAttr) lorumIpsum
1135− layer_1 = char_fill (def_attr `with_back_color` blue) '#' 1000 1000
1135+ layer1 = charFill (defAttr `withBackColor` blue) '#' 1000 1000
1136− cheesy_anim_0 block [layer_0, layer_1]
1136+ cheesyAnim0 block [layer0, layer1]
1137− , print_summary = putStr $ [s|
1137+ , printSummary = putStr $ [s|
1138 1. Verify the text block appears to be Chinese text moving on top a Latin text.
1138 1. Verify the text block appears to be Chinese text moving on top a Latin text.
1139 Which is all on a background of '#' characters over blue.
1139 Which is all on a background of '#' characters over blue.
1140 2. press enter.
1140 2. press enter.
1141 3. the display should return to the state before the test.
1141 3. the display should return to the state before the test.
1143− , confirm_results = generic_output_match_confirm
1143+ , confirmResults = genericOutputMatchConfirm
1146−cheesy_anim_0 :: Image -> [Image] -> IO ()
1146+cheesyAnim0 :: Image -> [Image] -> IO ()
1147−cheesy_anim_0 i background = do
1147+cheesyAnim0 i background = do
1148− t <- output_for_current_terminal
1148+ t <- standardIOConfig >>= outputForConfig
1149− reserve_display t
1149+ reserveDisplay t
1150− bounds <- display_bounds t
1150+ bounds <- displayBounds t
1151− d <- display_context t bounds
1151+ d <- displayContext t bounds
1152− forM_ [0..100] $ \t -> do
1152+ forM_ [0..2] $ \t -> do
1153+ forM_ [0..100] $ \t -> do
1153 let i_offset = translate (t `mod` fst bounds)
1154 let i_offset = translate (t `mod` fst bounds)
1154 (t `div` 2 `mod` snd bounds)
1155 (t `div` 2 `mod` snd bounds)
1156− let pic = pic_for_layers $ i_offset : background
1157+ let pic = picForLayers $ i_offset : background
1157− output_picture d pic
1158+ outputPicture d pic
1160+ forM_ [0..100] $ \t -> do
1161+ let i_offset = translate (t * (-1) `mod` fst bounds)
1162+ (t * (-1) `div` 2 `mod` snd bounds)
1164+ let pic = picForLayers $ i_offset : background
1165+ outputPicture d pic
1158 threadDelay 50000
1166 threadDelay 50000
1159− release_display t
1167+ releaseDisplay t
1160− release_terminal t
1168+ releaseTerminal t
1161 return ()
1169 return ()
1163−lorum_ipsum :: [String]
1171+lorumIpsum :: [String]
1164−lorum_ipsum = lines [s|
1172+lorumIpsum = lines [s|
1165Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,
1173Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,
1166totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae
1174totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae
1167dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
1175dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
@@ -1173,8 +1181,8 @@ commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate v
1173molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
1181molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
1176−lorum_ipsum_chinese :: [String]
1184+lorumIpsumChinese :: [String]
1177−lorum_ipsum_chinese = lines [s|
1185+lorumIpsumChinese = lines [s|
1178輐銛 螷蟞覮 裌覅詵 暕 鴅噮 槶 惝掭掝 婸媥媕 耏胠臿, 汫汭沎 忕汌卣 蚡袀 僣 蒮 瀁瀎瀊 渮湸湤 緌翢,
1186輐銛 螷蟞覮 裌覅詵 暕 鴅噮 槶 惝掭掝 婸媥媕 耏胠臿, 汫汭沎 忕汌卣 蚡袀 僣 蒮 瀁瀎瀊 渮湸湤 緌翢,
1179腠腶舝 糲蘥蠩 樏殣氀 蒮 蹢鎒 滍 鸄齴 櫧櫋瀩 鬄鵊鵙 莃荶衒, 毸溠 橀 簎艜薤 莃荶衒 翣聜蒢
1187腠腶舝 糲蘥蠩 樏殣氀 蒮 蹢鎒 滍 鸄齴 櫧櫋瀩 鬄鵊鵙 莃荶衒, 毸溠 橀 簎艜薤 莃荶衒 翣聜蒢
1180斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 bacon 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣
1188斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 bacon 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣