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