@@ -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,100 @@ 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
179− , horizCropTest0
180+ , horiz_crop_test_0
180− , horizCropTest1
181+ , horiz_crop_test_1
181− , horizCropTest2
182+ , horiz_crop_test_2
182− , horizCropTest3
183+ , horiz_crop_test_3
187−reserveOutputTest = Test
186+reserve_output_test = Test
188− { testName = "Initialize and reserve terminal output then restore previous state."
187+ { test_name = "Initialize and reserve terminal output then restore previous state."
189− , testID = "reserveOutputTest"
188+ , test_ID = "reserve_output_test"
190− , testAction = do
189+ , test_action = do
191− t <- standardIOConfig >>= outputForConfig
190+ t <- current_terminal
192− reserveDisplay t
191+ reserve_display t
193 putStrLn "Line 1"
192 putStrLn "Line 1"
194 putStrLn "Line 2"
193 putStrLn "Line 2"
195 putStrLn "Line 3"
194 putStrLn "Line 3"
196 putStrLn "Line 4 (press return)"
195 putStrLn "Line 4 (press return)"
197 hFlush stdout
196 hFlush stdout
199− releaseDisplay t
198+ release_display t
200− releaseTerminal t
199+ release_terminal t
201 return ()
200 return ()
202− , printSummary = do
201+ , print_summary = do
203 putStr $ [s|
202 putStr $ [s|
204Once return is pressed:
203Once return is pressed:
205− 0. The screen will be cleared.
204+ 0. The screen will be cleared.
206 1. Four lines of text should be visible.
205 1. Four lines of text should be visible.
207 1. The cursor should be visible and at the start of the fifth line.
206 1. The cursor should be visible and at the start of the fifth line.
@@ -210,123 +209,123 @@ After return is pressed for the second time this test then:
210 * The screen containing the test summary should be restored;
209 * The screen containing the test summary should be restored;
211 * The cursor is visible.
210 * The cursor is visible.
213− , confirmResults = do
212+ , confirm_results = do
214 putStr $ [s|
213 putStr $ [s|
215Did the test output match the description?
214Did the test output match the description?
217− defaultSuccessConfirmResults
216+ default_success_confirm_results
220−displayBoundsTest0 = Test
219+display_bounds_test_0 = Test
221− { testName = "Verify display bounds are correct test 0: Using spaces."
220+ { test_name = "Verify display bounds are correct test 0: Using spaces."
222− , testID = "displayBoundsTest0"
221+ , test_ID = "display_bounds_test_0"
223− , testAction = do
222+ , test_action = do
224− t <- standardIOConfig >>= outputForConfig
223+ t <- current_terminal
225− reserveDisplay t
224+ reserve_display t
226− (w,h) <- displayBounds t
225+ DisplayRegion w h <- display_bounds t
227− let row0 = replicate (fromEnum w) 'X' ++ "\n"
226+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
228− rowH = replicate (fromEnum w - 1) 'X'
227+ row_h = replicate (fromEnum w - 1) 'X'
229− rowN = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
228+ row_n = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
230− image = row0 ++ (concat $ replicate (fromEnum h - 2) rowN) ++ rowH
229+ image = row_0 ++ (concat $ replicate (fromEnum h - 2) row_n) ++ row_h
231 putStr image
230 putStr image
232 hFlush stdout
231 hFlush stdout
234− releaseDisplay t
233+ release_display t
235− releaseTerminal t
234+ release_terminal t
236 return ()
235 return ()
237− , printSummary = displayBoundsTestSummary True
236+ , print_summary = display_bounds_test_summary True
238− , confirmResults = genericOutputMatchConfirm
237+ , confirm_results = generic_output_match_confirm
241−displayBoundsTest1 = Test
240+display_bounds_test_1 = Test
242− { testName = "Verify display bounds are correct test 0: Using cursor movement."
241+ { test_name = "Verify display bounds are correct test 0: Using cursor movement."
243− , testID = "displayBoundsTest1"
242+ , test_ID = "display_bounds_test_1"
244− , testAction = do
243+ , test_action = do
245− t <- standardIOConfig >>= outputForConfig
244+ t <- current_terminal
246− reserveDisplay t
245+ reserve_display t
247− (w,h) <- displayBounds t
246+ DisplayRegion w h <- display_bounds t
248− setCursorPos t 0 0
247+ set_cursor_pos t 0 0
249− let row0 = replicate (fromEnum w) 'X' ++ "\n"
248+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
250− putStr row0
249+ putStr row_0
251 forM_ [1 .. h - 2] $ \y -> do
250 forM_ [1 .. h - 2] $ \y -> do
252− setCursorPos t 0 y
251+ set_cursor_pos t 0 y
253 putStr "X"
252 putStr "X"
254 hFlush stdout
253 hFlush stdout
255− setCursorPos t (w - 1) y
254+ set_cursor_pos t (w - 1) y
256 putStr "X"
255 putStr "X"
257 hFlush stdout
256 hFlush stdout
258− setCursorPos t 0 (h - 1)
257+ set_cursor_pos t 0 (h - 1)
259− let rowH = replicate (fromEnum w - 1) 'X'
258+ let row_h = replicate (fromEnum w - 1) 'X'
260− putStr rowH
259+ putStr row_h
261 hFlush stdout
260 hFlush stdout
263− releaseDisplay t
262+ release_display t
264− releaseTerminal t
263+ release_terminal t
265 return ()
264 return ()
266− , printSummary = displayBoundsTestSummary True
265+ , print_summary = display_bounds_test_summary True
267− , confirmResults = genericOutputMatchConfirm
266+ , confirm_results = generic_output_match_confirm
270−displayBoundsTest2 = Test
269+display_bounds_test_2 = Test
271− { testName = "Verify display bounds are correct test 0: Using Image ops."
270+ { test_name = "Verify display bounds are correct test 0: Using Image ops."
272− , testID = "displayBoundsTest2"
271+ , test_ID = "display_bounds_test_2"
273− , testAction = do
272+ , test_action = do
274− t <- standardIOConfig >>= outputForConfig
273+ t <- current_terminal
275− reserveDisplay t
274+ reserve_display t
276− bounds@(w,h) <- displayBounds t
275+ bounds@(DisplayRegion w h) <- display_bounds t
277− let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
276+ let first_row = horiz_cat $ replicate (fromEnum w) (char def_attr 'X')
278− middleRows = vertCat $ replicate (fromEnum h - 2) middleRow
277+ middle_rows = vert_cat $ replicate (fromEnum h - 2) middle_row
279− middleRow = (char defAttr 'X') <|> backgroundFill (w - 2) 1 <|> (char defAttr 'X')
278+ middle_row = (char def_attr 'X') <|> background_fill (w - 2) 1 <|> (char def_attr 'X')
280− endRow = firstRow
279+ end_row = first_row
281− image = firstRow <-> middleRows <-> endRow
280+ image = first_row <-> middle_rows <-> end_row
282− pic = (picForImage image) { picCursor = Cursor (w - 1) (h - 1) }
281+ pic = (pic_for_image image) { pic_cursor = Cursor (w - 1) (h - 1) }
283− d <- displayContext t bounds
282+ d <- display_context t bounds
284− outputPicture d pic
283+ output_picture d pic
286− releaseDisplay t
285+ release_display t
287− releaseTerminal t
286+ release_terminal t
288 return ()
287 return ()
289− , printSummary = displayBoundsTestSummary True
288+ , print_summary = display_bounds_test_summary True
290− , confirmResults = genericOutputMatchConfirm
289+ , confirm_results = generic_output_match_confirm
293−displayBoundsTest3 = Test
292+display_bounds_test_3 = Test
294− { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
293+ { test_name = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295− , testID = "displayBoundsTest3"
294+ , test_ID = "display_bounds_test_3"
296− , testAction = do
295+ , test_action = do
297− t <- standardIOConfig >>= outputForConfig
296+ t <- current_terminal
298− reserveDisplay t
297+ reserve_display t
299− (w,h) <- displayBounds t
298+ DisplayRegion w h <- display_bounds t
300− hideCursor t
299+ hide_cursor t
301− setCursorPos t 0 0
300+ set_cursor_pos t 0 0
302− let row0 = replicate (fromEnum w) 'X'
301+ let row_0 = replicate (fromEnum w) 'X'
303− putStrLn row0
302+ putStrLn row_0
304 forM_ [1 .. h - 2] $ \y -> do
303 forM_ [1 .. h - 2] $ \y -> do
305− setCursorPos t 0 y
304+ set_cursor_pos t 0 y
306 putStr "X"
305 putStr "X"
307 hFlush stdout
306 hFlush stdout
308− setCursorPos t (w - 1) y
307+ set_cursor_pos t (w - 1) y
309 putStr "X"
308 putStr "X"
310 hFlush stdout
309 hFlush stdout
311− setCursorPos t 0 (h - 1)
310+ set_cursor_pos t 0 (h - 1)
312− let rowH = row0
311+ let row_h = row_0
313− putStr rowH
312+ putStr row_h
314 hFlush stdout
313 hFlush stdout
316− showCursor t
315+ show_cursor t
317− releaseDisplay t
316+ release_display t
318− releaseTerminal t
317+ release_terminal t
319 return ()
318 return ()
320− , printSummary = displayBoundsTestSummary False
319+ , print_summary = display_bounds_test_summary False
321− , confirmResults = genericOutputMatchConfirm
320+ , confirm_results = generic_output_match_confirm
324−displayBoundsTestSummary hasCursor = do
323+display_bounds_test_summary has_cursor = do
325 putStr $ [s|
324 putStr $ [s|
326Once return is pressed:
325Once return is pressed:
327 0. The screen will be cleared.
326 0. The screen will be cleared.
329− if hasCursor
328+ if has_cursor
330 then putStr " 1. The cursor will be visible."
329 then putStr " 1. The cursor will be visible."
331 else putStr " 1. The cursor will NOT be visible."
330 else putStr " 1. The cursor will NOT be visible."
332 putStr [s|
331 putStr [s|
@@ -337,7 +336,7 @@ Once return is pressed:
337 |XXXXXXXXXXXXX|
336 |XXXXXXXXXXXXX|
340− if hasCursor
339+ if has_cursor
341 then putStr $ [s|
340 then putStr $ [s|
343 |XXXXXXXXXXXXC| |]
342 |XXXXXXXXXXXXC| |]
@@ -358,13 +357,13 @@ After return is pressed for the second time:
358 1. The cursor should be visible.
357 1. The cursor should be visible.
361−genericOutputMatchConfirm = do
360+generic_output_match_confirm = do
362 putStr $ [s|
361 putStr $ [s|
363Did the test output match the description?
362Did the test output match the description?
365− defaultSuccessConfirmResults
364+ default_success_confirm_results
367−-- Explicitly define the bytes that encode each example text.
366+-- Explicitely definethe bytes that encode each example text.
368-- This avoids any issues with how the compiler represents string literals.
367-- 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
369-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -373,24 +372,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
372-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
374-- comments ;-)
373-- comments ;-)
376−-- txt0 = ↑↑↓↓←→←→BA
375+-- txt_0 = ↑↑↓↓←→←→BA
378−utf8Txt0 :: [[Word8]]
377+utf8_txt_0 :: [[Word8]]
379−utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
378+utf8_txt_0 = [ [ 0xe2 , 0x86 , 0x91 ]
380− , [ 0xe2 , 0x86 , 0x91 ]
379+ , [ 0xe2 , 0x86 , 0x91 ]
381− , [ 0xe2 , 0x86 , 0x93 ]
380+ , [ 0xe2 , 0x86 , 0x93 ]
382− , [ 0xe2 , 0x86 , 0x93 ]
381+ , [ 0xe2 , 0x86 , 0x93 ]
383− , [ 0xe2 , 0x86 , 0x90 ]
382+ , [ 0xe2 , 0x86 , 0x90 ]
384− , [ 0xe2 , 0x86 , 0x92 ]
383+ , [ 0xe2 , 0x86 , 0x92 ]
385− , [ 0xe2 , 0x86 , 0x90 ]
384+ , [ 0xe2 , 0x86 , 0x90 ]
386− , [ 0xe2 , 0x86 , 0x92 ]
385+ , [ 0xe2 , 0x86 , 0x92 ]
387− , [ 0x42 ]
386+ , [ 0x42 ]
388− , [ 0x41 ]
387+ , [ 0x41 ]
391−iso10646Txt0 :: String
390+iso_10646_txt_0 :: String
392−iso10646Txt0 = map toEnum
391+iso_10646_txt_0 = map toEnum
@@ -402,46 +401,46 @@ iso10646Txt0 = map toEnum
405−unicodeSingleWidth0 = Test
404+unicode_single_width_0 = Test
406− { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
405+ { test_name = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407− , testID = "unicodeSingleWidth0"
406+ , test_ID = "unicode_single_width_0"
408− , testAction = do
407+ , test_action = do
409− t <- standardIOConfig >>= outputForConfig
408+ t <- current_terminal
410− reserveDisplay t
409+ reserve_display t
411− hideCursor t
410+ hide_cursor t
412− withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
411+ withArrayLen (concat utf8_txt_0) (flip $ hPutBuf stdout)
413 hPutStr stdout "\n"
412 hPutStr stdout "\n"
414 hPutStr stdout "0123456789\n"
413 hPutStr stdout "0123456789\n"
415 hFlush stdout
414 hFlush stdout
417− releaseDisplay t
416+ release_display t
418− releaseTerminal t
417+ release_terminal t
419 return ()
418 return ()
420− , printSummary = unicodeSingleWidthSummary
419+ , print_summary = unicode_single_width_summary
421− , confirmResults = genericOutputMatchConfirm
420+ , confirm_results = generic_output_match_confirm
424−unicodeSingleWidth1 = Test
423+unicode_single_width_1 = Test
425− { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
424+ { test_name = "Verify terminal can display unicode single-width characters. (Image ops)"
426− , testID = "unicodeSingleWidth1"
425+ , test_ID = "unicode_single_width_1"
427− , testAction = do
426+ , test_action = do
428− t <- standardIOConfig >>= outputForConfig
427+ t <- current_terminal
429− reserveDisplay t
428+ reserve_display t
430− let pic = picForImage image
429+ let pic = pic_for_image image
431− image = line0 <-> line1
430+ image = line_0 <-> line_1
432− line0 = iso10646String defAttr iso10646Txt0
431+ line_0 = iso_10646_string def_attr iso_10646_txt_0
433− line1 = string defAttr "0123456789"
432+ line_1 = string def_attr "0123456789"
434− d <- displayBounds t >>= displayContext t
433+ d <- display_bounds t >>= display_context t
435− outputPicture d pic
434+ output_picture d pic
437− releaseDisplay t
436+ release_display t
438− releaseTerminal t
437+ release_terminal t
439 return ()
438 return ()
440− , printSummary = unicodeSingleWidthSummary
439+ , print_summary = unicode_single_width_summary
441− , confirmResults = genericOutputMatchConfirm
440+ , confirm_results = generic_output_match_confirm
444−unicodeSingleWidthSummary = putStr [s|
443+unicode_single_width_summary = putStr [s|
445Once return is pressed:
444Once return is pressed:
446 0. The screen will be cleared.
445 0. The screen will be cleared.
447 1. The cursor will be hidden.
446 1. The cursor will be hidden.
@@ -475,55 +474,55 @@ After return is pressed for the second time:
476-- The second example is a unicode string containing double-width glyphs
475-- The second example is a unicode string containing double-width glyphs
478−utf8Txt1 :: [[Word8]]
477+utf8_txt_1 :: [[Word8]]
479−utf8Txt1 = [ [0xe4,0xbd,0xa0]
478+utf8_txt_1 = [ [0xe4,0xbd,0xa0]
480− , [0xe5,0xa5,0xbd]
479+ , [0xe5,0xa5,0xbd]
481− , [0xe5,0x90,0x97]
480+ , [0xe5,0x90,0x97]
484−iso10646Txt1 :: String
483+iso_10646_txt_1 :: String
485−iso10646Txt1 = map toEnum [20320,22909,21527]
484+iso_10646_txt_1 = map toEnum [20320,22909,21527]
487−unicodeDoubleWidth0 = Test
486+unicode_double_width_0 = Test
488− { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
487+ { test_name = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489− , testID = "unicodeDoubleWidth0"
488+ , test_ID = "unicode_double_width_0"
490− , testAction = do
489+ , test_action = do
491− t <- standardIOConfig >>= outputForConfig
490+ t <- current_terminal
492− reserveDisplay t
491+ reserve_display t
493− hideCursor t
492+ hide_cursor t
494− withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
493+ withArrayLen (concat utf8_txt_1) (flip $ hPutBuf stdout)
495 hPutStr stdout "\n"
494 hPutStr stdout "\n"
496 hPutStr stdout "012345\n"
495 hPutStr stdout "012345\n"
497 hFlush stdout
496 hFlush stdout
499− releaseDisplay t
498+ release_display t
500− releaseTerminal t
499+ release_terminal t
501 return ()
500 return ()
502− , printSummary = unicodeDoubleWidthSummary
501+ , print_summary = unicode_double_width_summary
503− , confirmResults = genericOutputMatchConfirm
502+ , confirm_results = generic_output_match_confirm
506−unicodeDoubleWidth1 = Test
505+unicode_double_width_1 = Test
507− { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
506+ { test_name = "Verify terminal can display unicode double-width characters. (Image ops)"
508− , testID = "unicodeDoubleWidth1"
507+ , test_ID = "unicode_double_width_1"
509− , testAction = do
508+ , test_action = do
510− t <- standardIOConfig >>= outputForConfig
509+ t <- current_terminal
511− reserveDisplay t
510+ reserve_display t
512− let pic = picForImage image
511+ let pic = pic_for_image image
513− image = line0 <-> line1
512+ image = line_0 <-> line_1
514− line0 = iso10646String defAttr iso10646Txt1
513+ line_0 = iso_10646_string def_attr iso_10646_txt_1
515− line1 = string defAttr "012345"
514+ line_1 = string def_attr "012345"
516− d <- displayBounds t >>= displayContext t
515+ d <- display_bounds t >>= display_context t
517− outputPicture d pic
516+ output_picture d pic
519− releaseDisplay t
518+ release_display t
520− releaseTerminal t
519+ release_terminal t
521 return ()
520 return ()
522− , printSummary = unicodeDoubleWidthSummary
521+ , print_summary = unicode_double_width_summary
523− , confirmResults = genericOutputMatchConfirm
522+ , confirm_results = generic_output_match_confirm
526−unicodeDoubleWidthSummary = putStr [s|
525+unicode_double_width_summary = putStr [s|
527Once return is pressed:
526Once return is pressed:
528 0. The screen will be cleared.
527 0. The screen will be cleared.
529 1. The cursor will be hidden.
528 1. The cursor will be hidden.
@@ -550,32 +549,32 @@ After return is pressed for the second time:
550 1. The cursor should be visible.
549 1. The cursor should be visible.
553−allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
552+all_colors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554− [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
553+ [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
556−allBrightColors
555+all_bright_colors
557− = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
556+ = 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" ]
557 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
560−attributesTest0 = Test
559+attributes_test_0 = Test
561− { testName = "Character attributes: foreground colors."
560+ { test_name = "Character attributes: foreground colors."
562− , testID = "attributesTest0"
561+ , test_ID = "attributes_test_0"
563− , testAction = do
562+ , test_action = do
564− t <- standardIOConfig >>= outputForConfig
563+ t <- current_terminal
565− reserveDisplay t
564+ reserve_display t
566− let pic = picForImage image
565+ let pic = pic_for_image image
567− image = border <|> column0 <|> border <|> column1 <|> border
566+ image = border <|> column_0 <|> border <|> column_1 <|> border
568− column0 = vertCat $ map lineWithColor allColors
567+ column_0 = vert_cat $ map line_with_color all_colors
569− border = vertCat $ replicate (length allColors) $ string defAttr " | "
568+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
570− column1 = vertCat $ map (string defAttr . snd) allColors
569+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
571− lineWithColor (c, cName) = string (defAttr `withForeColor` c) cName
570+ line_with_color (c, c_name) = string (def_attr `with_fore_color` c) c_name
572− d <- displayBounds t >>= displayContext t
571+ d <- display_bounds t >>= display_context t
573− outputPicture d pic
572+ output_picture d pic
575− releaseDisplay t
574+ release_display t
576− releaseTerminal t
575+ release_terminal t
577 return ()
576 return ()
578− , printSummary = do
577+ , print_summary = do
579 putStr $ [s|
578 putStr $ [s|
580Once return is pressed:
579Once return is pressed:
581 0. The screen will be cleared.
580 0. The screen will be cleared.
@@ -596,32 +595,32 @@ After return is pressed for the second time:
596 0. The screen containing the test summary should be restored.
595 0. The screen containing the test summary should be restored.
597 1. The cursor should be visible.
596 1. The cursor should be visible.
599− , confirmResults = do
598+ , confirm_results = do
600 putStr $ [s|
599 putStr $ [s|
601Did the test output match the description?
600Did the test output match the description?
603− defaultSuccessConfirmResults
602+ default_success_confirm_results
606−attributesTest1 = Test
605+attributes_test_1 = Test
607− { testName = "Character attributes: background colors."
606+ { test_name = "Character attributes: background colors."
608− , testID = "attributesTest1"
607+ , test_ID = "attributes_test_1"
609− , testAction = do
608+ , test_action = do
610− t <- standardIOConfig >>= outputForConfig
609+ t <- current_terminal
611− reserveDisplay t
610+ reserve_display t
612− let pic = picForImage image
611+ let pic = pic_for_image image
613− image = border <|> column0 <|> border <|> column1 <|> border
612+ image = border <|> column_0 <|> border <|> column_1 <|> border
614− column0 = vertCat $ map lineWithColor allColors
613+ column_0 = vert_cat $ map line_with_color all_colors
615− border = vertCat $ replicate (length allColors) $ string defAttr " | "
614+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
616− column1 = vertCat $ map (string defAttr . snd) allColors
615+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
617− lineWithColor (c, cName) = string (defAttr `withBackColor` c) cName
616+ line_with_color (c, c_name) = string (def_attr `with_back_color` c) c_name
618− d <- displayBounds t >>= displayContext t
617+ d <- display_bounds t >>= display_context t
619− outputPicture d pic
618+ output_picture d pic
621− releaseDisplay t
620+ release_display t
622− releaseTerminal t
621+ release_terminal t
623 return ()
622 return ()
624− , printSummary = do
623+ , print_summary = do
625 putStr $ [s|
624 putStr $ [s|
626Once return is pressed:
625Once return is pressed:
627 0. The screen will be cleared.
626 0. The screen will be cleared.
@@ -651,57 +650,57 @@ After return is pressed for the second time:
651 0. The screen containing the test summary should be restored.
650 0. The screen containing the test summary should be restored.
652 1. The cursor should be visible.
651 1. The cursor should be visible.
654− , confirmResults = do
653+ , confirm_results = do
655 putStr $ [s|
654 putStr $ [s|
656Did the test output match the description?
655Did the test output match the description?
658− defaultSuccessConfirmResults
657+ default_success_confirm_results
661−attributesTest2 = Test
660+attributes_test_2 = Test
662− { testName = "Character attributes: Vivid foreground colors."
661+ { test_name = "Character attributes: Vivid foreground colors."
663− , testID = "attributesTest2"
662+ , test_ID = "attributes_test_2"
664− , testAction = do
663+ , test_action = do
665− t <- standardIOConfig >>= outputForConfig
664+ t <- current_terminal
666− reserveDisplay t
665+ reserve_display t
667− let pic = picForImage image
666+ let pic = pic_for_image image
668− image = horizCat [border, column0, border, column1, border, column2, border]
667+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
669− border = vertCat $ replicate (length allColors) $ string defAttr " | "
668+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
670− column0 = vertCat $ map lineWithColor0 allColors
669+ column_0 = vert_cat $ map line_with_color_0 all_colors
671− column1 = vertCat $ map lineWithColor1 allBrightColors
670+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
672− column2 = vertCat $ map (string defAttr . snd) allColors
671+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
673− lineWithColor0 (c, cName) = string (defAttr `withForeColor` c) cName
672+ 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
673+ line_with_color_1 (c, c_name) = string (def_attr `with_fore_color` c) c_name
675− d <- displayBounds t >>= displayContext t
674+ d <- display_bounds t >>= display_context t
676− outputPicture d pic
675+ output_picture d pic
678− releaseDisplay t
677+ release_display t
679− releaseTerminal t
678+ release_terminal t
680 return ()
679 return ()
681− , printSummary = do
680+ , print_summary = do
682 putStr $ [s|
681 putStr $ [s|
683Once return is pressed:
682Once return is pressed:
684 0. The screen will be cleared.
683 0. The screen will be cleared.
685 1. The cursor will be hidden.
684 1. The cursor will be hidden.
686 2. 9 lines of text in three columns will be drawn:
685 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
686 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.
687+ 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
688 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
689 with that color as the foreground color but the shade used should be
691− more vivid than the shade used in the first column.
690+ 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
691 c. The final column will be the name of a color rendered with the
693 default attributes.
692 default attributes.
695For instance, one line will be the word "magenta" and that word should be
694For instance, one line will be the word "magenta" and that word should be
696−rendered in the magenta color.
695+rendered in the magenta color.
698I'm not actually sure exactly what "vivid" means in this context. For xterm the
697I'm not actually sure exactly what "vivid" means in this context. For xterm the
699−vivid colors are brighter.
698+vivid colors are brighter.
702 * The first column: The foreground color matches the named color.
701 * The first column: The foreground color matches the named color.
703 * The second column: The foreground color matches the named color but is
702 * The second column: The foreground color matches the named color but is
704− more vivid than the color used in the first column.
703+ more vivid than the color used in the first column.
705 * The third column: All text is rendered with the default attributes.
704 * 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
705 * The vertical bars used in each line to mark the border of a column are
707 lined up.
706 lined up.
@@ -710,34 +709,34 @@ After return is pressed for the second time:
710 0. The screen containing the test summary should be restored.
709 0. The screen containing the test summary should be restored.
711 1. The cursor should be visible.
710 1. The cursor should be visible.
713− , confirmResults = do
712+ , confirm_results = do
714 putStr $ [s|
713 putStr $ [s|
715Did the test output match the description?
714Did the test output match the description?
717− defaultSuccessConfirmResults
716+ default_success_confirm_results
720−attributesTest3 = Test
719+attributes_test_3 = Test
721− { testName = "Character attributes: Vivid background colors."
720+ { test_name = "Character attributes: Vivid background colors."
722− , testID = "attributesTest3"
721+ , test_ID = "attributes_test_3"
723− , testAction = do
722+ , test_action = do
724− t <- standardIOConfig >>= outputForConfig
723+ t <- current_terminal
725− reserveDisplay t
724+ reserve_display t
726− let pic = picForImage image
725+ let pic = pic_for_image image
727− image = horizCat [border, column0, border, column1, border, column2, border]
726+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
728− border = vertCat $ replicate (length allColors) $ string defAttr " | "
727+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
729− column0 = vertCat $ map lineWithColor0 allColors
728+ column_0 = vert_cat $ map line_with_color_0 all_colors
730− column1 = vertCat $ map lineWithColor1 allBrightColors
729+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
731− column2 = vertCat $ map (string defAttr . snd) allColors
730+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
732− lineWithColor0 (c, cName) = string (defAttr `withBackColor` c) cName
731+ 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
732+ line_with_color_1 (c, c_name) = string (def_attr `with_back_color` c) c_name
734− d <- displayBounds t >>= displayContext t
733+ d <- display_bounds t >>= display_context t
735− outputPicture d pic
734+ output_picture d pic
737− releaseDisplay t
736+ release_display t
738− releaseTerminal t
737+ release_terminal t
739 return ()
738 return ()
740− , printSummary = do
739+ , print_summary = do
741 putStr $ [s|
740 putStr $ [s|
742Once return is pressed:
741Once return is pressed:
743 0. The screen will be cleared.
742 0. The screen will be cleared.
@@ -745,23 +744,23 @@ Once return is pressed:
745 2. 9 lines of text in three columns will be drawn:
744 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
745 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
746 color terminal rendered with the default foreground color with a
748− background the named color.
747+ background the named color.
749 b. The first column will contain be a name of a standard color for an 8
748 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
749 color terminal rendered with the default foreground color with the
751− background a vivid version of the named color.
750+ background a vivid version of the named color.
752 c. The third column will be the name of a standard color rendered with
751 c. The third column will be the name of a standard color rendered with
753 the default attributes.
752 the default attributes.
755For instance, one line will contain be the word "magenta" and the word should
754For 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.
755+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
757I'm not actually sure exactly what "vivid" means in this context. For xterm the
759vivid colors are brighter.
758vivid colors are brighter.
762 * The first column: The background color matches the named color.
761 * The first column: The background color matches the named color.
763 * The second column: The background color matches the named color and is
762 * The second column: The background color matches the named color and is
764− more vivid than the color used in the first column.
763+ more vivid than the color used in the first column.
765 * The third column column: All text is rendered with the default attributes.
764 * 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
765 * The vertical bars used in each line to mark the border of a column are
767 lined up.
766 lined up.
@@ -777,51 +776,51 @@ After return is pressed for the second time:
777 0. The screen containing the test summary should be restored.
776 0. The screen containing the test summary should be restored.
778 1. The cursor should be visible.
777 1. The cursor should be visible.
780− , confirmResults = do
779+ , confirm_results = do
781 putStr $ [s|
780 putStr $ [s|
782Did the test output match the description?
781Did the test output match the description?
784− defaultSuccessConfirmResults
783+ default_success_confirm_results
787−attrCombos =
786+attr_combos =
788 [ ( "default", id )
787 [ ( "default", id )
789− , ( "bold", flip withStyle bold )
788+ , ( "bold", flip with_style bold )
790− , ( "blink", flip withStyle blink )
789+ , ( "blink", flip with_style blink )
791− , ( "underline", flip withStyle underline )
790+ , ( "underline", flip with_style underline )
792− , ( "bold + blink", flip withStyle (bold + blink) )
791+ , ( "bold + blink", flip with_style (bold + blink) )
793− , ( "bold + underline", flip withStyle (bold + underline) )
792+ , ( "bold + underline", flip with_style (bold + underline) )
794− , ( "underline + blink", flip withStyle (underline + blink) )
793+ , ( "underline + blink", flip with_style (underline + blink) )
795− , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
794+ , ( "bold + blink + underline", flip with_style (bold + blink + underline) )
798−attributesTest4 = Test
797+attributes_test_4 = Test
799− { testName = "Character attributes: Bold; Blink; Underline."
798+ { test_name = "Character attributes: Bold; Blink; Underline."
800− , testID = "attributesTest4"
799+ , test_ID = "attributes_test_4"
801− , testAction = do
800+ , test_action = do
802− t <- standardIOConfig >>= outputForConfig
801+ t <- current_terminal
803− reserveDisplay t
802+ reserve_display t
804− let pic = picForImage image
803+ let pic = pic_for_image image
805− image = horizCat [border, column0, border, column1, border]
804+ image = horiz_cat [border, column_0, border, column_1, border]
806− border = vertCat $ replicate (length attrCombos) $ string defAttr " | "
805+ border = vert_cat $ replicate (length attr_combos) $ string def_attr " | "
807− column0 = vertCat $ map lineWithAttrs attrCombos
806+ column_0 = vert_cat $ map line_with_attrs attr_combos
808− column1 = vertCat $ map (string defAttr . fst) attrCombos
807+ column_1 = vert_cat $ map (string def_attr . fst) attr_combos
809− lineWithAttrs (desc, attrF) = string (attrF defAttr) desc
808+ line_with_attrs (desc, attr_f) = string (attr_f def_attr) desc
810− d <- displayBounds t >>= displayContext t
809+ d <- display_bounds t >>= display_context t
811− outputPicture d pic
810+ output_picture d pic
813− releaseDisplay t
812+ release_display t
814− releaseTerminal t
813+ release_terminal t
815 return ()
814 return ()
816− , printSummary = do
815+ , print_summary = do
817 putStr $ [s|
816 putStr $ [s|
818Once return is pressed:
817Once return is pressed:
819 0. The screen will be cleared.
818 0. The screen will be cleared.
820 1. The cursor will be hidden.
819 1. The cursor will be hidden.
821− 2. 8 rows of text in two columns.
820+ 2. 8 rows of text in two columns.
822 The rows will contain the following text:
821 The rows will contain the following text:
826 underline
825 underline
827 bold + blink
826 bold + blink
@@ -830,8 +829,8 @@ Once return is pressed:
830 bold + blink + underline
829 bold + blink + underline
831 The first column will be rendered with the described attributes. The second
830 The first column will be rendered with the described attributes. The second
832 column will be rendered with the default attributes.
831 column will be rendered with the default attributes.
835 * The vertical bars used in each line to mark the border of a column are
834 * The vertical bars used in each line to mark the border of a column are
836 lined up.
835 lined up.
837 * The text in the first column is rendered as described.
836 * The text in the first column is rendered as described.
@@ -840,31 +839,31 @@ After return is pressed for the second time:
840 0. The screen containing the test summary should be restored.
839 0. The screen containing the test summary should be restored.
841 1. The cursor should be visible.
840 1. The cursor should be visible.
843− , confirmResults = do
842+ , confirm_results = do
844 putStr $ [s|
843 putStr $ [s|
845Did the test output match the description?
844Did the test output match the description?
847− defaultSuccessConfirmResults
846+ default_success_confirm_results
850−attributesTest5 = Test
849+attributes_test_5 = Test
851− { testName = "Character attributes: 240 color palette"
850+ { test_name = "Character attributes: 240 color palette"
852− , testID = "attributesTest5"
851+ , test_ID = "attributes_test_5"
853− , testAction = do
852+ , test_action = do
854− t <- standardIOConfig >>= outputForConfig
853+ t <- current_terminal
855− reserveDisplay t
854+ reserve_display t
856− let pic = picForImage image
855+ let pic = pic_for_image image
857− image = vertCat $ map horizCat $ splitColorImages colorImages
856+ image = vert_cat $ map horiz_cat $ split_color_images color_images
858− colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
857+ color_images = map (\i -> string (current_attr `with_back_color` Color240 i) " ") [0..239]
859− splitColorImages [] = []
858+ split_color_images [] = []
860− splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
859+ split_color_images is = (take 20 is ++ [string def_attr " "]) : (split_color_images (drop 20 is))
861− d <- displayBounds t >>= displayContext t
860+ d <- display_bounds t >>= display_context t
862− outputPicture d pic
861+ output_picture d pic
864− releaseDisplay t
863+ release_display t
865− releaseTerminal t
864+ release_terminal t
866 return ()
865 return ()
867− , printSummary = do
866+ , print_summary = do
868 putStr $ [s|
867 putStr $ [s|
869Once return is pressed:
868Once return is pressed:
870 0. The screen will be cleared.
869 0. The screen will be cleared.
@@ -872,304 +871,239 @@ Once return is pressed:
872 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
871 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...
872 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:
876After return is pressed for the second time:
878 0. The screen containing the test summary should be restored.
877 0. The screen containing the test summary should be restored.
879 1. The cursor should be visible.
878 1. The cursor should be visible.
881− , confirmResults = do
880+ , confirm_results = do
882 putStr $ [s|
881 putStr $ [s|
883Did the test output match the description?
882Did the test output match the description?
885− defaultSuccessConfirmResults
884+ default_success_confirm_results
888−inlineTest0 = Test
887+inline_test_0 = Test
889− { testName = "Verify styled output can be performed without clearing the screen."
888+ { test_name = "Verify styled output can be performed without clearing the screen."
890− , testID = "inlineTest0"
889+ , test_ID = "inline_test_0"
891− , testAction = do
890+ , test_action = do
892 putStrLn "line 1."
891 putStrLn "line 1."
893− putAttrChange_ $ backColor red >> applyStyle underline
892+ put_attr_change_ $ back_color red >> apply_style underline
894 putStrLn "line 2."
893 putStrLn "line 2."
895− putAttrChange_ $ defaultAll
894+ put_attr_change_ $ default_all
896 putStrLn "line 3."
895 putStrLn "line 3."
897− , printSummary = putStr $ [s|
896+ , print_summary = putStr $ [s|
898lines are in order.
897lines are in order.
899The second line "line 2" should have a red background and the text underline.
898The 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.
899The third line "line 3" should be drawn in the same style as the first line.
903− , confirmResults = genericOutputMatchConfirm
902+ , confirm_results = generic_output_match_confirm
906−inlineTest1 = Test
905+inline_test_1 = Test
907− { testName = "Verify styled output can be performed without clearing the screen."
906+ { test_name = "Verify styled output can be performed without clearing the screen."
908− , testID = "inlineTest1"
907+ , test_ID = "inline_test_1"
909− , testAction = do
908+ , test_action = do
910 putStr "Not styled. "
909 putStr "Not styled. "
911− putAttrChange_ $ backColor red >> applyStyle underline
910+ put_attr_change_ $ back_color red >> apply_style underline
912 putStr " Styled! "
911 putStr " Styled! "
913− putAttrChange_ $ defaultAll
912+ put_attr_change_ $ default_all
914 putStrLn "Not styled."
913 putStrLn "Not styled."
915− , printSummary = putStr $ [s|
914+ , print_summary = putStr $ [s|
918− , confirmResults = genericOutputMatchConfirm
917+ , confirm_results = generic_output_match_confirm
921−inlineTest2 = Test
920+inline_test_2 = Test
922− { testName = "Verify styled output can be performed without clearing the screen."
921+ { test_name = "Verify styled output can be performed without clearing the screen."
923− , testID = "inlineTest1"
922+ , test_ID = "inline_test_1"
924− , testAction = do
923+ , test_action = do
925 putStr "Not styled. "
924 putStr "Not styled. "
926− putAttrChange_ $ backColor red >> applyStyle underline
925+ put_attr_change_ $ back_color red >> apply_style underline
927 putStr " Styled! "
926 putStr " Styled! "
928− putAttrChange_ $ defaultAll
927+ put_attr_change_ $ default_all
929 putStr "Not styled.\n"
928 putStr "Not styled.\n"
930− , printSummary = putStr $ [s|
929+ , print_summary = putStr $ [s|
932− , confirmResults = genericOutputMatchConfirm
931+ , confirm_results = generic_output_match_confirm
935−cursorHideTest0 :: Test
934+cursor_hide_test_0 :: Test
936−cursorHideTest0 = Test
935+cursor_hide_test_0 = Test
937− { testName = "Verify the cursor is hid and re-shown. issue #7"
936+ { test_name = "Verify the cursor is hid and re-shown. issue #7"
938− , testID = "cursorHideTest0"
937+ , test_ID = "cursor_hide_test_0"
939− , testAction = do
938+ , test_action = do
940− vty <- mkVty defaultConfig
939+ vty <- mkVty
941− showCursor $ outputIface vty
940+ show_cursor $ terminal vty
942− setCursorPos (outputIface vty) 5 5
941+ set_cursor_pos (terminal vty) 5 5
943− nextEvent vty
942+ next_event vty
944− hideCursor $ outputIface vty
943+ hide_cursor $ terminal vty
945− nextEvent vty
944+ next_event vty
946 shutdown vty
945 shutdown vty
947 return ()
946 return ()
948− , printSummary = putStr $ [s|
947+ , print_summary = putStr $ [s|
949 1. verify the cursor is displayed.
948 1. verify the cursor is displayed.
950 2. press enter
949 2. press enter
951 3. verify the cursor is hid.
950 3. verify the cursor is hid.
952 4. press enter.
951 4. press enter.
953 5. the display should return to the state before the test.
952 5. the display should return to the state before the test.
955− , confirmResults = genericOutputMatchConfirm
954+ , confirm_results = generic_output_match_confirm
958−outputImageAndWait :: Image -> IO ()
957+output_image_and_wait :: Image -> IO ()
959−outputImageAndWait image = do
958+output_image_and_wait image = do
959+ t <- current_terminal
960− let pic = picForImage image
961+ let pic = pic_for_image image
961− outputPicAndWait pic
962+ d <- display_bounds t >>= display_context t
962−
963+ output_picture d pic
963−outputPicAndWait :: Picture -> IO ()
964−outputPicAndWait pic = do
965− t <- standardIOConfig >>= outputForConfig
967− d <- displayBounds t >>= displayContext t
970− releaseDisplay t
965+ release_display t
971− releaseTerminal t
966+ release_terminal t
972 return ()
967 return ()
974−vertCropTest0 :: Test
969+vert_crop_test_0 :: Test
975−vertCropTest0 = Test
970+vert_crop_test_0 = Test
976− { testName = "Verify bottom cropping works as expected with single column chars"
971+ { test_name = "Verify bottom cropping works as expected with single column chars"
977− , testID = "cropTest0"
972+ , test_ID = "crop_test_0"
978− , testAction = do
973+ , test_action = do
979− let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsum
974+ let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum
980− block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsum
975+ block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum
981− image = block0 <-> backgroundFill 10 2 <-> block1
976+ image = block_0 <-> background_fill 10 2 <-> block_1
982− outputImageAndWait image
977+ output_image_and_wait image
983− , printSummary = putStr $ [s|
978+ , print_summary = putStr $ [s|
984 1. Verify the two text blocks are identical.
979 1. Verify the two text blocks are identical.
985 2. press enter.
980 2. press enter.
986 3. the display should return to the state before the test.
981 3. the display should return to the state before the test.
988− , confirmResults = genericOutputMatchConfirm
983+ , confirm_results = generic_output_match_confirm
991−vertCropTest1 :: Test
986+vert_crop_test_1 :: Test
992−vertCropTest1 = Test
987+vert_crop_test_1 = Test
993− { testName = "Verify bottom cropping works as expected with double column chars"
988+ { test_name = "Verify bottom cropping works as expected with double column chars"
994− , testID = "cropTest0"
989+ , test_ID = "crop_test_0"
995− , testAction = do
990+ , test_action = do
996− let block0 = cropBottom 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
991+ let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum_chinese
997− block1 = vertCat $ map (string defAttr) $ take 2 lorumIpsumChinese
992+ block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum_chinese
998− image = block0 <-> backgroundFill 10 2 <-> block1
993+ image = block_0 <-> background_fill 10 2 <-> block_1
999− outputImageAndWait image
994+ output_image_and_wait image
1000− , printSummary = putStr $ [s|
995+ , print_summary = putStr $ [s|
1001 1. Verify the two text blocks are identical.
996 1. Verify the two text blocks are identical.
1002 2. press enter.
997 2. press enter.
1003 3. the display should return to the state before the test.
998 3. the display should return to the state before the test.
1005− , confirmResults = genericOutputMatchConfirm
1000+ , confirm_results = generic_output_match_confirm
1008−vertCropTest2 :: Test
1003+vert_crop_test_2 :: Test
1009−vertCropTest2 = Test
1004+vert_crop_test_2 = Test
1010− { testName = "Verify top cropping works as expected with single column chars"
1005+ { test_name = "Verify top cropping works as expected with single column chars"
1011− , testID = "cropTest2"
1006+ , test_ID = "crop_test_0"
1012− , testAction = do
1007+ , test_action = do
1013− let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsum
1008+ 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
1009+ block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum - 2) lorum_ipsum
1015− image = block0 <-> backgroundFill 10 2 <-> block1
1010+ image = block_0 <-> background_fill 10 2 <-> block_1
1016− outputImageAndWait image
1011+ output_image_and_wait image
1017− , printSummary = putStr $ [s|
1012+ , print_summary = putStr $ [s|
1018 1. Verify the two text blocks are identical.
1013 1. Verify the two text blocks are identical.
1019 2. press enter.
1014 2. press enter.
1020 3. the display should return to the state before the test.
1015 3. the display should return to the state before the test.
1022− , confirmResults = genericOutputMatchConfirm
1017+ , confirm_results = generic_output_match_confirm
1025−vertCropTest3 :: Test
1020+vert_crop_test_3 :: Test
1026−vertCropTest3 = Test
1021+vert_crop_test_3 = Test
1027− { testName = "Verify top cropping works as expected with double column chars"
1022+ { test_name = "Verify top cropping works as expected with double column chars"
1028− , testID = "cropTest0"
1023+ , test_ID = "crop_test_0"
1029− , testAction = do
1024+ , test_action = do
1030− let block0 = cropTop 2 $ vertCat $ map (string defAttr) lorumIpsumChinese
1025+ 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
1026+ block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum_chinese - 2 ) lorum_ipsum_chinese
1032− image = block0 <-> backgroundFill 10 2 <-> block1
1027+ image = block_0 <-> background_fill 10 2 <-> block_1
1033− outputImageAndWait image
1028+ output_image_and_wait image
1034− , printSummary = putStr $ [s|
1029+ , print_summary = putStr $ [s|
1035 1. Verify the two text blocks are identical.
1030 1. Verify the two text blocks are identical.
1036 2. press enter.
1031 2. press enter.
1037 3. the display should return to the state before the test.
1032 3. the display should return to the state before the test.
1039− , confirmResults = genericOutputMatchConfirm
1034+ , confirm_results = generic_output_match_confirm
1042−horizCropTest0 :: Test
1037+horiz_crop_test_0 :: Test
1043−horizCropTest0 = Test
1038+horiz_crop_test_0 = Test
1044− { testName = "Verify right cropping works as expected with single column chars"
1039+ { test_name = "Verify right cropping works as expected with single column chars"
1045− , testID = "cropTest0"
1040+ , test_ID = "crop_test_0"
1046− , testAction = do
1041+ , test_action = do
1047− let baseImage = vertCat $ map (string defAttr) lorumIpsum
1042+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum
1048− croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1043+ cropped_image = crop_right (image_width base_image `div` 2) base_image
1049− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1044+ image = base_image <-> background_fill 10 2 <-> cropped_image
1050− outputImageAndWait image
1045+ output_image_and_wait image
1051− , printSummary = putStr $ [s|
1046+ , print_summary = putStr $ [s|
1052 1. Verify the bottom text block is about half the width of the top text block.
1047 1. Verify the bottom text block is about half the width of the top text block.
1053 2. press enter.
1048 2. press enter.
1054 3. the display should return to the state before the test.
1049 3. the display should return to the state before the test.
1056− , confirmResults = genericOutputMatchConfirm
1051+ , confirm_results = generic_output_match_confirm
1059−horizCropTest1 :: Test
1054+horiz_crop_test_1 :: Test
1060−horizCropTest1 = Test
1055+horiz_crop_test_1 = Test
1061− { testName = "Verify right cropping works as expected with double column chars"
1056+ { test_name = "Verify right cropping works as expected with double column chars"
1062− , testID = "cropTest0"
1057+ , test_ID = "crop_test_0"
1063− , testAction = do
1058+ , test_action = do
1064− let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1059+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1065− croppedImage = cropRight (imageWidth baseImage `div` 2) baseImage
1060+ cropped_image = crop_right (image_width base_image `div` 2) base_image
1066− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1061+ image = base_image <-> background_fill 10 2 <-> cropped_image
1067− outputImageAndWait image
1062+ output_image_and_wait image
1068− , printSummary = putStr $ [s|
1063+ , print_summary = putStr $ [s|
1069 1. Verify the bottom text block is the left half of the top block. Ellipses on the right edge are OK.
1064 1. Verify the bottom text block is the left half of the top block. Ellipses on the right edge are OK.
1070 2. press enter.
1065 2. press enter.
1071 3. the display should return to the state before the test.
1066 3. the display should return to the state before the test.
1073− , confirmResults = genericOutputMatchConfirm
1068+ , confirm_results = generic_output_match_confirm
1076−horizCropTest2 :: Test
1071+horiz_crop_test_2 :: Test
1077−horizCropTest2 = Test
1072+horiz_crop_test_2 = Test
1078− { testName = "Verify left cropping works as expected with single column chars"
1073+ { test_name = "Verify left cropping works as expected with single column chars"
1079− , testID = "cropTest0"
1074+ , test_ID = "crop_test_0"
1080− , testAction = do
1075+ , test_action = do
1081− let baseImage = vertCat $ map (string defAttr) lorumIpsum
1076+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum
1082− croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1077+ cropped_image = crop_left (image_width base_image `div` 2) base_image
1083− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1078+ image = base_image <-> background_fill 10 2 <-> cropped_image
1084− outputImageAndWait image
1079+ output_image_and_wait image
1085− , printSummary = putStr $ [s|
1080+ , print_summary = putStr $ [s|
1086 1. Verify the bottom text block is the right half of the top text block.
1081 1. Verify the bottom text block is the right half of the top text block.
1087 2. press enter.
1082 2. press enter.
1088 3. the display should return to the state before the test.
1083 3. the display should return to the state before the test.
1090− , confirmResults = genericOutputMatchConfirm
1085+ , confirm_results = generic_output_match_confirm
1093−horizCropTest3 :: Test
1088+horiz_crop_test_3 :: Test
1094−horizCropTest3 = Test
1089+horiz_crop_test_3 = Test
1095− { testName = "Verify right cropping works as expected with double column chars"
1090+ { test_name = "Verify right cropping works as expected with double column chars"
1096− , testID = "cropTest0"
1091+ , test_ID = "crop_test_0"
1097− , testAction = do
1092+ , test_action = do
1098− let baseImage = vertCat $ map (string defAttr) lorumIpsumChinese
1093+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1099− croppedImage = cropLeft (imageWidth baseImage `div` 2) baseImage
1094+ cropped_image = crop_left (image_width base_image `div` 2) base_image
1100− image = baseImage <-> backgroundFill 10 2 <-> croppedImage
1095+ image = base_image <-> background_fill 10 2 <-> cropped_image
1101− outputImageAndWait image
1096+ output_image_and_wait image
1102− , printSummary = putStr $ [s|
1097+ , print_summary = putStr $ [s|
1103 1. Verify the bottom text block is the right half of the top block. Ellipses on the left edge are OK.
1098 1. Verify the bottom text block is the right half of the top block. Ellipses on the left edge are OK.
1104 2. press enter.
1099 2. press enter.
1105 3. the display should return to the state before the test.
1100 3. the display should return to the state before the test.
1107− , confirmResults = genericOutputMatchConfirm
1102+ , confirm_results = generic_output_match_confirm
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 ()
1105+lorum_ipsum :: [String]
1147−cheesyAnim0 i background = do
1106+lorum_ipsum = lines [s|
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,
1107Sed 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
1108totam 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,
1109dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
@@ -1181,8 +1115,8 @@ 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?
1115molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
1184−lorumIpsumChinese :: [String]
1118+lorum_ipsum_chinese :: [String]
1185−lorumIpsumChinese = lines [s|
1119+lorum_ipsum_chinese = lines [s|
1186輐銛 螷蟞覮 裌覅詵 暕 鴅噮 槶 惝掭掝 婸媥媕 耏胠臿, 汫汭沎 忕汌卣 蚡袀 僣 蒮 瀁瀎瀊 渮湸湤 緌翢,
1120輐銛 螷蟞覮 裌覅詵 暕 鴅噮 槶 惝掭掝 婸媥媕 耏胠臿, 汫汭沎 忕汌卣 蚡袀 僣 蒮 瀁瀎瀊 渮湸湤 緌翢,
1187腠腶舝 糲蘥蠩 樏殣氀 蒮 蹢鎒 滍 鸄齴 櫧櫋瀩 鬄鵊鵙 莃荶衒, 毸溠 橀 簎艜薤 莃荶衒 翣聜蒢
1121腠腶舝 糲蘥蠩 樏殣氀 蒮 蹢鎒 滍 鸄齴 櫧櫋瀩 鬄鵊鵙 莃荶衒, 毸溠 橀 簎艜薤 莃荶衒 翣聜蒢
1188斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 bacon 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣
1122斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 bacon 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣