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