@@ -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.Output
9+import Graphics.Vty.Terminal
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− printIntro
28+ print_intro
30−outputFilePath = "test_results.list"
30+output_file_path = "test_results.list"
32−printIntro = do
32+print_intro = 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− |] ++ outputFilePath ++ [s|
40+ |] ++ output_file_path ++ [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.
@@ -63,43 +63,42 @@ All the tests assume the following about the terminal display:
63 a good range of the unicode characters. Each test involving unicode display
63 a good range of the unicode characters. Each test involving unicode display
64 describes the expected appearance of each glyph.
64 describes the expected appearance of each glyph.
66−Thanks for the help! :-D
66+Thanks for the help! :-D
67−To exit the test early enter "q" anytime at the following menu screen.
67+To exit the test early enter "q" anytime at the following menu screen. Even if
68−
68+you exit the test early please email the test_results.list file to
69−If any test fails then please post an issue to
69+coreyoconnor@gmail.com. The results file will still contain information useful
70− https://github.com/coreyoconnor/vty/issues
70+to debug terminal support.
71−with the test_results.list file pasted into the issue. A suitable summary is:
71+
72−"interactive terminal test failure".
74− waitForReturn
73+ wait_for_return
75− results <- doTestMenu 1
74+ results <- do_test_menu 1
76− envAttributes <- mapM ( \envName -> Control.Exception.catch ( Env.getEnv envName >>= return . (,) envName )
75+ env_attributes <- mapM ( \env_name -> catch ( Env.getEnv env_name >>= return . (,) env_name )
77− ( \ (_ :: SomeException) -> return (envName, "") )
76+ ( \ (_ :: SomeException) -> return (env_name, "") )
79− [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
78+ [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
80− t <- standardIOConfig >>= outputForConfig
79+ t <- terminal_handle
81− let resultsTxt = show envAttributes ++ "\n"
80+ let results_txt = show env_attributes ++ "\n"
82− ++ terminalID t ++ "\n"
81+ ++ terminal_ID t ++ "\n"
83− ++ show results ++ "\n"
82+ ++ show results ++ "\n"
84− releaseTerminal t
83+ release_terminal t
85− writeFile outputFilePath resultsTxt
84+ writeFile output_file_path results_txt
87−waitForReturn = do
86+wait_for_return = do
88 putStr "\n(press return to continue)"
87 putStr "\n(press return to continue)"
89 hFlush stdout
88 hFlush stdout
92−testMenu :: [(String, Test)]
91+test_menu :: [(String, Test)]
93−testMenu = zip (map show [1..]) allTests
92+test_menu = zip (map show [1..]) all_tests
95−doTestMenu :: Int -> IO [(String, Bool)]
94+do_test_menu :: Int -> IO [(String, Bool)]
96−doTestMenu nextID
95+do_test_menu next_ID
97− | nextID > length allTests = do
96+ | next_ID > length all_tests = do
98− putStrLn $ "Done! Please email the " ++ outputFilePath ++ " file to coreyoconnor@gmail.com"
97+ putStrLn $ "Done! Please email the " ++ output_file_path ++ " file to coreyoconnor@gmail.com"
100 | otherwise = do
99 | otherwise = do
101− displayTestMenu
100+ display_test_menu
102− putStrLn $ "Press return to start with #" ++ show nextID ++ "."
101+ putStrLn $ "Press return to start with #" ++ show next_ID ++ "."
103 putStrLn "Enter a test number to perform only that test."
102 putStrLn "Enter a test number to perform only that test."
104 putStrLn "q (or control-C) to quit."
103 putStrLn "q (or control-C) to quit."
105 putStr "> "
104 putStr "> "
@@ -107,102 +106,92 @@ doTestMenu nextID
107 s <- getLine >>= return . filter (/= '\n')
106 s <- getLine >>= return . filter (/= '\n')
108 case s of
107 case s of
109 "q" -> return mempty
108 "q" -> return mempty
110− "" -> do
109+ "" -> do
111− r <- runTest $ show nextID
110+ r <- run_test $ show next_ID
112− rs <- doTestMenu ( nextID + 1 )
111+ rs <- do_test_menu ( next_ID + 1 )
113 return $ r : rs
112 return $ r : rs
114− i | isJust ( lookup i testMenu ) -> do
113+ i | isJust ( lookup i test_menu ) -> do
115− r <- runTest i
114+ r <- run_test i
116− rs <- doTestMenu ( read i + 1 )
115+ rs <- do_test_menu ( read i + 1 )
117 return $ r : rs
116 return $ r : rs
119− displayTestMenu
118+ display_test_menu
120− = mapM_ displayTestMenu' testMenu
119+ = mapM_ display_test_menu' test_menu
121− displayTestMenu' ( i, t )
120+ display_test_menu' ( i, t )
122− = putStrLn $ ( if i == show nextID
121+ = putStrLn $ ( if i == show next_ID
123− then "> "
122+ then "> "
125− ) ++ i ++ ". " ++ testName t
124+ ) ++ i ++ ". " ++ test_name t
127−runTest :: String -> IO (String, Bool)
126+run_test :: String -> IO (String, Bool)
128−runTest i = do
127+run_test i = do
129− let t = fromJust $ lookup i testMenu
128+ let t = fromJust $ lookup i test_menu
130− printSummary t
129+ print_summary t
131− waitForReturn
130+ wait_for_return
132− testAction t
131+ test_action t
133− r <- confirmResults t
132+ r <- confirm_results t
134− return (testID t, r)
133+ return (test_ID t, r)
136−defaultSuccessConfirmResults = do
135+default_success_confirm_results = do
137 putStr "\n"
136 putStr "\n"
138 putStr "[Y/n] "
137 putStr "[Y/n] "
139 hFlush stdout
138 hFlush stdout
140 r <- getLine
139 r <- getLine
141 case r of
140 case r of
142− "" -> return True
141+ "" -> return True
143 "y" -> return True
142 "y" -> return True
144 "Y" -> return True
143 "Y" -> return True
145 "n" -> return False
144 "n" -> return False
147data Test = Test
146data Test = Test
148− { testName :: String
147+ { test_name :: String
149− , testID :: String
148+ , test_ID :: String
150− , testAction :: IO ()
149+ , test_action :: IO ()
151− , printSummary :: IO ()
150+ , print_summary :: IO ()
152− , confirmResults :: IO Bool
151+ , confirm_results :: IO Bool
155−allTests
154+all_tests
156− = [ reserveOutputTest
155+ = [ reserve_output_test
157− , displayBoundsTest0
156+ , display_bounds_test_0
158− , displayBoundsTest1
157+ , display_bounds_test_1
159− , displayBoundsTest2
158+ , display_bounds_test_2
160− , displayBoundsTest3
159+ , display_bounds_test_3
161− , unicodeSingleWidth0
160+ , unicode_single_width_0
162− , unicodeSingleWidth1
161+ , unicode_single_width_1
163− , unicodeDoubleWidth0
162+ , unicode_double_width_0
164− , unicodeDoubleWidth1
163+ , unicode_double_width_1
165− , attributesTest0
164+ , attributes_test_0
166− , attributesTest1
165+ , attributes_test_1
167− , attributesTest2
166+ , attributes_test_2
168− , attributesTest3
167+ , attributes_test_3
169− , attributesTest4
168+ , attributes_test_4
170− , attributesTest5
169+ , attributes_test_5
171− , inlineTest0
170+ , inline_test_0
172− , inlineTest1
171+ , inline_test_1
173− , inlineTest2
172+ , inline_test_2
174− , cursorHideTest0
173+ , cursor_hide_test_0
187−reserveOutputTest = Test
176+reserve_output_test = Test
188− { testName = "Initialize and reserve terminal output then restore previous state."
177+ { test_name = "Initialize and reserve terminal output then restore previous state."
189− , testID = "reserveOutputTest"
178+ , test_ID = "reserve_output_test"
190− , testAction = do
179+ , test_action = do
191− t <- standardIOConfig >>= outputForConfig
180+ t <- terminal_handle
192− reserveDisplay t
181+ reserve_display t
193 putStrLn "Line 1"
182 putStrLn "Line 1"
194 putStrLn "Line 2"
183 putStrLn "Line 2"
195 putStrLn "Line 3"
184 putStrLn "Line 3"
196 putStrLn "Line 4 (press return)"
185 putStrLn "Line 4 (press return)"
197 hFlush stdout
186 hFlush stdout
199− releaseDisplay t
188+ release_display t
200− releaseTerminal t
189+ release_terminal t
201 return ()
190 return ()
202− , printSummary = do
191+ , print_summary = do
203 putStr $ [s|
192 putStr $ [s|
204Once return is pressed:
193Once return is pressed:
205− 0. The screen will be cleared.
194+ 0. The screen will be cleared.
206 1. Four lines of text should be visible.
195 1. Four lines of text should be visible.
207 1. The cursor should be visible and at the start of the fifth line.
196 1. The cursor should be visible and at the start of the fifth line.
@@ -210,143 +199,139 @@ After return is pressed for the second time this test then:
210 * The screen containing the test summary should be restored;
199 * The screen containing the test summary should be restored;
211 * The cursor is visible.
200 * The cursor is visible.
213− , confirmResults = do
202+ , confirm_results = do
214 putStr $ [s|
203 putStr $ [s|
215Did the test output match the description?
204Did the test output match the description?
217− defaultSuccessConfirmResults
206+ default_success_confirm_results
220−displayBoundsTest0 = Test
209+display_bounds_test_0 = Test
221− { testName = "Verify display bounds are correct test 0: Using spaces."
210+ { test_name = "Verify display bounds are correct test 0: Using spaces."
222− , testID = "displayBoundsTest0"
211+ , test_ID = "display_bounds_test_0"
223− , testAction = do
212+ , test_action = do
224− t <- standardIOConfig >>= outputForConfig
213+ t <- terminal_handle
225− reserveDisplay t
214+ reserve_display t
226− (w,h) <- displayBounds t
215+ DisplayRegion w h <- display_bounds t
227− let row0 = replicate (fromEnum w) 'X' ++ "\n"
216+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
228− rowH = replicate (fromEnum w - 1) 'X'
217+ row_h = replicate (fromEnum w - 1) 'X'
229− rowN = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
218+ row_n = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
230− image = row0 ++ (concat $ replicate (fromEnum h - 2) rowN) ++ rowH
219+ image = row_0 ++ (concat $ replicate (fromEnum h - 2) row_n) ++ row_h
231 putStr image
220 putStr image
232 hFlush stdout
221 hFlush stdout
234− releaseDisplay t
223+ release_display t
235− releaseTerminal t
224+ release_terminal t
236 return ()
225 return ()
237− , printSummary = displayBoundsTestSummary True
226+ , print_summary = display_bounds_test_summary True
238− , confirmResults = genericOutputMatchConfirm
227+ , confirm_results = generic_output_match_confirm
241−displayBoundsTest1 = Test
230+display_bounds_test_1 = Test
242− { testName = "Verify display bounds are correct test 0: Using cursor movement."
231+ { test_name = "Verify display bounds are correct test 0: Using cursor movement."
243− , testID = "displayBoundsTest1"
232+ , test_ID = "display_bounds_test_1"
244− , testAction = do
233+ , test_action = do
245− t <- standardIOConfig >>= outputForConfig
234+ t <- terminal_handle
246− reserveDisplay t
235+ reserve_display t
247− (w,h) <- displayBounds t
236+ DisplayRegion w h <- display_bounds t
248− setCursorPos t 0 0
237+ set_cursor_pos t 0 0
249− let row0 = replicate (fromEnum w) 'X' ++ "\n"
238+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
250− putStr row0
239+ putStr row_0
251 forM_ [1 .. h - 2] $ \y -> do
240 forM_ [1 .. h - 2] $ \y -> do
252− setCursorPos t 0 y
241+ set_cursor_pos t 0 y
253 putStr "X"
242 putStr "X"
254 hFlush stdout
243 hFlush stdout
255− setCursorPos t (w - 1) y
244+ set_cursor_pos t (w - 1) y
256 putStr "X"
245 putStr "X"
257 hFlush stdout
246 hFlush stdout
258− setCursorPos t 0 (h - 1)
247+ set_cursor_pos t 0 (h - 1)
259− let rowH = replicate (fromEnum w - 1) 'X'
248+ let row_h = replicate (fromEnum w - 1) 'X'
260− putStr rowH
249+ putStr row_h
261 hFlush stdout
250 hFlush stdout
263− releaseDisplay t
252+ release_display t
264− releaseTerminal t
253+ release_terminal t
265 return ()
254 return ()
266− , printSummary = displayBoundsTestSummary True
255+ , print_summary = display_bounds_test_summary True
267− , confirmResults = genericOutputMatchConfirm
256+ , confirm_results = generic_output_match_confirm
270−displayBoundsTest2 = Test
259+display_bounds_test_2 = Test
271− { testName = "Verify display bounds are correct test 0: Using Image ops."
260+ { test_name = "Verify display bounds are correct test 0: Using Image ops."
272− , testID = "displayBoundsTest2"
261+ , test_ID = "display_bounds_test_2"
273− , testAction = do
262+ , test_action = do
274− t <- standardIOConfig >>= outputForConfig
263+ t <- terminal_handle
275− reserveDisplay t
264+ reserve_display t
276− bounds@(w,h) <- displayBounds t
265+ bounds@(DisplayRegion w h) <- display_bounds t
277− let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
266+ let first_row = horiz_cat $ replicate (fromEnum w) (char def_attr 'X')
278− middleRows = vertCat $ replicate (fromEnum h - 2) middleRow
267+ middle_rows = vert_cat $ replicate (fromEnum h - 2) middle_row
279− middleRow = (char defAttr 'X') <|> backgroundFill (w - 2) 1 <|> (char defAttr 'X')
268+ middle_row = (char def_attr 'X') <|> background_fill (w - 2) 1 <|> (char def_attr 'X')
280− endRow = firstRow
269+ end_row = first_row
281− image = firstRow <-> middleRows <-> endRow
270+ image = first_row <-> middle_rows <-> end_row
282− pic = (picForImage image) { picCursor = Cursor (w - 1) (h - 1) }
271+ pic = (pic_for_image image) { pic_cursor = Cursor (w - 1) (h - 1) }
283− d <- displayContext t bounds
272+ d <- display_context t bounds
284− outputPicture d pic
273+ output_picture d pic
286− releaseDisplay t
275+ release_display t
287− releaseTerminal t
276+ release_terminal t
288 return ()
277 return ()
289− , printSummary = displayBoundsTestSummary True
278+ , print_summary = display_bounds_test_summary True
290− , confirmResults = genericOutputMatchConfirm
279+ , confirm_results = generic_output_match_confirm
293−displayBoundsTest3 = Test
282+display_bounds_test_3 = Test
294− { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
283+ { test_name = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295− , testID = "displayBoundsTest3"
284+ , test_ID = "display_bounds_test_3"
296− , testAction = do
285+ , test_action = do
297− t <- standardIOConfig >>= outputForConfig
286+ t <- terminal_handle
298− reserveDisplay t
287+ reserve_display t
299− (w,h) <- displayBounds t
288+ DisplayRegion w h <- display_bounds t
300− hideCursor t
289+ hide_cursor t
301− setCursorPos t 0 0
290+ set_cursor_pos t 0 0
302− let row0 = replicate (fromEnum w) 'X'
291+ let row_0 = replicate (fromEnum w) 'X'
303− putStrLn row0
292+ putStrLn row_0
304 forM_ [1 .. h - 2] $ \y -> do
293 forM_ [1 .. h - 2] $ \y -> do
305− setCursorPos t 0 y
294+ set_cursor_pos t 0 y
306 putStr "X"
295 putStr "X"
307 hFlush stdout
296 hFlush stdout
308− setCursorPos t (w - 1) y
297+ set_cursor_pos t (w - 1) y
309 putStr "X"
298 putStr "X"
310 hFlush stdout
299 hFlush stdout
311− setCursorPos t 0 (h - 1)
300+ set_cursor_pos t 0 (h - 1)
312− let rowH = row0
301+ let row_h = row_0
313− putStr rowH
302+ putStr row_h
314 hFlush stdout
303 hFlush stdout
316− showCursor t
305+ show_cursor t
317− releaseDisplay t
306+ release_display t
318− releaseTerminal t
307+ release_terminal t
319 return ()
308 return ()
320− , printSummary = displayBoundsTestSummary False
309+ , print_summary = display_bounds_test_summary False
321− , confirmResults = genericOutputMatchConfirm
310+ , confirm_results = generic_output_match_confirm
324−displayBoundsTestSummary hasCursor = do
313+display_bounds_test_summary has_cursor = do
325 putStr $ [s|
314 putStr $ [s|
326Once return is pressed:
315Once return is pressed:
327 0. The screen will be cleared.
316 0. The screen will be cleared.
329− if hasCursor
318+ if has_cursor
330 then putStr " 1. The cursor will be visible."
319 then putStr " 1. The cursor will be visible."
331 else putStr " 1. The cursor will NOT be visible."
320 else putStr " 1. The cursor will NOT be visible."
332 putStr [s|
321 putStr [s|
334 2. The border of the display will be outlined in Xs.
322 2. The border of the display will be outlined in Xs.
335 So if - and | represented the edge of the terminal window:
323 So if - and | represented the edge of the terminal window:
336 |-------------|
324 |-------------|
337 |XXXXXXXXXXXXX|
325 |XXXXXXXXXXXXX|
340− if hasCursor
328+ if has_cursor
341 then putStr $ [s|
329 then putStr $ [s|
343 |XXXXXXXXXXXXC| |]
330 |XXXXXXXXXXXXC| |]
344 else putStr $ [s|
331 else putStr $ [s|
346 |XXXXXXXXXXXXX| |]
332 |XXXXXXXXXXXXX| |]
348 putStr $ [s|
334 putStr $ [s|
350 |-------------|
335 |-------------|
352 ( Where C is the final position of the cursor. There may be an X drawn
337 ( Where C is the final position of the cursor. There may be an X drawn
@@ -358,13 +343,13 @@ After return is pressed for the second time:
358 1. The cursor should be visible.
343 1. The cursor should be visible.
361−genericOutputMatchConfirm = do
346+generic_output_match_confirm = do
362 putStr $ [s|
347 putStr $ [s|
363Did the test output match the description?
348Did the test output match the description?
365− defaultSuccessConfirmResults
350+ default_success_confirm_results
367−-- Explicitly define the bytes that encode each example text.
352+-- Explicitely definethe bytes that encode each example text.
368-- This avoids any issues with how the compiler represents string literals.
353-- 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
355-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -373,24 +358,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
358-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
374-- comments ;-)
359-- comments ;-)
376−-- txt0 = ↑↑↓↓←→←→BA
361+-- txt_0 = ↑↑↓↓←→←→BA
378−utf8Txt0 :: [[Word8]]
363+utf8_txt_0 :: [[Word8]]
379−utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
364+utf8_txt_0 = [ [ 0xe2 , 0x86 , 0x91 ]
380− , [ 0xe2 , 0x86 , 0x91 ]
365+ , [ 0xe2 , 0x86 , 0x91 ]
381− , [ 0xe2 , 0x86 , 0x93 ]
366+ , [ 0xe2 , 0x86 , 0x93 ]
382− , [ 0xe2 , 0x86 , 0x93 ]
367+ , [ 0xe2 , 0x86 , 0x93 ]
383− , [ 0xe2 , 0x86 , 0x90 ]
368+ , [ 0xe2 , 0x86 , 0x90 ]
384− , [ 0xe2 , 0x86 , 0x92 ]
369+ , [ 0xe2 , 0x86 , 0x92 ]
385− , [ 0xe2 , 0x86 , 0x90 ]
370+ , [ 0xe2 , 0x86 , 0x90 ]
386− , [ 0xe2 , 0x86 , 0x92 ]
371+ , [ 0xe2 , 0x86 , 0x92 ]
387− , [ 0x42 ]
372+ , [ 0x42 ]
388− , [ 0x41 ]
373+ , [ 0x41 ]
391−iso10646Txt0 :: String
376+iso_10646_txt_0 :: String
392−iso10646Txt0 = map toEnum
377+iso_10646_txt_0 = map toEnum
@@ -402,46 +387,46 @@ iso10646Txt0 = map toEnum
405−unicodeSingleWidth0 = Test
390+unicode_single_width_0 = Test
406− { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
391+ { test_name = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407− , testID = "unicodeSingleWidth0"
392+ , test_ID = "unicode_single_width_0"
408− , testAction = do
393+ , test_action = do
409− t <- standardIOConfig >>= outputForConfig
394+ t <- terminal_handle
410− reserveDisplay t
395+ reserve_display t
411− hideCursor t
396+ hide_cursor t
412− withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
397+ withArrayLen (concat utf8_txt_0) (flip $ hPutBuf stdout)
413 hPutStr stdout "\n"
398 hPutStr stdout "\n"
414 hPutStr stdout "0123456789\n"
399 hPutStr stdout "0123456789\n"
415 hFlush stdout
400 hFlush stdout
417− releaseDisplay t
402+ release_display t
418− releaseTerminal t
403+ release_terminal t
419 return ()
404 return ()
420− , printSummary = unicodeSingleWidthSummary
405+ , print_summary = unicode_single_width_summary
421− , confirmResults = genericOutputMatchConfirm
406+ , confirm_results = generic_output_match_confirm
424−unicodeSingleWidth1 = Test
409+unicode_single_width_1 = Test
425− { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
410+ { test_name = "Verify terminal can display unicode single-width characters. (Image ops)"
426− , testID = "unicodeSingleWidth1"
411+ , test_ID = "unicode_single_width_1"
427− , testAction = do
412+ , test_action = do
428− t <- standardIOConfig >>= outputForConfig
413+ t <- terminal_handle
429− reserveDisplay t
414+ reserve_display t
430− let pic = picForImage image
415+ let pic = pic_for_image image
431− image = line0 <-> line1
416+ image = line_0 <-> line_1
432− line0 = iso10646String defAttr iso10646Txt0
417+ line_0 = iso_10646_string def_attr iso_10646_txt_0
433− line1 = string defAttr "0123456789"
418+ line_1 = string def_attr "0123456789"
434− d <- displayBounds t >>= displayContext t
419+ d <- display_bounds t >>= display_context t
435− outputPicture d pic
420+ output_picture d pic
437− releaseDisplay t
422+ release_display t
438− releaseTerminal t
423+ release_terminal t
439 return ()
424 return ()
440− , printSummary = unicodeSingleWidthSummary
425+ , print_summary = unicode_single_width_summary
441− , confirmResults = genericOutputMatchConfirm
426+ , confirm_results = generic_output_match_confirm
444−unicodeSingleWidthSummary = putStr [s|
429+unicode_single_width_summary = putStr [s|
445Once return is pressed:
430Once return is pressed:
446 0. The screen will be cleared.
431 0. The screen will be cleared.
447 1. The cursor will be hidden.
432 1. The cursor will be hidden.
@@ -475,55 +460,55 @@ After return is pressed for the second time:
476-- The second example is a unicode string containing double-width glyphs
461-- The second example is a unicode string containing double-width glyphs
478−utf8Txt1 :: [[Word8]]
463+utf8_txt_1 :: [[Word8]]
479−utf8Txt1 = [ [0xe4,0xbd,0xa0]
464+utf8_txt_1 = [ [0xe4,0xbd,0xa0]
480− , [0xe5,0xa5,0xbd]
465+ , [0xe5,0xa5,0xbd]
481− , [0xe5,0x90,0x97]
466+ , [0xe5,0x90,0x97]
484−iso10646Txt1 :: String
469+iso_10646_txt_1 :: String
485−iso10646Txt1 = map toEnum [20320,22909,21527]
470+iso_10646_txt_1 = map toEnum [20320,22909,21527]
487−unicodeDoubleWidth0 = Test
472+unicode_double_width_0 = Test
488− { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
473+ { test_name = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489− , testID = "unicodeDoubleWidth0"
474+ , test_ID = "unicode_double_width_0"
490− , testAction = do
475+ , test_action = do
491− t <- standardIOConfig >>= outputForConfig
476+ t <- terminal_handle
492− reserveDisplay t
477+ reserve_display t
493− hideCursor t
478+ hide_cursor t
494− withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
479+ withArrayLen (concat utf8_txt_1) (flip $ hPutBuf stdout)
495 hPutStr stdout "\n"
480 hPutStr stdout "\n"
496 hPutStr stdout "012345\n"
481 hPutStr stdout "012345\n"
497 hFlush stdout
482 hFlush stdout
499− releaseDisplay t
484+ release_display t
500− releaseTerminal t
485+ release_terminal t
501 return ()
486 return ()
502− , printSummary = unicodeDoubleWidthSummary
487+ , print_summary = unicode_double_width_summary
503− , confirmResults = genericOutputMatchConfirm
488+ , confirm_results = generic_output_match_confirm
506−unicodeDoubleWidth1 = Test
491+unicode_double_width_1 = Test
507− { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
492+ { test_name = "Verify terminal can display unicode double-width characters. (Image ops)"
508− , testID = "unicodeDoubleWidth1"
493+ , test_ID = "unicode_double_width_1"
509− , testAction = do
494+ , test_action = do
510− t <- standardIOConfig >>= outputForConfig
495+ t <- terminal_handle
511− reserveDisplay t
496+ reserve_display t
512− let pic = picForImage image
497+ let pic = pic_for_image image
513− image = line0 <-> line1
498+ image = line_0 <-> line_1
514− line0 = iso10646String defAttr iso10646Txt1
499+ line_0 = iso_10646_string def_attr iso_10646_txt_1
515− line1 = string defAttr "012345"
500+ line_1 = string def_attr "012345"
516− d <- displayBounds t >>= displayContext t
501+ d <- display_bounds t >>= display_context t
517− outputPicture d pic
502+ output_picture d pic
519− releaseDisplay t
504+ release_display t
520− releaseTerminal t
505+ release_terminal t
521 return ()
506 return ()
522− , printSummary = unicodeDoubleWidthSummary
507+ , print_summary = unicode_double_width_summary
523− , confirmResults = genericOutputMatchConfirm
508+ , confirm_results = generic_output_match_confirm
526−unicodeDoubleWidthSummary = putStr [s|
511+unicode_double_width_summary = putStr [s|
527Once return is pressed:
512Once return is pressed:
528 0. The screen will be cleared.
513 0. The screen will be cleared.
529 1. The cursor will be hidden.
514 1. The cursor will be hidden.
@@ -550,32 +535,32 @@ After return is pressed for the second time:
550 1. The cursor should be visible.
535 1. The cursor should be visible.
553−allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
538+all_colors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554− [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
539+ [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
556−allBrightColors
541+all_bright_colors
557− = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
542+ = zip [ 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" ]
543 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
560−attributesTest0 = Test
545+attributes_test_0 = Test
561− { testName = "Character attributes: foreground colors."
546+ { test_name = "Character attributes: foreground colors."
562− , testID = "attributesTest0"
547+ , test_ID = "attributes_test_0"
563− , testAction = do
548+ , test_action = do
564− t <- standardIOConfig >>= outputForConfig
549+ t <- terminal_handle
565− reserveDisplay t
550+ reserve_display t
566− let pic = picForImage image
551+ let pic = pic_for_image image
567− image = border <|> column0 <|> border <|> column1 <|> border
552+ image = border <|> column_0 <|> border <|> column_1 <|> border
568− column0 = vertCat $ map lineWithColor allColors
553+ column_0 = vert_cat $ map line_with_color all_colors
569− border = vertCat $ replicate (length allColors) $ string defAttr " | "
554+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
570− column1 = vertCat $ map (string defAttr . snd) allColors
555+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
571− lineWithColor (c, cName) = string (defAttr `withForeColor` c) cName
556+ line_with_color (c, c_name) = string (def_attr `with_fore_color` c) c_name
572− d <- displayBounds t >>= displayContext t
557+ d <- display_bounds t >>= display_context t
573− outputPicture d pic
558+ output_picture d pic
575− releaseDisplay t
560+ release_display t
576− releaseTerminal t
561+ release_terminal t
577 return ()
562 return ()
578− , printSummary = do
563+ , print_summary = do
579 putStr $ [s|
564 putStr $ [s|
580Once return is pressed:
565Once return is pressed:
581 0. The screen will be cleared.
566 0. The screen will be cleared.
@@ -596,32 +581,32 @@ After return is pressed for the second time:
596 0. The screen containing the test summary should be restored.
581 0. The screen containing the test summary should be restored.
597 1. The cursor should be visible.
582 1. The cursor should be visible.
599− , confirmResults = do
584+ , confirm_results = do
600 putStr $ [s|
585 putStr $ [s|
601Did the test output match the description?
586Did the test output match the description?
603− defaultSuccessConfirmResults
588+ default_success_confirm_results
606−attributesTest1 = Test
591+attributes_test_1 = Test
607− { testName = "Character attributes: background colors."
592+ { test_name = "Character attributes: background colors."
608− , testID = "attributesTest1"
593+ , test_ID = "attributes_test_1"
609− , testAction = do
594+ , test_action = do
610− t <- standardIOConfig >>= outputForConfig
595+ t <- terminal_handle
611− reserveDisplay t
596+ reserve_display t
612− let pic = picForImage image
597+ let pic = pic_for_image image
613− image = border <|> column0 <|> border <|> column1 <|> border
598+ image = border <|> column_0 <|> border <|> column_1 <|> border
614− column0 = vertCat $ map lineWithColor allColors
599+ column_0 = vert_cat $ map line_with_color all_colors
615− border = vertCat $ replicate (length allColors) $ string defAttr " | "
600+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
616− column1 = vertCat $ map (string defAttr . snd) allColors
601+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
617− lineWithColor (c, cName) = string (defAttr `withBackColor` c) cName
602+ line_with_color (c, c_name) = string (def_attr `with_back_color` c) c_name
618− d <- displayBounds t >>= displayContext t
603+ d <- display_bounds t >>= display_context t
619− outputPicture d pic
604+ output_picture d pic
621− releaseDisplay t
606+ release_display t
622− releaseTerminal t
607+ release_terminal t
623 return ()
608 return ()
624− , printSummary = do
609+ , print_summary = do
625 putStr $ [s|
610 putStr $ [s|
626Once return is pressed:
611Once return is pressed:
627 0. The screen will be cleared.
612 0. The screen will be cleared.
@@ -651,57 +636,57 @@ After return is pressed for the second time:
651 0. The screen containing the test summary should be restored.
636 0. The screen containing the test summary should be restored.
652 1. The cursor should be visible.
637 1. The cursor should be visible.
654− , confirmResults = do
639+ , confirm_results = do
655 putStr $ [s|
640 putStr $ [s|
656Did the test output match the description?
641Did the test output match the description?
658− defaultSuccessConfirmResults
643+ default_success_confirm_results
661−attributesTest2 = Test
646+attributes_test_2 = Test
662− { testName = "Character attributes: Vivid foreground colors."
647+ { test_name = "Character attributes: Vivid foreground colors."
663− , testID = "attributesTest2"
648+ , test_ID = "attributes_test_2"
664− , testAction = do
649+ , test_action = do
665− t <- standardIOConfig >>= outputForConfig
650+ t <- terminal_handle
666− reserveDisplay t
651+ reserve_display t
667− let pic = picForImage image
652+ let pic = pic_for_image image
668− image = horizCat [border, column0, border, column1, border, column2, border]
653+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
669− border = vertCat $ replicate (length allColors) $ string defAttr " | "
654+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
670− column0 = vertCat $ map lineWithColor0 allColors
655+ column_0 = vert_cat $ map line_with_color_0 all_colors
671− column1 = vertCat $ map lineWithColor1 allBrightColors
656+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
672− column2 = vertCat $ map (string defAttr . snd) allColors
657+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
673− lineWithColor0 (c, cName) = string (defAttr `withForeColor` c) cName
658+ line_with_color_0 (c, c_name) = string (def_attr `with_fore_color` c) c_name
674− lineWithColor1 (c, cName) = string (defAttr `withForeColor` c) cName
659+ line_with_color_1 (c, c_name) = string (def_attr `with_fore_color` c) c_name
675− d <- displayBounds t >>= displayContext t
660+ d <- display_bounds t >>= display_context t
676− outputPicture d pic
661+ output_picture d pic
678− releaseDisplay t
663+ release_display t
679− releaseTerminal t
664+ release_terminal t
680 return ()
665 return ()
681− , printSummary = do
666+ , print_summary = do
682 putStr $ [s|
667 putStr $ [s|
683Once return is pressed:
668Once return is pressed:
684 0. The screen will be cleared.
669 0. The screen will be cleared.
685 1. The cursor will be hidden.
670 1. The cursor will be hidden.
686 2. 9 lines of text in three columns will be drawn:
671 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
672 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.
673+ 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
674 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
675 with that color as the foreground color but the shade used should be
691− more vivid than the shade used in the first column.
676+ 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
677 c. The final column will be the name of a color rendered with the
693 default attributes.
678 default attributes.
695For instance, one line will be the word "magenta" and that word should be
680For instance, one line will be the word "magenta" and that word should be
696−rendered in the magenta color.
681+rendered in the magenta color.
698I'm not actually sure exactly what "vivid" means in this context. For xterm the
683I'm not actually sure exactly what "vivid" means in this context. For xterm the
699−vivid colors are brighter.
684+vivid colors are brighter.
702 * The first column: The foreground color matches the named color.
687 * The first column: The foreground color matches the named color.
703 * The second column: The foreground color matches the named color but is
688 * The second column: The foreground color matches the named color but is
704− more vivid than the color used in the first column.
689+ more vivid than the color used in the first column.
705 * The third column: All text is rendered with the default attributes.
690 * 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
691 * The vertical bars used in each line to mark the border of a column are
707 lined up.
692 lined up.
@@ -710,34 +695,34 @@ After return is pressed for the second time:
710 0. The screen containing the test summary should be restored.
695 0. The screen containing the test summary should be restored.
711 1. The cursor should be visible.
696 1. The cursor should be visible.
713− , confirmResults = do
698+ , confirm_results = do
714 putStr $ [s|
699 putStr $ [s|
715Did the test output match the description?
700Did the test output match the description?
717− defaultSuccessConfirmResults
702+ default_success_confirm_results
720−attributesTest3 = Test
705+attributes_test_3 = Test
721− { testName = "Character attributes: Vivid background colors."
706+ { test_name = "Character attributes: Vivid background colors."
722− , testID = "attributesTest3"
707+ , test_ID = "attributes_test_3"
723− , testAction = do
708+ , test_action = do
724− t <- standardIOConfig >>= outputForConfig
709+ t <- terminal_handle
725− reserveDisplay t
710+ reserve_display t
726− let pic = picForImage image
711+ let pic = pic_for_image image
727− image = horizCat [border, column0, border, column1, border, column2, border]
712+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
728− border = vertCat $ replicate (length allColors) $ string defAttr " | "
713+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
729− column0 = vertCat $ map lineWithColor0 allColors
714+ column_0 = vert_cat $ map line_with_color_0 all_colors
730− column1 = vertCat $ map lineWithColor1 allBrightColors
715+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
731− column2 = vertCat $ map (string defAttr . snd) allColors
716+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
732− lineWithColor0 (c, cName) = string (defAttr `withBackColor` c) cName
717+ line_with_color_0 (c, c_name) = string (def_attr `with_back_color` c) c_name
733− lineWithColor1 (c, cName) = string (defAttr `withBackColor` c) cName
718+ line_with_color_1 (c, c_name) = string (def_attr `with_back_color` c) c_name
734− d <- displayBounds t >>= displayContext t
719+ d <- display_bounds t >>= display_context t
735− outputPicture d pic
720+ output_picture d pic
737− releaseDisplay t
722+ release_display t
738− releaseTerminal t
723+ release_terminal t
739 return ()
724 return ()
740− , printSummary = do
725+ , print_summary = do
741 putStr $ [s|
726 putStr $ [s|
742Once return is pressed:
727Once return is pressed:
743 0. The screen will be cleared.
728 0. The screen will be cleared.
@@ -745,23 +730,23 @@ Once return is pressed:
745 2. 9 lines of text in three columns will be drawn:
730 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
731 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
732 color terminal rendered with the default foreground color with a
748− background the named color.
733+ background the named color.
749 b. The first column will contain be a name of a standard color for an 8
734 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
735 color terminal rendered with the default foreground color with the
751− background a vivid version of the named color.
736+ background a vivid version of the named color.
752 c. The third column will be the name of a standard color rendered with
737 c. The third column will be the name of a standard color rendered with
753 the default attributes.
738 the default attributes.
755For instance, one line will contain be the word "magenta" and the word should
740For 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.
741+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
743I'm not actually sure exactly what "vivid" means in this context. For xterm the
759vivid colors are brighter.
744vivid colors are brighter.
762 * The first column: The background color matches the named color.
747 * The first column: The background color matches the named color.
763 * The second column: The background color matches the named color and is
748 * The second column: The background color matches the named color and is
764− more vivid than the color used in the first column.
749+ more vivid than the color used in the first column.
765 * The third column column: All text is rendered with the default attributes.
750 * 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
751 * The vertical bars used in each line to mark the border of a column are
767 lined up.
752 lined up.
@@ -777,51 +762,51 @@ After return is pressed for the second time:
777 0. The screen containing the test summary should be restored.
762 0. The screen containing the test summary should be restored.
778 1. The cursor should be visible.
763 1. The cursor should be visible.
780− , confirmResults = do
765+ , confirm_results = do
781 putStr $ [s|
766 putStr $ [s|
782Did the test output match the description?
767Did the test output match the description?
784− defaultSuccessConfirmResults
769+ default_success_confirm_results
787−attrCombos =
772+attr_combos =
788 [ ( "default", id )
773 [ ( "default", id )
789− , ( "bold", flip withStyle bold )
774+ , ( "bold", flip with_style bold )
790− , ( "blink", flip withStyle blink )
775+ , ( "blink", flip with_style blink )
791− , ( "underline", flip withStyle underline )
776+ , ( "underline", flip with_style underline )
792− , ( "bold + blink", flip withStyle (bold + blink) )
777+ , ( "bold + blink", flip with_style (bold + blink) )
793− , ( "bold + underline", flip withStyle (bold + underline) )
778+ , ( "bold + underline", flip with_style (bold + underline) )
794− , ( "underline + blink", flip withStyle (underline + blink) )
779+ , ( "underline + blink", flip with_style (underline + blink) )
795− , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
780+ , ( "bold + blink + underline", flip with_style (bold + blink + underline) )
798−attributesTest4 = Test
783+attributes_test_4 = Test
799− { testName = "Character attributes: Bold; Blink; Underline."
784+ { test_name = "Character attributes: Bold; Blink; Underline."
800− , testID = "attributesTest4"
785+ , test_ID = "attributes_test_4"
801− , testAction = do
786+ , test_action = do
802− t <- standardIOConfig >>= outputForConfig
787+ t <- terminal_handle
803− reserveDisplay t
788+ reserve_display t
804− let pic = picForImage image
789+ let pic = pic_for_image image
805− image = horizCat [border, column0, border, column1, border]
790+ image = horiz_cat [border, column_0, border, column_1, border]
806− border = vertCat $ replicate (length attrCombos) $ string defAttr " | "
791+ border = vert_cat $ replicate (length attr_combos) $ string def_attr " | "
807− column0 = vertCat $ map lineWithAttrs attrCombos
792+ column_0 = vert_cat $ map line_with_attrs attr_combos
808− column1 = vertCat $ map (string defAttr . fst) attrCombos
793+ column_1 = vert_cat $ map (string def_attr . fst) attr_combos
809− lineWithAttrs (desc, attrF) = string (attrF defAttr) desc
794+ line_with_attrs (desc, attr_f) = string (attr_f def_attr) desc
810− d <- displayBounds t >>= displayContext t
795+ d <- display_bounds t >>= display_context t
811− outputPicture d pic
796+ output_picture d pic
813− releaseDisplay t
798+ release_display t
814− releaseTerminal t
799+ release_terminal t
815 return ()
800 return ()
816− , printSummary = do
801+ , print_summary = do
817 putStr $ [s|
802 putStr $ [s|
818Once return is pressed:
803Once return is pressed:
819 0. The screen will be cleared.
804 0. The screen will be cleared.
820 1. The cursor will be hidden.
805 1. The cursor will be hidden.
821− 2. 8 rows of text in two columns.
806+ 2. 8 rows of text in two columns.
822 The rows will contain the following text:
807 The rows will contain the following text:
826 underline
811 underline
827 bold + blink
812 bold + blink
@@ -830,8 +815,8 @@ Once return is pressed:
830 bold + blink + underline
815 bold + blink + underline
831 The first column will be rendered with the described attributes. The second
816 The first column will be rendered with the described attributes. The second
832 column will be rendered with the default attributes.
817 column will be rendered with the default attributes.
835 * The vertical bars used in each line to mark the border of a column are
820 * The vertical bars used in each line to mark the border of a column are
836 lined up.
821 lined up.
837 * The text in the first column is rendered as described.
822 * The text in the first column is rendered as described.
@@ -840,31 +825,31 @@ After return is pressed for the second time:
840 0. The screen containing the test summary should be restored.
825 0. The screen containing the test summary should be restored.
841 1. The cursor should be visible.
826 1. The cursor should be visible.
843− , confirmResults = do
828+ , confirm_results = do
844 putStr $ [s|
829 putStr $ [s|
845Did the test output match the description?
830Did the test output match the description?
847− defaultSuccessConfirmResults
832+ default_success_confirm_results
850−attributesTest5 = Test
835+attributes_test_5 = Test
851− { testName = "Character attributes: 240 color palette"
836+ { test_name = "Character attributes: 240 color palette"
852− , testID = "attributesTest5"
837+ , test_ID = "attributes_test_5"
853− , testAction = do
838+ , test_action = do
854− t <- standardIOConfig >>= outputForConfig
839+ t <- terminal_handle
855− reserveDisplay t
840+ reserve_display t
856− let pic = picForImage image
841+ let pic = pic_for_image image
857− image = vertCat $ map horizCat $ splitColorImages colorImages
842+ image = vert_cat $ map horiz_cat $ split_color_images color_images
858− colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
843+ color_images = map (\i -> string (current_attr `with_back_color` Color240 i) " ") [0..239]
859− splitColorImages [] = []
844+ split_color_images [] = []
860− splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
845+ split_color_images is = (take 20 is ++ [string def_attr " "]) : (split_color_images (drop 20 is))
861− d <- displayBounds t >>= displayContext t
846+ d <- display_bounds t >>= display_context t
862− outputPicture d pic
847+ output_picture d pic
864− releaseDisplay t
849+ release_display t
865− releaseTerminal t
850+ release_terminal t
866 return ()
851 return ()
867− , printSummary = do
852+ , print_summary = do
868 putStr $ [s|
853 putStr $ [s|
869Once return is pressed:
854Once return is pressed:
870 0. The screen will be cleared.
855 0. The screen will be cleared.
@@ -872,321 +857,95 @@ Once return is pressed:
872 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
857 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...
858 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:
862After return is pressed for the second time:
878 0. The screen containing the test summary should be restored.
863 0. The screen containing the test summary should be restored.
879 1. The cursor should be visible.
864 1. The cursor should be visible.
881− , confirmResults = do
866+ , confirm_results = do
882 putStr $ [s|
867 putStr $ [s|
883Did the test output match the description?
868Did the test output match the description?
885− defaultSuccessConfirmResults
870+ default_success_confirm_results
888−inlineTest0 = Test
873+inline_test_0 = Test
889− { testName = "Verify styled output can be performed without clearing the screen."
874+ { test_name = "Verify styled output can be performed without clearing the screen."
890− , testID = "inlineTest0"
875+ , test_ID = "inline_test_0"
891− , testAction = do
876+ , test_action = do
877+ t <- terminal_handle
892 putStrLn "line 1."
878 putStrLn "line 1."
893− putAttrChange_ $ backColor red >> applyStyle underline
879+ put_attr_change t $ back_color red >> apply_style underline
894 putStrLn "line 2."
880 putStrLn "line 2."
895− putAttrChange_ $ defaultAll
881+ put_attr_change t $ default_all
896 putStrLn "line 3."
882 putStrLn "line 3."
897− , printSummary = putStr $ [s|
883+ release_terminal t
885+ , print_summary = putStr $ [s|
898lines are in order.
886lines are in order.
899The second line "line 2" should have a red background and the text underline.
887The 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.
888The third line "line 3" should be drawn in the same style as the first line.
903− , confirmResults = genericOutputMatchConfirm
891+ , confirm_results = generic_output_match_confirm
906−inlineTest1 = Test
894+inline_test_1 = Test
907− { testName = "Verify styled output can be performed without clearing the screen."
895+ { test_name = "Verify styled output can be performed without clearing the screen."
908− , testID = "inlineTest1"
896+ , test_ID = "inline_test_1"
909− , testAction = do
897+ , test_action = do
898+ t <- terminal_handle
910 putStr "Not styled. "
899 putStr "Not styled. "
911− putAttrChange_ $ backColor red >> applyStyle underline
900+ put_attr_change t $ back_color red >> apply_style underline
912 putStr " Styled! "
901 putStr " Styled! "
913− putAttrChange_ $ defaultAll
902+ put_attr_change t $ default_all
914 putStrLn "Not styled."
903 putStrLn "Not styled."
915− , printSummary = putStr $ [s|
904+ release_terminal t
906+ , print_summary = putStr $ [s|
918− , confirmResults = genericOutputMatchConfirm
909+ , confirm_results = generic_output_match_confirm
921−inlineTest2 = Test
912+inline_test_2 = Test
922− { testName = "Verify styled output can be performed without clearing the screen."
913+ { test_name = "Verify styled output can be performed without clearing the screen."
923− , testID = "inlineTest1"
914+ , test_ID = "inline_test_1"
924− , testAction = do
915+ , test_action = do
916+ t <- terminal_handle
925 putStr "Not styled. "
917 putStr "Not styled. "
926− putAttrChange_ $ backColor red >> applyStyle underline
918+ put_attr_change t $ back_color red >> apply_style underline
927 putStr " Styled! "
919 putStr " Styled! "
928− putAttrChange_ $ defaultAll
920+ put_attr_change t $ default_all
929 putStr "Not styled.\n"
921 putStr "Not styled.\n"
930− , printSummary = putStr $ [s|
922+ release_terminal t
924+ , print_summary = putStr $ [s|
932− , confirmResults = genericOutputMatchConfirm
926+ , confirm_results = generic_output_match_confirm
935−cursorHideTest0 :: Test
929+cursor_hide_test_0 :: Test
936−cursorHideTest0 = Test
930+cursor_hide_test_0 = Test
937− { testName = "Verify the cursor is hid and re-shown. issue #7"
931+ { test_name = "Verify the cursor is hid and re-shown. issue #7"
938− , testID = "cursorHideTest0"
932+ , test_ID = "cursor_hide_test_0"
939− , testAction = do
933+ , test_action = do
940− vty <- mkVty defaultConfig
934+ vty <- mkVty
941− showCursor $ outputIface vty
935+ show_cursor $ terminal vty
942− setCursorPos (outputIface vty) 5 5
936+ set_cursor_pos (terminal vty) 5 5
943− nextEvent vty
937+ next_event vty
944− hideCursor $ outputIface vty
938+ hide_cursor $ terminal vty
945− nextEvent vty
939+ next_event vty
946 shutdown vty
940 shutdown vty
947 return ()
941 return ()
948− , printSummary = putStr $ [s|
942+ , print_summary = putStr $ [s|
949 1. verify the cursor is displayed.
943 1. verify the cursor is displayed.
950 2. press enter
944 2. press enter
951 3. verify the cursor is hid.
945 3. verify the cursor is hid.
952 4. press enter.
946 4. press enter.
953 5. the display should return to the state before the test.
947 5. the display should return to the state before the test.
955− , confirmResults = genericOutputMatchConfirm
949+ , confirm_results = generic_output_match_confirm
958−outputImageAndWait :: Image -> IO ()
959−outputImageAndWait image = do
960− let pic = picForImage image
961− outputPicAndWait pic
963−outputPicAndWait :: Picture -> IO ()
964−outputPicAndWait pic = do
965− t <- standardIOConfig >>= outputForConfig
967− d <- displayBounds t >>= displayContext t
974−vertCropTest0 :: Test
976− { testName = "Verify bottom cropping works as expected with single column chars"
977− , testID = "cropTest0"
979− let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsum
980− block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsum
981− image = block0 <-> backgroundFill 10 2 <-> block1
982− outputImageAndWait image
983− , printSummary = putStr $ [s|
984− 1. Verify the two text blocks are identical.
986− 3. the display should return to the state before the test.
988− , confirmResults = genericOutputMatchConfirm
991−vertCropTest1 :: Test
993− { testName = "Verify bottom cropping works as expected with double column chars"
994− , testID = "cropTest0"
996− let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
997− block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsumChinese
998− image = block0 <-> backgroundFill 10 2 <-> block1
999− outputImageAndWait image
1000− , printSummary = putStr $ [s|
1001− 1. Verify the two text blocks are identical.
1003− 3. the display should return to the state before the test.
1005− , confirmResults = genericOutputMatchConfirm
1008−vertCropTest2 :: Test
1009−vertCropTest2 = Test
1010− { testName = "Verify top cropping works as expected with single column chars"
1011− , testID = "cropTest2"
1013− let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsum
1014− block1 = vertCat $ map (string defAttr) $ drop (length lorumIpsum - 2) lorumIpsum
1015− image = block0 <-> backgroundFill 10 2 <-> block1
1016− outputImageAndWait image
1017− , printSummary = putStr $ [s|
1018− 1. Verify the two text blocks are identical.
1020− 3. the display should return to the state before the test.
1022− , confirmResults = genericOutputMatchConfirm
1025−vertCropTest3 :: Test
1026−vertCropTest3 = Test
1027− { testName = "Verify top cropping works as expected with double column chars"
1028− , testID = "cropTest0"
1030− let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
1031− block1 = vertCat $ map (string defAttr) $ drop (length lorumIpsumChinese - 2 ) lorumIpsumChinese
1032− image = block0 <-> backgroundFill 10 2 <-> block1
1033− outputImageAndWait image
1034− , printSummary = putStr $ [s|
1035− 1. Verify the two text blocks are identical.
1037− 3. the display should return to the state before the test.
1039− , confirmResults = genericOutputMatchConfirm
1042−horizCropTest0 :: Test
1043−horizCropTest0 = Test
1044− { testName = "Verify right cropping works as expected with single column chars"
1045− , testID = "cropTest0"
1047− let baseImage = vertCat $ map (string defAttr) lorumIpsum
1048− croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1049− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1050− outputImageAndWait image
1051− , printSummary = putStr $ [s|
1052− 1. Verify the bottom text block is about half the width of the top text block.
1054− 3. the display should return to the state before the test.
1056− , confirmResults = genericOutputMatchConfirm
1059−horizCropTest1 :: Test
1060−horizCropTest1 = Test
1061− { testName = "Verify right cropping works as expected with double column chars"
1062− , testID = "cropTest0"
1064− let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1065− croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1066− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1067− outputImageAndWait image
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.
1071− 3. the display should return to the state before the test.
1073− , confirmResults = genericOutputMatchConfirm
1076−horizCropTest2 :: Test
1077−horizCropTest2 = Test
1078− { testName = "Verify left cropping works as expected with single column chars"
1079− , testID = "cropTest0"
1081− let baseImage = vertCat $ map (string defAttr) lorumIpsum
1082− croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1083− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1084− outputImageAndWait image
1085− , printSummary = putStr $ [s|
1086− 1. Verify the bottom text block is the right half of the top text block.
1088− 3. the display should return to the state before the test.
1090− , confirmResults = genericOutputMatchConfirm
1093−horizCropTest3 :: Test
1094−horizCropTest3 = Test
1095− { testName = "Verify right cropping works as expected with double column chars"
1096− , testID = "cropTest0"
1098− let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1099− croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1100− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1101− outputImageAndWait image
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.
1105− 3. the display should return to the state before the test.
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
1146−cheesyAnim0 :: Image -> [Image] -> IO ()
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|
1173−Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,
1174−totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae
1175−dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
1176−sed quia consequuntur magni dolores eos qui ratione voluptatem sequi nesciunt. Neque porro quisquam
1177−est, qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit, sed quia non numquam eius
1178−modi tempora incidunt ut labore et dolore magnam aliquam quaerat voluptatem. Ut enim ad minima
1179−veniam, quis nostrum exercitationem ullam corporis suscipit laboriosam, nisi ut aliquid ex ea
1180−commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate velit esse quam nihil
1181−molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
1184−lorumIpsumChinese :: [String]
1185−lorumIpsumChinese = lines [s|
1186−輐銛 螷蟞覮 裌覅詵 暕 鴅噮 槶 惝掭掝 婸媥媕 耏胠臿, 汫汭沎 忕汌卣 蚡袀 僣 蒮 瀁瀎瀊 渮湸湤 緌翢,
1187−腠腶舝 糲蘥蠩 樏殣氀 蒮 蹢鎒 滍 鸄齴 櫧櫋瀩 鬄鵊鵙 莃荶衒, 毸溠 橀 簎艜薤 莃荶衒 翣聜蒢
1188−斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 bacon 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣
1189−鬎鯪, 鐩闤 硻禂稢 谾踘遳 撱 赲 迡 箷 蛃袚觙 萇雊蜩 壿嫷 鋡 縢羱聬 跐鉠鉣 蔝蓶蓨 匢奾灱 溮煡煟 雥齆犪
1190−蔰 虈觿, 腷腯葹 鍹餳駷 蛚袲褁蜸 皯竻 瀁瀎 蜭蜸覟 梪涫湴 揗斝湁 毼