@@ -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 -> 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 <- terminal_handle
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,92 @@ 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
187−reserveOutputTest = Test
178+reserve_output_test = Test
188− { testName = "Initialize and reserve terminal output then restore previous state."
179+ { test_name = "Initialize and reserve terminal output then restore previous state."
189− , testID = "reserveOutputTest"
180+ , test_ID = "reserve_output_test"
190− , testAction = do
181+ , test_action = do
191− t <- standardIOConfig >>= outputForConfig
182+ t <- terminal_handle
192− reserveDisplay t
183+ reserve_display t
193 putStrLn "Line 1"
184 putStrLn "Line 1"
194 putStrLn "Line 2"
185 putStrLn "Line 2"
195 putStrLn "Line 3"
186 putStrLn "Line 3"
196 putStrLn "Line 4 (press return)"
187 putStrLn "Line 4 (press return)"
197 hFlush stdout
188 hFlush stdout
199− releaseDisplay t
190+ release_display t
200− releaseTerminal t
191+ release_terminal t
201 return ()
192 return ()
202− , printSummary = do
193+ , print_summary = do
203 putStr $ [s|
194 putStr $ [s|
204Once return is pressed:
195Once return is pressed:
205− 0. The screen will be cleared.
196+ 0. The screen will be cleared.
206 1. Four lines of text should be visible.
197 1. Four lines of text should be visible.
207 1. The cursor should be visible and at the start of the fifth line.
198 1. The cursor should be visible and at the start of the fifth line.
@@ -210,143 +201,139 @@ After return is pressed for the second time this test then:
210 * The screen containing the test summary should be restored;
201 * The screen containing the test summary should be restored;
211 * The cursor is visible.
202 * The cursor is visible.
213− , confirmResults = do
204+ , confirm_results = do
214 putStr $ [s|
205 putStr $ [s|
215Did the test output match the description?
206Did the test output match the description?
217− defaultSuccessConfirmResults
208+ default_success_confirm_results
220−displayBoundsTest0 = Test
211+display_bounds_test_0 = Test
221− { testName = "Verify display bounds are correct test 0: Using spaces."
212+ { test_name = "Verify display bounds are correct test 0: Using spaces."
222− , testID = "displayBoundsTest0"
213+ , test_ID = "display_bounds_test_0"
223− , testAction = do
214+ , test_action = do
224− t <- standardIOConfig >>= outputForConfig
215+ t <- terminal_handle
225− reserveDisplay t
216+ reserve_display t
226− (w,h) <- displayBounds t
217+ DisplayRegion w h <- display_bounds t
227− let row0 = replicate (fromEnum w) 'X' ++ "\n"
218+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
228− rowH = replicate (fromEnum w - 1) 'X'
219+ row_h = replicate (fromEnum w - 1) 'X'
229− rowN = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
220+ row_n = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
230− image = row0 ++ (concat $ replicate (fromEnum h - 2) rowN) ++ rowH
221+ image = row_0 ++ (concat $ replicate (fromEnum h - 2) row_n) ++ row_h
231 putStr image
222 putStr image
232 hFlush stdout
223 hFlush stdout
234− releaseDisplay t
225+ release_display t
235− releaseTerminal t
226+ release_terminal t
236 return ()
227 return ()
237− , printSummary = displayBoundsTestSummary True
228+ , print_summary = display_bounds_test_summary True
238− , confirmResults = genericOutputMatchConfirm
229+ , confirm_results = generic_output_match_confirm
241−displayBoundsTest1 = Test
232+display_bounds_test_1 = Test
242− { testName = "Verify display bounds are correct test 0: Using cursor movement."
233+ { test_name = "Verify display bounds are correct test 0: Using cursor movement."
243− , testID = "displayBoundsTest1"
234+ , test_ID = "display_bounds_test_1"
244− , testAction = do
235+ , test_action = do
245− t <- standardIOConfig >>= outputForConfig
236+ t <- terminal_handle
246− reserveDisplay t
237+ reserve_display t
247− (w,h) <- displayBounds t
238+ DisplayRegion w h <- display_bounds t
248− setCursorPos t 0 0
239+ set_cursor_pos t 0 0
249− let row0 = replicate (fromEnum w) 'X' ++ "\n"
240+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
250− putStr row0
241+ putStr row_0
251 forM_ [1 .. h - 2] $ \y -> do
242 forM_ [1 .. h - 2] $ \y -> do
252− setCursorPos t 0 y
243+ set_cursor_pos t 0 y
253 putStr "X"
244 putStr "X"
254 hFlush stdout
245 hFlush stdout
255− setCursorPos t (w - 1) y
246+ set_cursor_pos t (w - 1) y
256 putStr "X"
247 putStr "X"
257 hFlush stdout
248 hFlush stdout
258− setCursorPos t 0 (h - 1)
249+ set_cursor_pos t 0 (h - 1)
259− let rowH = replicate (fromEnum w - 1) 'X'
250+ let row_h = replicate (fromEnum w - 1) 'X'
260− putStr rowH
251+ putStr row_h
261 hFlush stdout
252 hFlush stdout
263− releaseDisplay t
254+ release_display t
264− releaseTerminal t
255+ release_terminal t
265 return ()
256 return ()
266− , printSummary = displayBoundsTestSummary True
257+ , print_summary = display_bounds_test_summary True
267− , confirmResults = genericOutputMatchConfirm
258+ , confirm_results = generic_output_match_confirm
270−displayBoundsTest2 = Test
261+display_bounds_test_2 = Test
271− { testName = "Verify display bounds are correct test 0: Using Image ops."
262+ { test_name = "Verify display bounds are correct test 0: Using Image ops."
272− , testID = "displayBoundsTest2"
263+ , test_ID = "display_bounds_test_2"
273− , testAction = do
264+ , test_action = do
274− t <- standardIOConfig >>= outputForConfig
265+ t <- terminal_handle
275− reserveDisplay t
266+ reserve_display t
276− bounds@(w,h) <- displayBounds t
267+ bounds@(DisplayRegion w h) <- display_bounds t
277− let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
268+ let first_row = horiz_cat $ replicate (fromEnum w) (char def_attr 'X')
278− middleRows = vertCat $ replicate (fromEnum h - 2) middleRow
269+ middle_rows = vert_cat $ replicate (fromEnum h - 2) middle_row
279− middleRow = (char defAttr 'X') <|> backgroundFill (w - 2) 1 <|> (char defAttr 'X')
270+ middle_row = (char def_attr 'X') <|> background_fill (w - 2) 1 <|> (char def_attr 'X')
280− endRow = firstRow
271+ end_row = first_row
281− image = firstRow <-> middleRows <-> endRow
272+ image = first_row <-> middle_rows <-> end_row
282− pic = (picForImage image) { picCursor = Cursor (w - 1) (h - 1) }
273+ pic = (pic_for_image image) { pic_cursor = Cursor (w - 1) (h - 1) }
283− d <- displayContext t bounds
274+ d <- display_context t bounds
284− outputPicture d pic
275+ output_picture d pic
286− releaseDisplay t
277+ release_display t
287− releaseTerminal t
278+ release_terminal t
288 return ()
279 return ()
289− , printSummary = displayBoundsTestSummary True
280+ , print_summary = display_bounds_test_summary True
290− , confirmResults = genericOutputMatchConfirm
281+ , confirm_results = generic_output_match_confirm
293−displayBoundsTest3 = Test
284+display_bounds_test_3 = Test
294− { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
285+ { test_name = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295− , testID = "displayBoundsTest3"
286+ , test_ID = "display_bounds_test_3"
296− , testAction = do
287+ , test_action = do
297− t <- standardIOConfig >>= outputForConfig
288+ t <- terminal_handle
298− reserveDisplay t
289+ reserve_display t
299− (w,h) <- displayBounds t
290+ DisplayRegion w h <- display_bounds t
300− hideCursor t
291+ hide_cursor t
301− setCursorPos t 0 0
292+ set_cursor_pos t 0 0
302− let row0 = replicate (fromEnum w) 'X'
293+ let row_0 = replicate (fromEnum w) 'X'
303− putStrLn row0
294+ putStrLn row_0
304 forM_ [1 .. h - 2] $ \y -> do
295 forM_ [1 .. h - 2] $ \y -> do
305− setCursorPos t 0 y
296+ set_cursor_pos t 0 y
306 putStr "X"
297 putStr "X"
307 hFlush stdout
298 hFlush stdout
308− setCursorPos t (w - 1) y
299+ set_cursor_pos t (w - 1) y
309 putStr "X"
300 putStr "X"
310 hFlush stdout
301 hFlush stdout
311− setCursorPos t 0 (h - 1)
302+ set_cursor_pos t 0 (h - 1)
312− let rowH = row0
303+ let row_h = row_0
313− putStr rowH
304+ putStr row_h
314 hFlush stdout
305 hFlush stdout
316− showCursor t
307+ show_cursor t
317− releaseDisplay t
308+ release_display t
318− releaseTerminal t
309+ release_terminal t
319 return ()
310 return ()
320− , printSummary = displayBoundsTestSummary False
311+ , print_summary = display_bounds_test_summary False
321− , confirmResults = genericOutputMatchConfirm
312+ , confirm_results = generic_output_match_confirm
324−displayBoundsTestSummary hasCursor = do
315+display_bounds_test_summary has_cursor = do
325 putStr $ [s|
316 putStr $ [s|
326Once return is pressed:
317Once return is pressed:
327 0. The screen will be cleared.
318 0. The screen will be cleared.
329− if hasCursor
320+ if has_cursor
330 then putStr " 1. The cursor will be visible."
321 then putStr " 1. The cursor will be visible."
331 else putStr " 1. The cursor will NOT be visible."
322 else putStr " 1. The cursor will NOT be visible."
332 putStr [s|
323 putStr [s|
334 2. The border of the display will be outlined in Xs.
324 2. The border of the display will be outlined in Xs.
335 So if - and | represented the edge of the terminal window:
325 So if - and | represented the edge of the terminal window:
336 |-------------|
326 |-------------|
337 |XXXXXXXXXXXXX|
327 |XXXXXXXXXXXXX|
340− if hasCursor
330+ if has_cursor
341 then putStr $ [s|
331 then putStr $ [s|
343 |XXXXXXXXXXXXC| |]
332 |XXXXXXXXXXXXC| |]
344 else putStr $ [s|
333 else putStr $ [s|
346 |XXXXXXXXXXXXX| |]
334 |XXXXXXXXXXXXX| |]
348 putStr $ [s|
336 putStr $ [s|
350 |-------------|
337 |-------------|
352 ( Where C is the final position of the cursor. There may be an X drawn
339 ( Where C is the final position of the cursor. There may be an X drawn
@@ -358,13 +345,13 @@ After return is pressed for the second time:
358 1. The cursor should be visible.
345 1. The cursor should be visible.
361−genericOutputMatchConfirm = do
348+generic_output_match_confirm = do
362 putStr $ [s|
349 putStr $ [s|
363Did the test output match the description?
350Did the test output match the description?
365− defaultSuccessConfirmResults
352+ default_success_confirm_results
367−-- Explicitly define the bytes that encode each example text.
354+-- Explicitely definethe bytes that encode each example text.
368-- This avoids any issues with how the compiler represents string literals.
355-- 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
357-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -373,24 +360,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
360-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
374-- comments ;-)
361-- comments ;-)
376−-- txt0 = ↑↑↓↓←→←→BA
363+-- txt_0 = ↑↑↓↓←→←→BA
378−utf8Txt0 :: [[Word8]]
365+utf8_txt_0 :: [[Word8]]
379−utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
366+utf8_txt_0 = [ [ 0xe2 , 0x86 , 0x91 ]
380− , [ 0xe2 , 0x86 , 0x91 ]
367+ , [ 0xe2 , 0x86 , 0x91 ]
381− , [ 0xe2 , 0x86 , 0x93 ]
368+ , [ 0xe2 , 0x86 , 0x93 ]
382− , [ 0xe2 , 0x86 , 0x93 ]
369+ , [ 0xe2 , 0x86 , 0x93 ]
383− , [ 0xe2 , 0x86 , 0x90 ]
370+ , [ 0xe2 , 0x86 , 0x90 ]
384− , [ 0xe2 , 0x86 , 0x92 ]
371+ , [ 0xe2 , 0x86 , 0x92 ]
385− , [ 0xe2 , 0x86 , 0x90 ]
372+ , [ 0xe2 , 0x86 , 0x90 ]
386− , [ 0xe2 , 0x86 , 0x92 ]
373+ , [ 0xe2 , 0x86 , 0x92 ]
387− , [ 0x42 ]
374+ , [ 0x42 ]
388− , [ 0x41 ]
375+ , [ 0x41 ]
391−iso10646Txt0 :: String
378+iso_10646_txt_0 :: String
392−iso10646Txt0 = map toEnum
379+iso_10646_txt_0 = map toEnum
@@ -402,46 +389,46 @@ iso10646Txt0 = map toEnum
405−unicodeSingleWidth0 = Test
392+unicode_single_width_0 = Test
406− { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
393+ { test_name = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407− , testID = "unicodeSingleWidth0"
394+ , test_ID = "unicode_single_width_0"
408− , testAction = do
395+ , test_action = do
409− t <- standardIOConfig >>= outputForConfig
396+ t <- terminal_handle
410− reserveDisplay t
397+ reserve_display t
411− hideCursor t
398+ hide_cursor t
412− withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
399+ withArrayLen (concat utf8_txt_0) (flip $ hPutBuf stdout)
413 hPutStr stdout "\n"
400 hPutStr stdout "\n"
414 hPutStr stdout "0123456789\n"
401 hPutStr stdout "0123456789\n"
415 hFlush stdout
402 hFlush stdout
417− releaseDisplay t
404+ release_display t
418− releaseTerminal t
405+ release_terminal t
419 return ()
406 return ()
420− , printSummary = unicodeSingleWidthSummary
407+ , print_summary = unicode_single_width_summary
421− , confirmResults = genericOutputMatchConfirm
408+ , confirm_results = generic_output_match_confirm
424−unicodeSingleWidth1 = Test
411+unicode_single_width_1 = Test
425− { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
412+ { test_name = "Verify terminal can display unicode single-width characters. (Image ops)"
426− , testID = "unicodeSingleWidth1"
413+ , test_ID = "unicode_single_width_1"
427− , testAction = do
414+ , test_action = do
428− t <- standardIOConfig >>= outputForConfig
415+ t <- terminal_handle
429− reserveDisplay t
416+ reserve_display t
430− let pic = picForImage image
417+ let pic = pic_for_image image
431− image = line0 <-> line1
418+ image = line_0 <-> line_1
432− line0 = iso10646String defAttr iso10646Txt0
419+ line_0 = iso_10646_string def_attr iso_10646_txt_0
433− line1 = string defAttr "0123456789"
420+ line_1 = string def_attr "0123456789"
434− d <- displayBounds t >>= displayContext t
421+ d <- display_bounds t >>= display_context t
435− outputPicture d pic
422+ output_picture d pic
437− releaseDisplay t
424+ release_display t
438− releaseTerminal t
425+ release_terminal t
439 return ()
426 return ()
440− , printSummary = unicodeSingleWidthSummary
427+ , print_summary = unicode_single_width_summary
441− , confirmResults = genericOutputMatchConfirm
428+ , confirm_results = generic_output_match_confirm
444−unicodeSingleWidthSummary = putStr [s|
431+unicode_single_width_summary = putStr [s|
445Once return is pressed:
432Once return is pressed:
446 0. The screen will be cleared.
433 0. The screen will be cleared.
447 1. The cursor will be hidden.
434 1. The cursor will be hidden.
@@ -475,55 +462,55 @@ After return is pressed for the second time:
476-- The second example is a unicode string containing double-width glyphs
463-- The second example is a unicode string containing double-width glyphs
478−utf8Txt1 :: [[Word8]]
465+utf8_txt_1 :: [[Word8]]
479−utf8Txt1 = [ [0xe4,0xbd,0xa0]
466+utf8_txt_1 = [ [0xe4,0xbd,0xa0]
480− , [0xe5,0xa5,0xbd]
467+ , [0xe5,0xa5,0xbd]
481− , [0xe5,0x90,0x97]
468+ , [0xe5,0x90,0x97]
484−iso10646Txt1 :: String
471+iso_10646_txt_1 :: String
485−iso10646Txt1 = map toEnum [20320,22909,21527]
472+iso_10646_txt_1 = map toEnum [20320,22909,21527]
487−unicodeDoubleWidth0 = Test
474+unicode_double_width_0 = Test
488− { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
475+ { test_name = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489− , testID = "unicodeDoubleWidth0"
476+ , test_ID = "unicode_double_width_0"
490− , testAction = do
477+ , test_action = do
491− t <- standardIOConfig >>= outputForConfig
478+ t <- terminal_handle
492− reserveDisplay t
479+ reserve_display t
493− hideCursor t
480+ hide_cursor t
494− withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
481+ withArrayLen (concat utf8_txt_1) (flip $ hPutBuf stdout)
495 hPutStr stdout "\n"
482 hPutStr stdout "\n"
496 hPutStr stdout "012345\n"
483 hPutStr stdout "012345\n"
497 hFlush stdout
484 hFlush stdout
499− releaseDisplay t
486+ release_display t
500− releaseTerminal t
487+ release_terminal t
501 return ()
488 return ()
502− , printSummary = unicodeDoubleWidthSummary
489+ , print_summary = unicode_double_width_summary
503− , confirmResults = genericOutputMatchConfirm
490+ , confirm_results = generic_output_match_confirm
506−unicodeDoubleWidth1 = Test
493+unicode_double_width_1 = Test
507− { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
494+ { test_name = "Verify terminal can display unicode double-width characters. (Image ops)"
508− , testID = "unicodeDoubleWidth1"
495+ , test_ID = "unicode_double_width_1"
509− , testAction = do
496+ , test_action = do
510− t <- standardIOConfig >>= outputForConfig
497+ t <- terminal_handle
511− reserveDisplay t
498+ reserve_display t
512− let pic = picForImage image
499+ let pic = pic_for_image image
513− image = line0 <-> line1
500+ image = line_0 <-> line_1
514− line0 = iso10646String defAttr iso10646Txt1
501+ line_0 = iso_10646_string def_attr iso_10646_txt_1
515− line1 = string defAttr "012345"
502+ line_1 = string def_attr "012345"
516− d <- displayBounds t >>= displayContext t
503+ d <- display_bounds t >>= display_context t
517− outputPicture d pic
504+ output_picture d pic
519− releaseDisplay t
506+ release_display t
520− releaseTerminal t
507+ release_terminal t
521 return ()
508 return ()
522− , printSummary = unicodeDoubleWidthSummary
509+ , print_summary = unicode_double_width_summary
523− , confirmResults = genericOutputMatchConfirm
510+ , confirm_results = generic_output_match_confirm
526−unicodeDoubleWidthSummary = putStr [s|
513+unicode_double_width_summary = putStr [s|
527Once return is pressed:
514Once return is pressed:
528 0. The screen will be cleared.
515 0. The screen will be cleared.
529 1. The cursor will be hidden.
516 1. The cursor will be hidden.
@@ -550,32 +537,32 @@ After return is pressed for the second time:
550 1. The cursor should be visible.
537 1. The cursor should be visible.
553−allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
540+all_colors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554− [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
541+ [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
556−allBrightColors
543+all_bright_colors
557− = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
544+ = 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" ]
545 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
560−attributesTest0 = Test
547+attributes_test_0 = Test
561− { testName = "Character attributes: foreground colors."
548+ { test_name = "Character attributes: foreground colors."
562− , testID = "attributesTest0"
549+ , test_ID = "attributes_test_0"
563− , testAction = do
550+ , test_action = do
564− t <- standardIOConfig >>= outputForConfig
551+ t <- terminal_handle
565− reserveDisplay t
552+ reserve_display t
566− let pic = picForImage image
553+ let pic = pic_for_image image
567− image = border <|> column0 <|> border <|> column1 <|> border
554+ image = border <|> column_0 <|> border <|> column_1 <|> border
568− column0 = vertCat $ map lineWithColor allColors
555+ column_0 = vert_cat $ map line_with_color all_colors
569− border = vertCat $ replicate (length allColors) $ string defAttr " | "
556+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
570− column1 = vertCat $ map (string defAttr . snd) allColors
557+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
571− lineWithColor (c, cName) = string (defAttr `withForeColor` c) cName
558+ line_with_color (c, c_name) = string (def_attr `with_fore_color` c) c_name
572− d <- displayBounds t >>= displayContext t
559+ d <- display_bounds t >>= display_context t
573− outputPicture d pic
560+ output_picture d pic
575− releaseDisplay t
562+ release_display t
576− releaseTerminal t
563+ release_terminal t
577 return ()
564 return ()
578− , printSummary = do
565+ , print_summary = do
579 putStr $ [s|
566 putStr $ [s|
580Once return is pressed:
567Once return is pressed:
581 0. The screen will be cleared.
568 0. The screen will be cleared.
@@ -596,32 +583,32 @@ After return is pressed for the second time:
596 0. The screen containing the test summary should be restored.
583 0. The screen containing the test summary should be restored.
597 1. The cursor should be visible.
584 1. The cursor should be visible.
599− , confirmResults = do
586+ , confirm_results = do
600 putStr $ [s|
587 putStr $ [s|
601Did the test output match the description?
588Did the test output match the description?
603− defaultSuccessConfirmResults
590+ default_success_confirm_results
606−attributesTest1 = Test
593+attributes_test_1 = Test
607− { testName = "Character attributes: background colors."
594+ { test_name = "Character attributes: background colors."
608− , testID = "attributesTest1"
595+ , test_ID = "attributes_test_1"
609− , testAction = do
596+ , test_action = do
610− t <- standardIOConfig >>= outputForConfig
597+ t <- terminal_handle
611− reserveDisplay t
598+ reserve_display t
612− let pic = picForImage image
599+ let pic = pic_for_image image
613− image = border <|> column0 <|> border <|> column1 <|> border
600+ image = border <|> column_0 <|> border <|> column_1 <|> border
614− column0 = vertCat $ map lineWithColor allColors
601+ column_0 = vert_cat $ map line_with_color all_colors
615− border = vertCat $ replicate (length allColors) $ string defAttr " | "
602+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
616− column1 = vertCat $ map (string defAttr . snd) allColors
603+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
617− lineWithColor (c, cName) = string (defAttr `withBackColor` c) cName
604+ line_with_color (c, c_name) = string (def_attr `with_back_color` c) c_name
618− d <- displayBounds t >>= displayContext t
605+ d <- display_bounds t >>= display_context t
619− outputPicture d pic
606+ output_picture d pic
621− releaseDisplay t
608+ release_display t
622− releaseTerminal t
609+ release_terminal t
623 return ()
610 return ()
624− , printSummary = do
611+ , print_summary = do
625 putStr $ [s|
612 putStr $ [s|
626Once return is pressed:
613Once return is pressed:
627 0. The screen will be cleared.
614 0. The screen will be cleared.
@@ -651,57 +638,57 @@ After return is pressed for the second time:
651 0. The screen containing the test summary should be restored.
638 0. The screen containing the test summary should be restored.
652 1. The cursor should be visible.
639 1. The cursor should be visible.
654− , confirmResults = do
641+ , confirm_results = do
655 putStr $ [s|
642 putStr $ [s|
656Did the test output match the description?
643Did the test output match the description?
658− defaultSuccessConfirmResults
645+ default_success_confirm_results
661−attributesTest2 = Test
648+attributes_test_2 = Test
662− { testName = "Character attributes: Vivid foreground colors."
649+ { test_name = "Character attributes: Vivid foreground colors."
663− , testID = "attributesTest2"
650+ , test_ID = "attributes_test_2"
664− , testAction = do
651+ , test_action = do
665− t <- standardIOConfig >>= outputForConfig
652+ t <- terminal_handle
666− reserveDisplay t
653+ reserve_display t
667− let pic = picForImage image
654+ let pic = pic_for_image image
668− image = horizCat [border, column0, border, column1, border, column2, border]
655+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
669− border = vertCat $ replicate (length allColors) $ string defAttr " | "
656+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
670− column0 = vertCat $ map lineWithColor0 allColors
657+ column_0 = vert_cat $ map line_with_color_0 all_colors
671− column1 = vertCat $ map lineWithColor1 allBrightColors
658+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
672− column2 = vertCat $ map (string defAttr . snd) allColors
659+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
673− lineWithColor0 (c, cName) = string (defAttr `withForeColor` c) cName
660+ 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
661+ line_with_color_1 (c, c_name) = string (def_attr `with_fore_color` c) c_name
675− d <- displayBounds t >>= displayContext t
662+ d <- display_bounds t >>= display_context t
676− outputPicture d pic
663+ output_picture d pic
678− releaseDisplay t
665+ release_display t
679− releaseTerminal t
666+ release_terminal t
680 return ()
667 return ()
681− , printSummary = do
668+ , print_summary = do
682 putStr $ [s|
669 putStr $ [s|
683Once return is pressed:
670Once return is pressed:
684 0. The screen will be cleared.
671 0. The screen will be cleared.
685 1. The cursor will be hidden.
672 1. The cursor will be hidden.
686 2. 9 lines of text in three columns will be drawn:
673 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
674 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.
675+ 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
676 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
677 with that color as the foreground color but the shade used should be
691− more vivid than the shade used in the first column.
678+ 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
679 c. The final column will be the name of a color rendered with the
693 default attributes.
680 default attributes.
695For instance, one line will be the word "magenta" and that word should be
682For instance, one line will be the word "magenta" and that word should be
696−rendered in the magenta color.
683+rendered in the magenta color.
698I'm not actually sure exactly what "vivid" means in this context. For xterm the
685I'm not actually sure exactly what "vivid" means in this context. For xterm the
699−vivid colors are brighter.
686+vivid colors are brighter.
702 * The first column: The foreground color matches the named color.
689 * The first column: The foreground color matches the named color.
703 * The second column: The foreground color matches the named color but is
690 * The second column: The foreground color matches the named color but is
704− more vivid than the color used in the first column.
691+ more vivid than the color used in the first column.
705 * The third column: All text is rendered with the default attributes.
692 * 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
693 * The vertical bars used in each line to mark the border of a column are
707 lined up.
694 lined up.
@@ -710,34 +697,34 @@ After return is pressed for the second time:
710 0. The screen containing the test summary should be restored.
697 0. The screen containing the test summary should be restored.
711 1. The cursor should be visible.
698 1. The cursor should be visible.
713− , confirmResults = do
700+ , confirm_results = do
714 putStr $ [s|
701 putStr $ [s|
715Did the test output match the description?
702Did the test output match the description?
717− defaultSuccessConfirmResults
704+ default_success_confirm_results
720−attributesTest3 = Test
707+attributes_test_3 = Test
721− { testName = "Character attributes: Vivid background colors."
708+ { test_name = "Character attributes: Vivid background colors."
722− , testID = "attributesTest3"
709+ , test_ID = "attributes_test_3"
723− , testAction = do
710+ , test_action = do
724− t <- standardIOConfig >>= outputForConfig
711+ t <- terminal_handle
725− reserveDisplay t
712+ reserve_display t
726− let pic = picForImage image
713+ let pic = pic_for_image image
727− image = horizCat [border, column0, border, column1, border, column2, border]
714+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
728− border = vertCat $ replicate (length allColors) $ string defAttr " | "
715+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
729− column0 = vertCat $ map lineWithColor0 allColors
716+ column_0 = vert_cat $ map line_with_color_0 all_colors
730− column1 = vertCat $ map lineWithColor1 allBrightColors
717+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
731− column2 = vertCat $ map (string defAttr . snd) allColors
718+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
732− lineWithColor0 (c, cName) = string (defAttr `withBackColor` c) cName
719+ 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
720+ line_with_color_1 (c, c_name) = string (def_attr `with_back_color` c) c_name
734− d <- displayBounds t >>= displayContext t
721+ d <- display_bounds t >>= display_context t
735− outputPicture d pic
722+ output_picture d pic
737− releaseDisplay t
724+ release_display t
738− releaseTerminal t
725+ release_terminal t
739 return ()
726 return ()
740− , printSummary = do
727+ , print_summary = do
741 putStr $ [s|
728 putStr $ [s|
742Once return is pressed:
729Once return is pressed:
743 0. The screen will be cleared.
730 0. The screen will be cleared.
@@ -745,23 +732,23 @@ Once return is pressed:
745 2. 9 lines of text in three columns will be drawn:
732 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
733 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
734 color terminal rendered with the default foreground color with a
748− background the named color.
735+ background the named color.
749 b. The first column will contain be a name of a standard color for an 8
736 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
737 color terminal rendered with the default foreground color with the
751− background a vivid version of the named color.
738+ background a vivid version of the named color.
752 c. The third column will be the name of a standard color rendered with
739 c. The third column will be the name of a standard color rendered with
753 the default attributes.
740 the default attributes.
755For instance, one line will contain be the word "magenta" and the word should
742For 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.
743+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
745I'm not actually sure exactly what "vivid" means in this context. For xterm the
759vivid colors are brighter.
746vivid colors are brighter.
762 * The first column: The background color matches the named color.
749 * The first column: The background color matches the named color.
763 * The second column: The background color matches the named color and is
750 * The second column: The background color matches the named color and is
764− more vivid than the color used in the first column.
751+ more vivid than the color used in the first column.
765 * The third column column: All text is rendered with the default attributes.
752 * 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
753 * The vertical bars used in each line to mark the border of a column are
767 lined up.
754 lined up.
@@ -777,51 +764,51 @@ After return is pressed for the second time:
777 0. The screen containing the test summary should be restored.
764 0. The screen containing the test summary should be restored.
778 1. The cursor should be visible.
765 1. The cursor should be visible.
780− , confirmResults = do
767+ , confirm_results = do
781 putStr $ [s|
768 putStr $ [s|
782Did the test output match the description?
769Did the test output match the description?
784− defaultSuccessConfirmResults
771+ default_success_confirm_results
787−attrCombos =
774+attr_combos =
788 [ ( "default", id )
775 [ ( "default", id )
789− , ( "bold", flip withStyle bold )
776+ , ( "bold", flip with_style bold )
790− , ( "blink", flip withStyle blink )
777+ , ( "blink", flip with_style blink )
791− , ( "underline", flip withStyle underline )
778+ , ( "underline", flip with_style underline )
792− , ( "bold + blink", flip withStyle (bold + blink) )
779+ , ( "bold + blink", flip with_style (bold + blink) )
793− , ( "bold + underline", flip withStyle (bold + underline) )
780+ , ( "bold + underline", flip with_style (bold + underline) )
794− , ( "underline + blink", flip withStyle (underline + blink) )
781+ , ( "underline + blink", flip with_style (underline + blink) )
795− , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
782+ , ( "bold + blink + underline", flip with_style (bold + blink + underline) )
798−attributesTest4 = Test
785+attributes_test_4 = Test
799− { testName = "Character attributes: Bold; Blink; Underline."
786+ { test_name = "Character attributes: Bold; Blink; Underline."
800− , testID = "attributesTest4"
787+ , test_ID = "attributes_test_4"
801− , testAction = do
788+ , test_action = do
802− t <- standardIOConfig >>= outputForConfig
789+ t <- terminal_handle
803− reserveDisplay t
790+ reserve_display t
804− let pic = picForImage image
791+ let pic = pic_for_image image
805− image = horizCat [border, column0, border, column1, border]
792+ image = horiz_cat [border, column_0, border, column_1, border]
806− border = vertCat $ replicate (length attrCombos) $ string defAttr " | "
793+ border = vert_cat $ replicate (length attr_combos) $ string def_attr " | "
807− column0 = vertCat $ map lineWithAttrs attrCombos
794+ column_0 = vert_cat $ map line_with_attrs attr_combos
808− column1 = vertCat $ map (string defAttr . fst) attrCombos
795+ column_1 = vert_cat $ map (string def_attr . fst) attr_combos
809− lineWithAttrs (desc, attrF) = string (attrF defAttr) desc
796+ line_with_attrs (desc, attr_f) = string (attr_f def_attr) desc
810− d <- displayBounds t >>= displayContext t
797+ d <- display_bounds t >>= display_context t
811− outputPicture d pic
798+ output_picture d pic
813− releaseDisplay t
800+ release_display t
814− releaseTerminal t
801+ release_terminal t
815 return ()
802 return ()
816− , printSummary = do
803+ , print_summary = do
817 putStr $ [s|
804 putStr $ [s|
818Once return is pressed:
805Once return is pressed:
819 0. The screen will be cleared.
806 0. The screen will be cleared.
820 1. The cursor will be hidden.
807 1. The cursor will be hidden.
821− 2. 8 rows of text in two columns.
808+ 2. 8 rows of text in two columns.
822 The rows will contain the following text:
809 The rows will contain the following text:
826 underline
813 underline
827 bold + blink
814 bold + blink
@@ -830,8 +817,8 @@ Once return is pressed:
830 bold + blink + underline
817 bold + blink + underline
831 The first column will be rendered with the described attributes. The second
818 The first column will be rendered with the described attributes. The second
832 column will be rendered with the default attributes.
819 column will be rendered with the default attributes.
835 * The vertical bars used in each line to mark the border of a column are
822 * The vertical bars used in each line to mark the border of a column are
836 lined up.
823 lined up.
837 * The text in the first column is rendered as described.
824 * The text in the first column is rendered as described.
@@ -840,31 +827,31 @@ After return is pressed for the second time:
840 0. The screen containing the test summary should be restored.
827 0. The screen containing the test summary should be restored.
841 1. The cursor should be visible.
828 1. The cursor should be visible.
843− , confirmResults = do
830+ , confirm_results = do
844 putStr $ [s|
831 putStr $ [s|
845Did the test output match the description?
832Did the test output match the description?
847− defaultSuccessConfirmResults
834+ default_success_confirm_results
850−attributesTest5 = Test
837+attributes_test_5 = Test
851− { testName = "Character attributes: 240 color palette"
838+ { test_name = "Character attributes: 240 color palette"
852− , testID = "attributesTest5"
839+ , test_ID = "attributes_test_5"
853− , testAction = do
840+ , test_action = do
854− t <- standardIOConfig >>= outputForConfig
841+ t <- terminal_handle
855− reserveDisplay t
842+ reserve_display t
856− let pic = picForImage image
843+ let pic = pic_for_image image
857− image = vertCat $ map horizCat $ splitColorImages colorImages
844+ image = vert_cat $ map horiz_cat $ split_color_images color_images
858− colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
845+ color_images = map (\i -> string (current_attr `with_back_color` Color240 i) " ") [0..239]
859− splitColorImages [] = []
846+ split_color_images [] = []
860− splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
847+ split_color_images is = (take 20 is ++ [string def_attr " "]) : (split_color_images (drop 20 is))
861− d <- displayBounds t >>= displayContext t
848+ d <- display_bounds t >>= display_context t
862− outputPicture d pic
849+ output_picture d pic
864− releaseDisplay t
851+ release_display t
865− releaseTerminal t
852+ release_terminal t
866 return ()
853 return ()
867− , printSummary = do
854+ , print_summary = do
868 putStr $ [s|
855 putStr $ [s|
869Once return is pressed:
856Once return is pressed:
870 0. The screen will be cleared.
857 0. The screen will be cleared.
@@ -872,321 +859,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
859 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...
860 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:
864After return is pressed for the second time:
878 0. The screen containing the test summary should be restored.
865 0. The screen containing the test summary should be restored.
879 1. The cursor should be visible.
866 1. The cursor should be visible.
881− , confirmResults = do
868+ , confirm_results = do
882 putStr $ [s|
869 putStr $ [s|
883Did the test output match the description?
870Did the test output match the description?
885− defaultSuccessConfirmResults
872+ default_success_confirm_results
888−inlineTest0 = Test
875+inline_test_0 = Test
889− { testName = "Verify styled output can be performed without clearing the screen."
876+ { test_name = "Verify styled output can be performed without clearing the screen."
890− , testID = "inlineTest0"
877+ , test_ID = "inline_test_0"
891− , testAction = do
878+ , test_action = do
879+ t <- terminal_handle
892 putStrLn "line 1."
880 putStrLn "line 1."
893− putAttrChange_ $ backColor red >> applyStyle underline
881+ put_attr_change t $ back_color red >> apply_style underline
894 putStrLn "line 2."
882 putStrLn "line 2."
895− putAttrChange_ $ defaultAll
883+ put_attr_change t $ default_all
896 putStrLn "line 3."
884 putStrLn "line 3."
897− , printSummary = putStr $ [s|
885+ release_terminal t
887+ , print_summary = putStr $ [s|
898lines are in order.
888lines are in order.
899The second line "line 2" should have a red background and the text underline.
889The 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.
890The third line "line 3" should be drawn in the same style as the first line.
903− , confirmResults = genericOutputMatchConfirm
893+ , confirm_results = generic_output_match_confirm
906−inlineTest1 = Test
896+inline_test_1 = Test
907− { testName = "Verify styled output can be performed without clearing the screen."
897+ { test_name = "Verify styled output can be performed without clearing the screen."
908− , testID = "inlineTest1"
898+ , test_ID = "inline_test_1"
909− , testAction = do
899+ , test_action = do
900+ t <- terminal_handle
910 putStr "Not styled. "
901 putStr "Not styled. "
911− putAttrChange_ $ backColor red >> applyStyle underline
902+ put_attr_change t $ back_color red >> apply_style underline
912 putStr " Styled! "
903 putStr " Styled! "
913− putAttrChange_ $ defaultAll
904+ put_attr_change t $ default_all
914 putStrLn "Not styled."
905 putStrLn "Not styled."
915− , printSummary = putStr $ [s|
906+ release_terminal t
908+ , print_summary = putStr $ [s|
918− , confirmResults = genericOutputMatchConfirm
911+ , confirm_results = generic_output_match_confirm
921−inlineTest2 = Test
914+inline_test_2 = Test
922− { testName = "Verify styled output can be performed without clearing the screen."
915+ { test_name = "Verify styled output can be performed without clearing the screen."
923− , testID = "inlineTest1"
916+ , test_ID = "inline_test_1"
924− , testAction = do
917+ , test_action = do
918+ t <- terminal_handle
925 putStr "Not styled. "
919 putStr "Not styled. "
926− putAttrChange_ $ backColor red >> applyStyle underline
920+ put_attr_change t $ back_color red >> apply_style underline
927 putStr " Styled! "
921 putStr " Styled! "
928− putAttrChange_ $ defaultAll
922+ put_attr_change t $ default_all
929 putStr "Not styled.\n"
923 putStr "Not styled.\n"
930− , printSummary = putStr $ [s|
924+ release_terminal t
926+ , print_summary = putStr $ [s|
932− , confirmResults = genericOutputMatchConfirm
928+ , confirm_results = generic_output_match_confirm
935−cursorHideTest0 :: Test
931+cursor_hide_test_0 :: Test
936−cursorHideTest0 = Test
932+cursor_hide_test_0 = Test
937− { testName = "Verify the cursor is hid and re-shown. issue #7"
933+ { test_name = "Verify the cursor is hid and re-shown. issue #7"
938− , testID = "cursorHideTest0"
934+ , test_ID = "cursor_hide_test_0"
939− , testAction = do
935+ , test_action = do
940− vty <- mkVty defaultConfig
936+ vty <- mkVty
941− showCursor $ outputIface vty
937+ show_cursor $ terminal vty
942− setCursorPos (outputIface vty) 5 5
938+ set_cursor_pos (terminal vty) 5 5
943− nextEvent vty
939+ next_event vty
944− hideCursor $ outputIface vty
940+ hide_cursor $ terminal vty
945− nextEvent vty
941+ next_event vty
946 shutdown vty
942 shutdown vty
947 return ()
943 return ()
948− , printSummary = putStr $ [s|
944+ , print_summary = putStr $ [s|
949 1. verify the cursor is displayed.
945 1. verify the cursor is displayed.
950 2. press enter
946 2. press enter
951 3. verify the cursor is hid.
947 3. verify the cursor is hid.
952 4. press enter.
948 4. press enter.
953 5. the display should return to the state before the test.
949 5. the display should return to the state before the test.
955− , confirmResults = genericOutputMatchConfirm
951+ , 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−蔰 虈觿, 腷腯葹 鍹餳駷 蛚袲褁蜸 皯竻 瀁瀎 蜭蜸覟 梪涫湴 揗斝湁 毼