@@ -2,49 +2,48 @@
2{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3module Main where
3module Main where
6import Graphics.Vty.Attributes
5import Graphics.Vty.Attributes
7−import Graphics.Vty.Inline
6+import Graphics.Vty.AttributeChange
7+import Graphics.Vty.Image
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)
12−import Control.Exception
13import Control.Monad
12import Control.Monad
15import Data.List ( lookup )
14import Data.List ( lookup )
16import Data.Maybe ( isJust, fromJust )
15import Data.Maybe ( isJust, fromJust )
17import Data.Monoid
16import Data.Monoid
19import Data.Word
17import Data.Word
21−import Foreign.Marshal.Array
19+import Foreign.Marshal.Array
23import qualified System.Environment as Env
22import qualified System.Environment as Env
25import System.IO ( hFlush, hPutStr, hPutBuf, stdout )
24import System.IO ( hFlush, hPutStr, hPutBuf, stdout )
28− printIntro
27+ print_intro
30−outputFilePath = "test_results.list"
29+output_file_path = "test_results.list"
32−printIntro = do
31+print_intro = do
33− putStr $ [s|
32+ putStr $ [$heredoc|
34This is an interactive verification program for the terminal input and output
33This 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
34support of the VTY library. This will ask a series of questions about what you
36−see on screen. The goal is to verify that VTY's output and input support
35+see onscreen. The goal is to verify that VTY's output and input support
37performs as expected with your terminal.
36performs as expected with your terminal.
39This program produces a file named
38This program produces a file named
40− |] ++ outputFilePath ++ [s|
39+ |] ++ output_file_path ++ [$heredoc|
41in the current directory that contains the results for each test assertion. This
40in 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
41can 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.
42support for your terminal. No personal information is contained in the report.
45Each test follows, more or less, the following format:
44Each test follows, more or less, the following format:
46 0. A description of the test is printed which will include a detailed
45 0. A description of the test is printed which will include a detailed
47− description of what VTY is going to try and what the expected results are.
46+ description of what VTY is going to try and what the expected results are.
48 Press return to move on.
47 Press return to move on.
49 1. The program will produce some output or ask for you to press a key.
48 1. The program will produce some output or ask for you to press a key.
50 2. You will then be asked to confirm if the behavior matched the provided
49 2. You will then be asked to confirm if the behavior matched the provided
@@ -64,42 +63,32 @@ All the tests assume the following about the terminal display:
64 describes the expected appearance of each glyph.
63 describes the expected appearance of each glyph.
66Thanks for the help! :-D
65Thanks for the help! :-D
67−To exit the test early enter "q" anytime at the following menu screen.
69−If any test fails then please post an issue to
70− https://github.com/coreyoconnor/vty/issues
71−with the test_results.list file pasted into the issue. A suitable summary is:
72−"interactive terminal test failure".
74− waitForReturn
67+ wait_for_return
75− results <- doTestMenu 1
68+ results <- do_test_menu 1
76− envAttributes <- mapM ( \envName -> Control.Exception.catch ( Env.getEnv envName >>= return . (,) envName )
69+ env_attributes <- mapM ( \env_name -> catch ( Env.getEnv env_name >>= return . (,) env_name )
77− ( \ (_ :: SomeException) -> return (envName, "") )
70+ ( const $ return (env_name, "") )
79− [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
72+ [ "TERM", "COLORTERM", "LANG" ]
80− t <- standardIOConfig >>= outputForConfig
81− let resultsTxt = show envAttributes ++ "\n"
82− ++ terminalID t ++ "\n"
83− ++ show results ++ "\n"
73+ let results_txt = show env_attributes ++ "\n" ++ show results ++ "\n"
84− releaseTerminal t
74+ writeFile output_file_path results_txt
85− writeFile outputFilePath resultsTxt
75+
86−
76+wait_for_return = do
88 putStr "\n(press return to continue)"
77 putStr "\n(press return to continue)"
89 hFlush stdout
78 hFlush stdout
92−testMenu :: [(String, Test)]
81+test_menu :: [(String, Test)]
93−testMenu = zip (map show [1..]) allTests
82+test_menu = zip (map show [1..]) all_tests
95−doTestMenu :: Int -> IO [(String, Bool)]
84+do_test_menu :: Int -> IO [(String, Bool)]
96−doTestMenu nextID
85+do_test_menu next_ID
97− | nextID > length allTests = do
86+ | next_ID > length all_tests = do
98− putStrLn $ "Done! Please email the " ++ outputFilePath ++ " file to coreyoconnor@gmail.com"
87+ putStrLn $ "Done! Please email the " ++ output_file_path ++ " file to coreyoconnor@gmail.com"
100 | otherwise = do
89 | otherwise = do
101− displayTestMenu
90+ display_test_menu
102− putStrLn $ "Press return to start with #" ++ show nextID ++ "."
91+ putStrLn $ "Press return to start with #" ++ show next_ID ++ "."
103 putStrLn "Enter a test number to perform only that test."
92 putStrLn "Enter a test number to perform only that test."
104 putStrLn "q (or control-C) to quit."
93 putStrLn "q (or control-C) to quit."
105 putStr "> "
94 putStr "> "
@@ -107,246 +96,225 @@ doTestMenu nextID
107 s <- getLine >>= return . filter (/= '\n')
96 s <- getLine >>= return . filter (/= '\n')
108 case s of
97 case s of
109 "q" -> return mempty
98 "q" -> return mempty
110− "" -> do
99+ "" -> do
111− r <- runTest $ show nextID
100+ r <- run_test $ show next_ID
112− rs <- doTestMenu ( nextID + 1 )
101+ rs <- do_test_menu ( next_ID + 1 )
113 return $ r : rs
102 return $ r : rs
114− i | isJust ( lookup i testMenu ) -> do
103+ i | isJust ( lookup i test_menu ) -> do
115− r <- runTest i
104+ r <- run_test i
116− rs <- doTestMenu ( read i + 1 )
105+ rs <- do_test_menu ( read i + 1 )
117 return $ r : rs
106 return $ r : rs
119− displayTestMenu
108+ display_test_menu
120− = mapM_ displayTestMenu' testMenu
109+ = mapM_ display_test_menu' test_menu
121− displayTestMenu' ( i, t )
110+ display_test_menu' ( i, t )
122− = putStrLn $ ( if i == show nextID
111+ = putStrLn $ ( if i == show next_ID
123− then "> "
112+ then "> "
125− ) ++ i ++ ". " ++ testName t
114+ ) ++ i ++ ". " ++ test_name t
127−runTest :: String -> IO (String, Bool)
116+run_test :: String -> IO (String, Bool)
128−runTest i = do
117+run_test i = do
129− let t = fromJust $ lookup i testMenu
118+ let t = fromJust $ lookup i test_menu
130− printSummary t
119+ print_summary t
131− waitForReturn
120+ wait_for_return
132− testAction t
121+ test_action t
133− r <- confirmResults t
122+ r <- confirm_results t
134− return (testID t, r)
123+ return (test_ID t, r)
136−defaultSuccessConfirmResults = do
125+default_success_confirm_results = do
137 putStr "\n"
126 putStr "\n"
138 putStr "[Y/n] "
127 putStr "[Y/n] "
139 hFlush stdout
128 hFlush stdout
140 r <- getLine
129 r <- getLine
141 case r of
130 case r of
142− "" -> return True
131+ "" -> return True
143 "y" -> return True
132 "y" -> return True
144 "Y" -> return True
133 "Y" -> return True
145 "n" -> return False
134 "n" -> return False
147data Test = Test
136data Test = Test
148− { testName :: String
137+ { test_name :: String
149− , testID :: String
138+ , test_ID :: String
150− , testAction :: IO ()
139+ , test_action :: IO ()
151− , printSummary :: IO ()
140+ , print_summary :: IO ()
152− , confirmResults :: IO Bool
141+ , confirm_results :: IO Bool
155−allTests
144+all_tests
156− = [ reserveOutputTest
145+ = [ reserve_output_test
157− , displayBoundsTest0
146+ , display_bounds_test_0
158− , displayBoundsTest1
147+ , display_bounds_test_1
159− , displayBoundsTest2
148+ , display_bounds_test_2
160− , displayBoundsTest3
149+ , display_bounds_test_3
161− , unicodeSingleWidth0
150+ , unicode_single_width_0
162− , unicodeSingleWidth1
151+ , unicode_single_width_1
163− , unicodeDoubleWidth0
152+ , unicode_double_width_0
164− , unicodeDoubleWidth1
153+ , unicode_double_width_1
165− , attributesTest0
154+ , attributes_test_0
166− , attributesTest1
155+ , attributes_test_1
167− , attributesTest2
156+ , attributes_test_2
168− , attributesTest3
157+ , attributes_test_3
169− , attributesTest4
158+ , attributes_test_4
170− , attributesTest5
159+ , attributes_test_5
171− , inlineTest0
160+ , inline_test_0
187−reserveOutputTest = Test
163+reserve_output_test = Test
188− { testName = "Initialize and reserve terminal output then restore previous state."
164+ { test_name = "Initialize and reserve terminal output then restore previous state."
189− , testID = "reserveOutputTest"
165+ , test_ID = "reserve_output_test"
190− , testAction = do
166+ , test_action = do
191− t <- standardIOConfig >>= outputForConfig
167+ t <- terminal_handle
192− reserveDisplay t
168+ reserve_display t
193 putStrLn "Line 1"
169 putStrLn "Line 1"
194 putStrLn "Line 2"
170 putStrLn "Line 2"
195 putStrLn "Line 3"
171 putStrLn "Line 3"
196 putStrLn "Line 4 (press return)"
172 putStrLn "Line 4 (press return)"
197 hFlush stdout
173 hFlush stdout
199− releaseDisplay t
175+ release_display t
200− releaseTerminal t
176+ release_terminal t
201 return ()
177 return ()
202− , printSummary = do
178+ , print_summary = do
203− putStr $ [s|
179+ putStr $ [$heredoc|
204Once return is pressed:
180Once return is pressed:
205− 0. The screen will be cleared.
181+The screen will be cleared.
206− 1. Four lines of text should be visible.
207− 1. The cursor should be visible and at the start of the fifth line.
182+The cursor should be visible and at the top left corner.
183+Four lines of text should be visible.
209−After return is pressed for the second time this test then:
185+After enter is pressed for the second time this test then:
210 * The screen containing the test summary should be restored;
186 * The screen containing the test summary should be restored;
211 * The cursor is visible.
187 * The cursor is visible.
213− , confirmResults = do
189+ , confirm_results = do
214− putStr $ [s|
190+ putStr $ [$heredoc|
215Did the test output match the description?
191Did the test output match the description?
217− defaultSuccessConfirmResults
193+ default_success_confirm_results
220−displayBoundsTest0 = Test
196+display_bounds_test_0 = Test
221− { testName = "Verify display bounds are correct test 0: Using spaces."
197+ { test_name = "Verify display bounds are correct test 0: Using spaces."
222− , testID = "displayBoundsTest0"
198+ , test_ID = "display_bounds_test_0"
223− , testAction = do
199+ , test_action = do
224− t <- standardIOConfig >>= outputForConfig
200+ t <- terminal_handle
225− reserveDisplay t
201+ reserve_display t
226− (w,h) <- displayBounds t
202+ DisplayRegion w h <- display_bounds t
227− let row0 = replicate (fromEnum w) 'X' ++ "\n"
203+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
228− rowH = replicate (fromEnum w - 1) 'X'
204+ row_h = replicate (fromEnum w - 1) 'X'
229− rowN = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
205+ row_n = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
230− image = row0 ++ (concat $ replicate (fromEnum h - 2) rowN) ++ rowH
206+ image = row_0 ++ (concat $ replicate (fromEnum h - 2) row_n) ++ row_h
231 putStr image
207 putStr image
232 hFlush stdout
208 hFlush stdout
234− releaseDisplay t
210+ release_display t
235− releaseTerminal t
211+ release_terminal t
236 return ()
212 return ()
237− , printSummary = displayBoundsTestSummary True
213+ , print_summary = display_bounds_test_summary True
238− , confirmResults = genericOutputMatchConfirm
214+ , confirm_results = generic_output_match_confirm
241−displayBoundsTest1 = Test
217+display_bounds_test_1 = Test
242− { testName = "Verify display bounds are correct test 0: Using cursor movement."
218+ { test_name = "Verify display bounds are correct test 0: Using cursor movement."
243− , testID = "displayBoundsTest1"
219+ , test_ID = "display_bounds_test_1"
244− , testAction = do
220+ , test_action = do
245− t <- standardIOConfig >>= outputForConfig
221+ t <- terminal_handle
246− reserveDisplay t
222+ reserve_display t
247− (w,h) <- displayBounds t
223+ DisplayRegion w h <- display_bounds t
248− setCursorPos t 0 0
224+ set_cursor_pos t 0 0
249− let row0 = replicate (fromEnum w) 'X' ++ "\n"
225+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
250− putStr row0
226+ putStr row_0
251 forM_ [1 .. h - 2] $ \y -> do
227 forM_ [1 .. h - 2] $ \y -> do
252− setCursorPos t 0 y
228+ set_cursor_pos t 0 y
253 putStr "X"
229 putStr "X"
254− hFlush stdout
230+ set_cursor_pos t (w - 1) y
255− setCursorPos t (w - 1) y
256 putStr "X"
231 putStr "X"
257− hFlush stdout
232+ set_cursor_pos t 0 (h - 1)
258− setCursorPos t 0 (h - 1)
259− let rowH = replicate (fromEnum w - 1) 'X'
233+ let row_h = replicate (fromEnum w - 1) 'X'
260− putStr rowH
234+ putStr row_h
261 hFlush stdout
235 hFlush stdout
263− releaseDisplay t
237+ release_display t
264− releaseTerminal t
238+ release_terminal t
265 return ()
239 return ()
266− , printSummary = displayBoundsTestSummary True
240+ , print_summary = display_bounds_test_summary True
267− , confirmResults = genericOutputMatchConfirm
241+ , confirm_results = generic_output_match_confirm
270−displayBoundsTest2 = Test
244+display_bounds_test_2 = Test
271− { testName = "Verify display bounds are correct test 0: Using Image ops."
245+ { test_name = "Verify display bounds are correct test 0: Using Image ops."
272− , testID = "displayBoundsTest2"
246+ , test_ID = "display_bounds_test_2"
273− , testAction = do
247+ , test_action = do
274− t <- standardIOConfig >>= outputForConfig
248+ t <- terminal_handle
275− reserveDisplay t
249+ reserve_display t
276− bounds@(w,h) <- displayBounds t
250+ bounds@(DisplayRegion w h) <- display_bounds t
277− let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
251+ let first_row = horiz_cat $ replicate (fromEnum w) (char def_attr 'X')
278− middleRows = vertCat $ replicate (fromEnum h - 2) middleRow
252+ middle_rows = vert_cat $ replicate (fromEnum h - 2) middle_row
279− middleRow = (char defAttr 'X') <|> backgroundFill (w - 2) 1 <|> (char defAttr 'X')
253+ middle_row = (char def_attr 'X') <|> background_fill (w - 2) 1 <|> (char def_attr 'X')
280− endRow = firstRow
254+ end_row = first_row
281− image = firstRow <-> middleRows <-> endRow
255+ image = first_row <-> middle_rows <-> end_row
282− pic = (picForImage image) { picCursor = Cursor (w - 1) (h - 1) }
256+ pic = (pic_for_image image) { pic_cursor = Cursor (w - 1) (h - 1) }
283− d <- displayContext t bounds
257+ d <- display_context t bounds
284− outputPicture d pic
258+ output_picture d pic
286− releaseDisplay t
260+ release_display t
287− releaseTerminal t
261+ release_terminal t
288 return ()
262 return ()
289− , printSummary = displayBoundsTestSummary True
263+ , print_summary = display_bounds_test_summary True
290− , confirmResults = genericOutputMatchConfirm
264+ , confirm_results = generic_output_match_confirm
293−displayBoundsTest3 = Test
267+display_bounds_test_3 = Test
294− { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
268+ { test_name = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295− , testID = "displayBoundsTest3"
269+ , test_ID = "display_bounds_test_3"
296− , testAction = do
270+ , test_action = do
297− t <- standardIOConfig >>= outputForConfig
271+ t <- terminal_handle
298− reserveDisplay t
272+ reserve_display t
299− (w,h) <- displayBounds t
273+ DisplayRegion w h <- display_bounds t
300− hideCursor t
274+ hide_cursor t
301− setCursorPos t 0 0
275+ set_cursor_pos t 0 0
302− let row0 = replicate (fromEnum w) 'X'
276+ let row_0 = replicate (fromEnum w) 'X'
303− putStrLn row0
277+ putStrLn row_0
304 forM_ [1 .. h - 2] $ \y -> do
278 forM_ [1 .. h - 2] $ \y -> do
305− setCursorPos t 0 y
279+ set_cursor_pos t 0 y
306 putStr "X"
280 putStr "X"
307− hFlush stdout
281+ set_cursor_pos t (w - 1) y
308− setCursorPos t (w - 1) y
309 putStr "X"
282 putStr "X"
310− hFlush stdout
283+ set_cursor_pos t 0 (h - 1)
311− setCursorPos t 0 (h - 1)
284+ let row_h = row_0
313− putStr rowH
285+ putStr row_h
314 hFlush stdout
286 hFlush stdout
316− showCursor t
288+ show_cursor t
317− releaseDisplay t
289+ release_display t
318− releaseTerminal t
290+ release_terminal t
319 return ()
291 return ()
320− , printSummary = displayBoundsTestSummary False
292+ , print_summary = display_bounds_test_summary False
321− , confirmResults = genericOutputMatchConfirm
293+ , confirm_results = generic_output_match_confirm
324−displayBoundsTestSummary hasCursor = do
296+display_bounds_test_summary has_cursor = do
325− putStr $ [s|
297+ putStr $ [$heredoc|
326Once return is pressed:
298Once return is pressed:
327 0. The screen will be cleared.
299 0. The screen will be cleared.
329− if hasCursor
301+ if has_cursor
330 then putStr " 1. The cursor will be visible."
302 then putStr " 1. The cursor will be visible."
331 else putStr " 1. The cursor will NOT be visible."
303 else putStr " 1. The cursor will NOT be visible."
332− putStr [s|
304+ putStr [$heredoc|
334 2. The border of the display will be outlined in Xs.
305 2. The border of the display will be outlined in Xs.
335 So if - and | represented the edge of the terminal window:
306 So if - and | represented the edge of the terminal window:
336 |-------------|
307 |-------------|
337 |XXXXXXXXXXXXX|
308 |XXXXXXXXXXXXX|
340− if hasCursor
311+ if has_cursor
341− then putStr $ [s|
312+ then putStr $ [$heredoc|
343 |XXXXXXXXXXXXC| |]
313 |XXXXXXXXXXXXC| |]
344− else putStr $ [s|
314+ else putStr $ [$heredoc|
346 |XXXXXXXXXXXXX| |]
315 |XXXXXXXXXXXXX| |]
348− putStr $ [s|
317+ putStr $ [$heredoc|
350 |-------------|
318 |-------------|
352 ( Where C is the final position of the cursor. There may be an X drawn
320 ( Where C is the final position of the cursor. There may be an X drawn
@@ -358,13 +326,13 @@ After return is pressed for the second time:
358 1. The cursor should be visible.
326 1. The cursor should be visible.
361−genericOutputMatchConfirm = do
329+generic_output_match_confirm = do
362− putStr $ [s|
330+ putStr $ [$heredoc|
363Did the test output match the description?
331Did the test output match the description?
365− defaultSuccessConfirmResults
333+ default_success_confirm_results
367−-- Explicitly define the bytes that encode each example text.
335+-- Explicitely definethe bytes that encode each example text.
368-- This avoids any issues with how the compiler represents string literals.
336-- 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
338-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -373,24 +341,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
341-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
374-- comments ;-)
342-- comments ;-)
376−-- txt0 = ↑↑↓↓←→←→BA
344+-- txt_0 = ↑↑↓↓←→←→BA
378−utf8Txt0 :: [[Word8]]
346+utf8_txt_0 :: [[Word8]]
379−utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
347+utf8_txt_0 = [ [ 0xe2 , 0x86 , 0x91 ]
380− , [ 0xe2 , 0x86 , 0x91 ]
348+ , [ 0xe2 , 0x86 , 0x91 ]
381− , [ 0xe2 , 0x86 , 0x93 ]
349+ , [ 0xe2 , 0x86 , 0x93 ]
382− , [ 0xe2 , 0x86 , 0x93 ]
350+ , [ 0xe2 , 0x86 , 0x93 ]
383− , [ 0xe2 , 0x86 , 0x90 ]
351+ , [ 0xe2 , 0x86 , 0x90 ]
384− , [ 0xe2 , 0x86 , 0x92 ]
352+ , [ 0xe2 , 0x86 , 0x92 ]
385− , [ 0xe2 , 0x86 , 0x90 ]
353+ , [ 0xe2 , 0x86 , 0x90 ]
386− , [ 0xe2 , 0x86 , 0x92 ]
354+ , [ 0xe2 , 0x86 , 0x92 ]
387− , [ 0x42 ]
355+ , [ 0x42 ]
388− , [ 0x41 ]
356+ , [ 0x41 ]
391−iso10646Txt0 :: String
359+iso_10646_txt_0 :: String
392−iso10646Txt0 = map toEnum
360+iso_10646_txt_0 = map toEnum
@@ -402,46 +370,45 @@ iso10646Txt0 = map toEnum
405−unicodeSingleWidth0 = Test
373+unicode_single_width_0 = Test
406− { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
374+ { test_name = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407− , testID = "unicodeSingleWidth0"
375+ , test_ID = "unicode_single_width_0"
408− , testAction = do
376+ , test_action = do
409− t <- standardIOConfig >>= outputForConfig
377+ t <- terminal_handle
410− reserveDisplay t
378+ reserve_display t
412− withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
379+ withArrayLen (concat utf8_txt_0) (flip $ hPutBuf stdout)
413 hPutStr stdout "\n"
380 hPutStr stdout "\n"
414 hPutStr stdout "0123456789\n"
381 hPutStr stdout "0123456789\n"
415 hFlush stdout
382 hFlush stdout
417− releaseDisplay t
384+ release_display t
418− releaseTerminal t
385+ release_terminal t
419 return ()
386 return ()
420− , printSummary = unicodeSingleWidthSummary
387+ , print_summary = unicode_single_width_summary
421− , confirmResults = genericOutputMatchConfirm
388+ , confirm_results = generic_output_match_confirm
424−unicodeSingleWidth1 = Test
391+unicode_single_width_1 = Test
425− { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
392+ { test_name = "Verify terminal can display unicode single-width characters. (Image ops)"
426− , testID = "unicodeSingleWidth1"
393+ , test_ID = "unicode_single_width_1"
427− , testAction = do
394+ , test_action = do
428− t <- standardIOConfig >>= outputForConfig
395+ t <- terminal_handle
429− reserveDisplay t
396+ reserve_display t
430− let pic = picForImage image
397+ let pic = pic_for_image image
431− image = line0 <-> line1
398+ image = line_0 <-> line_1
432− line0 = iso10646String defAttr iso10646Txt0
399+ line_0 = iso_10646_string def_attr iso_10646_txt_0
433− line1 = string defAttr "0123456789"
400+ line_1 = string def_attr "0123456789"
434− d <- displayBounds t >>= displayContext t
401+ d <- display_bounds t >>= display_context t
435− outputPicture d pic
402+ output_picture d pic
437− releaseDisplay t
404+ release_display t
438− releaseTerminal t
405+ release_terminal t
439 return ()
406 return ()
440− , printSummary = unicodeSingleWidthSummary
407+ , print_summary = unicode_single_width_summary
441− , confirmResults = genericOutputMatchConfirm
408+ , confirm_results = generic_output_match_confirm
444−unicodeSingleWidthSummary = putStr [s|
411+unicode_single_width_summary = putStr [$heredoc|
445Once return is pressed:
412Once return is pressed:
446 0. The screen will be cleared.
413 0. The screen will be cleared.
447 1. The cursor will be hidden.
414 1. The cursor will be hidden.
@@ -475,55 +442,54 @@ After return is pressed for the second time:
476-- The second example is a unicode string containing double-width glyphs
443-- The second example is a unicode string containing double-width glyphs
478−utf8Txt1 :: [[Word8]]
445+utf8_txt_1 :: [[Word8]]
479−utf8Txt1 = [ [0xe4,0xbd,0xa0]
446+utf8_txt_1 = [ [0xe4,0xbd,0xa0]
480− , [0xe5,0xa5,0xbd]
447+ , [0xe5,0xa5,0xbd]
481− , [0xe5,0x90,0x97]
448+ , [0xe5,0x90,0x97]
484−iso10646Txt1 :: String
451+iso_10646_txt_1 :: String
485−iso10646Txt1 = map toEnum [20320,22909,21527]
452+iso_10646_txt_1 = map toEnum [20320,22909,21527]
487−unicodeDoubleWidth0 = Test
454+unicode_double_width_0 = Test
488− { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
455+ { test_name = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489− , testID = "unicodeDoubleWidth0"
456+ , test_ID = "unicode_double_width_0"
490− , testAction = do
457+ , test_action = do
491− t <- standardIOConfig >>= outputForConfig
458+ t <- terminal_handle
492− reserveDisplay t
459+ reserve_display t
494− withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
460+ withArrayLen (concat utf8_txt_1) (flip $ hPutBuf stdout)
495 hPutStr stdout "\n"
461 hPutStr stdout "\n"
496 hPutStr stdout "012345\n"
462 hPutStr stdout "012345\n"
497 hFlush stdout
463 hFlush stdout
499− releaseDisplay t
465+ release_display t
500− releaseTerminal t
466+ release_terminal t
501 return ()
467 return ()
502− , printSummary = unicodeDoubleWidthSummary
468+ , print_summary = unicode_double_width_summary
503− , confirmResults = genericOutputMatchConfirm
469+ , confirm_results = generic_output_match_confirm
506−unicodeDoubleWidth1 = Test
472+unicode_double_width_1 = Test
507− { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
473+ { test_name = "Verify terminal can display unicode double-width characters. (Image ops)"
508− , testID = "unicodeDoubleWidth1"
474+ , test_ID = "unicode_double_width_1"
509− , testAction = do
475+ , test_action = do
510− t <- standardIOConfig >>= outputForConfig
476+ t <- terminal_handle
511− reserveDisplay t
477+ reserve_display t
512− let pic = picForImage image
478+ let pic = pic_for_image image
513− image = line0 <-> line1
479+ image = line_0 <-> line_1
514− line0 = iso10646String defAttr iso10646Txt1
480+ line_0 = iso_10646_string def_attr iso_10646_txt_1
515− line1 = string defAttr "012345"
481+ line_1 = string def_attr "012345"
516− d <- displayBounds t >>= displayContext t
482+ d <- display_bounds t >>= display_context t
517− outputPicture d pic
483+ output_picture d pic
519− releaseDisplay t
485+ release_display t
520− releaseTerminal t
486+ release_terminal t
521 return ()
487 return ()
522− , printSummary = unicodeDoubleWidthSummary
488+ , print_summary = unicode_double_width_summary
523− , confirmResults = genericOutputMatchConfirm
489+ , confirm_results = generic_output_match_confirm
526−unicodeDoubleWidthSummary = putStr [s|
492+unicode_double_width_summary = putStr [$heredoc|
527Once return is pressed:
493Once return is pressed:
528 0. The screen will be cleared.
494 0. The screen will be cleared.
529 1. The cursor will be hidden.
495 1. The cursor will be hidden.
@@ -550,33 +516,29 @@ After return is pressed for the second time:
550 1. The cursor should be visible.
516 1. The cursor should be visible.
553−allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
519+all_colors = zip [ black, red, green, yellow, blue, magenta, cyan, white, def ]
554− [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
520+ [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white", "default" ]
556−allBrightColors
522+attributes_test_0 = Test
557− = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
558− [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
560−attributesTest0 = Test
561− { testName = "Character attributes: foreground colors."
523+ { test_name = "Character attributes: foreground colors."
562− , testID = "attributesTest0"
524+ , test_ID = "attributes_test_0"
563− , testAction = do
525+ , test_action = do
564− t <- standardIOConfig >>= outputForConfig
526+ t <- terminal_handle
565− reserveDisplay t
527+ reserve_display t
566− let pic = picForImage image
528+ let pic = pic_for_image image
567− image = border <|> column0 <|> border <|> column1 <|> border
529+ image = border <|> column_0 <|> border <|> column_1 <|> border
568− column0 = vertCat $ map lineWithColor allColors
530+ column_0 = vert_cat $ map line_with_color all_colors
569− border = vertCat $ replicate (length allColors) $ string defAttr " | "
531+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
570− column1 = vertCat $ map (string defAttr . snd) allColors
532+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
571− lineWithColor (c, cName) = string (defAttr `withForeColor` c) cName
533+ line_with_color (c_value, c_name) = string (setFG c_value def_attr) c_name
572− d <- displayBounds t >>= displayContext t
534+ d <- display_bounds t >>= display_context t
573− outputPicture d pic
535+ output_picture d pic
575− releaseDisplay t
537+ release_display t
576− releaseTerminal t
538+ release_terminal t
577 return ()
539 return ()
578− , printSummary = do
540+ , print_summary = do
579− putStr $ [s|
541+ putStr $ [$heredoc|
580Once return is pressed:
542Once return is pressed:
581 0. The screen will be cleared.
543 0. The screen will be cleared.
582 1. The cursor will be hidden.
544 1. The cursor will be hidden.
@@ -596,40 +558,40 @@ After return is pressed for the second time:
596 0. The screen containing the test summary should be restored.
558 0. The screen containing the test summary should be restored.
597 1. The cursor should be visible.
559 1. The cursor should be visible.
599− , confirmResults = do
561+ , confirm_results = do
600− putStr $ [s|
562+ putStr $ [$heredoc|
601Did the test output match the description?
563Did the test output match the description?
603− defaultSuccessConfirmResults
565+ default_success_confirm_results
606−attributesTest1 = Test
568+attributes_test_1 = Test
607− { testName = "Character attributes: background colors."
569+ { test_name = "Character attributes: background colors."
608− , testID = "attributesTest1"
570+ , test_ID = "attributes_test_1"
609− , testAction = do
571+ , test_action = do
610− t <- standardIOConfig >>= outputForConfig
572+ t <- terminal_handle
611− reserveDisplay t
573+ reserve_display t
612− let pic = picForImage image
574+ let pic = pic_for_image image
613− image = border <|> column0 <|> border <|> column1 <|> border
575+ image = border <|> column_0 <|> border <|> column_1 <|> border
614− column0 = vertCat $ map lineWithColor allColors
576+ column_0 = vert_cat $ map line_with_color all_colors
615− border = vertCat $ replicate (length allColors) $ string defAttr " | "
577+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
616− column1 = vertCat $ map (string defAttr . snd) allColors
578+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
617− lineWithColor (c, cName) = string (defAttr `withBackColor` c) cName
579+ line_with_color (c_value, c_name) = string (setBG c_value def_attr) c_name
618− d <- displayBounds t >>= displayContext t
580+ d <- display_bounds t >>= display_context t
619− outputPicture d pic
581+ output_picture d pic
621− releaseDisplay t
583+ release_display t
622− releaseTerminal t
584+ release_terminal t
623 return ()
585 return ()
624− , printSummary = do
586+ , print_summary = do
625− putStr $ [s|
587+ putStr $ [$heredoc|
626Once return is pressed:
588Once return is pressed:
627 0. The screen will be cleared.
589 0. The screen will be cleared.
628 1. The cursor will be hidden.
590 1. The cursor will be hidden.
629 2. 9 lines of text in two columns will be drawn. The first column will
591 2. 9 lines of text in two columns will be drawn. The first column will
630 contain be a name of a standard color for an 8 color terminal rendered with
592 contain be a name of a standard color for an 8 color terminal rendered with
631 the default foreground color with a background the named color. For
593 the default foreground color with a background the named color. For
632− instance, one line will contain be the word "magenta" and the word should
594+ instance, one line will contain be the word "magenta" and that words should
633 be rendered in the default foreground color over a magenta background. The
595 be rendered in the default foreground color over a magenta background. The
634 second column will be the name of a standard color rendered with the default
596 second column will be the name of a standard color rendered with the default
635 attributes.
597 attributes.
@@ -651,57 +613,57 @@ After return is pressed for the second time:
651 0. The screen containing the test summary should be restored.
613 0. The screen containing the test summary should be restored.
652 1. The cursor should be visible.
614 1. The cursor should be visible.
654− , confirmResults = do
616+ , confirm_results = do
655− putStr $ [s|
617+ putStr $ [$heredoc|
656Did the test output match the description?
618Did the test output match the description?
658− defaultSuccessConfirmResults
620+ default_success_confirm_results
661−attributesTest2 = Test
623+attributes_test_2 = Test
662− { testName = "Character attributes: Vivid foreground colors."
624+ { test_name = "Character attributes: Vivid foreground colors."
663− , testID = "attributesTest2"
625+ , test_ID = "attributes_test_2"
664− , testAction = do
626+ , test_action = do
665− t <- standardIOConfig >>= outputForConfig
627+ t <- terminal_handle
666− reserveDisplay t
628+ reserve_display t
667− let pic = picForImage image
629+ let pic = pic_for_image image
668− image = horizCat [border, column0, border, column1, border, column2, border]
630+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
669− border = vertCat $ replicate (length allColors) $ string defAttr " | "
631+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
670− column0 = vertCat $ map lineWithColor0 allColors
632+ column_0 = vert_cat $ map line_with_color_0 all_colors
671− column1 = vertCat $ map lineWithColor1 allBrightColors
633+ column_1 = vert_cat $ map line_with_color_1 all_colors
672− column2 = vertCat $ map (string defAttr . snd) allColors
634+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
673− lineWithColor0 (c, cName) = string (defAttr `withForeColor` c) cName
635+ line_with_color_0 (c_value, c_name) = string (setFG c_value def_attr) c_name
674− lineWithColor1 (c, cName) = string (defAttr `withForeColor` c) cName
636+ line_with_color_1 (c_value, c_name) = string (setFGVivid c_value def_attr) c_name
675− d <- displayBounds t >>= displayContext t
637+ d <- display_bounds t >>= display_context t
676− outputPicture d pic
638+ output_picture d pic
678− releaseDisplay t
640+ release_display t
679− releaseTerminal t
641+ release_terminal t
680 return ()
642 return ()
681− , printSummary = do
643+ , print_summary = do
682− putStr $ [s|
644+ putStr $ [$heredoc|
683Once return is pressed:
645Once return is pressed:
684 0. The screen will be cleared.
646 0. The screen will be cleared.
685 1. The cursor will be hidden.
647 1. The cursor will be hidden.
686 2. 9 lines of text in three columns will be drawn:
648 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
649 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.
650+ 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
651 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
652 with that color as the foreground color but the shade used should be
691− more vivid than the shade used in the first column.
653+ 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
654 c. The final column will be the name of a color rendered with the
693 default attributes.
655 default attributes.
695For instance, one line will be the word "magenta" and that word should be
657For instance, one line will be the word "magenta" and that word should be
696−rendered in the magenta color.
658+rendered in the magenta color.
698I'm not actually sure exactly what "vivid" means in this context. For xterm the
660I'm not actually sure exactly what "vivid" means in this context. For xterm the
699−vivid colors are brighter.
661+vivid colors are brighter.
702 * The first column: The foreground color matches the named color.
664 * The first column: The foreground color matches the named color.
703 * The second column: The foreground color matches the named color but is
665 * The second column: The foreground color matches the named color but is
704− more vivid than the color used in the first column.
666+ more vivid than the color used in the first column.
705 * The third column: All text is rendered with the default attributes.
667 * 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
668 * The vertical bars used in each line to mark the border of a column are
707 lined up.
669 lined up.
@@ -710,58 +672,58 @@ After return is pressed for the second time:
710 0. The screen containing the test summary should be restored.
672 0. The screen containing the test summary should be restored.
711 1. The cursor should be visible.
673 1. The cursor should be visible.
713− , confirmResults = do
675+ , confirm_results = do
714− putStr $ [s|
676+ putStr $ [$heredoc|
715Did the test output match the description?
677Did the test output match the description?
717− defaultSuccessConfirmResults
679+ default_success_confirm_results
720−attributesTest3 = Test
682+attributes_test_3 = Test
721− { testName = "Character attributes: Vivid background colors."
683+ { test_name = "Character attributes: vivid background colors."
722− , testID = "attributesTest3"
684+ , test_ID = "attributes_test_3"
723− , testAction = do
685+ , test_action = do
724− t <- standardIOConfig >>= outputForConfig
686+ t <- terminal_handle
725− reserveDisplay t
687+ reserve_display t
726− let pic = picForImage image
688+ let pic = pic_for_image image
727− image = horizCat [border, column0, border, column1, border, column2, border]
689+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
728− border = vertCat $ replicate (length allColors) $ string defAttr " | "
690+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
729− column0 = vertCat $ map lineWithColor0 allColors
691+ column_0 = vert_cat $ map line_with_color_0 all_colors
730− column1 = vertCat $ map lineWithColor1 allBrightColors
692+ column_1 = vert_cat $ map line_with_color_1 all_colors
731− column2 = vertCat $ map (string defAttr . snd) allColors
693+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
732− lineWithColor0 (c, cName) = string (defAttr `withBackColor` c) cName
694+ line_with_color_0 (c_value, c_name) = string (setBG c_value def_attr) c_name
733− lineWithColor1 (c, cName) = string (defAttr `withBackColor` c) cName
695+ line_with_color_1 (c_value, c_name) = string (setBGVivid c_value def_attr) c_name
734− d <- displayBounds t >>= displayContext t
696+ d <- display_bounds t >>= display_context t
735− outputPicture d pic
697+ output_picture d pic
737− releaseDisplay t
699+ release_display t
738− releaseTerminal t
700+ release_terminal t
739 return ()
701 return ()
740− , printSummary = do
702+ , print_summary = do
741− putStr $ [s|
703+ putStr $ [$heredoc|
742Once return is pressed:
704Once return is pressed:
743 0. The screen will be cleared.
705 0. The screen will be cleared.
744 1. The cursor will be hidden.
706 1. The cursor will be hidden.
745 2. 9 lines of text in three columns will be drawn:
707 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
708 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
709 color terminal rendered with the default foreground color with a
748− background the named color.
710+ background the named color.
749 b. The first column will contain be a name of a standard color for an 8
711 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
712 color terminal rendered with the default foreground color with the
751− background a vivid version of the named color.
713+ background a vivid version of the named color.
752 c. The third column will be the name of a standard color rendered with
714 c. The third column will be the name of a standard color rendered with
753 the default attributes.
715 the default attributes.
755−For instance, one line will contain be the word "magenta" and the word should
717+For instance, one line will contain be the word "magenta" and that words should
756−be rendered in the default foreground color over a magenta background.
718+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
720I'm not actually sure exactly what "vivid" means in this context. For xterm the
759vivid colors are brighter.
721vivid colors are brighter.
762 * The first column: The background color matches the named color.
724 * The first column: The background color matches the named color.
763 * The second column: The background color matches the named color and is
725 * The second column: The background color matches the named color and is
764− more vivid than the color used in the first column.
726+ more vivid than the color used in the first column.
765 * The third column column: All text is rendered with the default attributes.
727 * 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
728 * The vertical bars used in each line to mark the border of a column are
767 lined up.
729 lined up.
@@ -777,51 +739,51 @@ After return is pressed for the second time:
777 0. The screen containing the test summary should be restored.
739 0. The screen containing the test summary should be restored.
778 1. The cursor should be visible.
740 1. The cursor should be visible.
780− , confirmResults = do
742+ , confirm_results = do
781− putStr $ [s|
743+ putStr $ [$heredoc|
782Did the test output match the description?
744Did the test output match the description?
784− defaultSuccessConfirmResults
746+ default_success_confirm_results
787−attrCombos =
749+attr_combos =
788− [ ( "default", id )
750+ [ ("default", id)
789− , ( "bold", flip withStyle bold )
751+ , ("bold", setBold)
790− , ( "blink", flip withStyle blink )
752+ , ("blink", setBlink)
791− , ( "underline", flip withStyle underline )
753+ , ("underline", setUnderline)
792− , ( "bold + blink", flip withStyle (bold + blink) )
754+ , ("bold + blink", setBlink . setBold)
793− , ( "bold + underline", flip withStyle (bold + underline) )
755+ , ("bold + underline", setUnderline . setBold)
794− , ( "underline + blink", flip withStyle (underline + blink) )
756+ , ("underline + blink", setBlink . setUnderline)
795− , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
757+ , ("bold + blink + underline", setUnderline . setBlink . setBold)
798−attributesTest4 = Test
760+attributes_test_4 = Test
799− { testName = "Character attributes: Bold; Blink; Underline."
761+ { test_name = "Character attributes: Bold; Blink; Underline."
800− , testID = "attributesTest4"
762+ , test_ID = "attributes_test_4"
801− , testAction = do
763+ , test_action = do
802− t <- standardIOConfig >>= outputForConfig
764+ t <- terminal_handle
803− reserveDisplay t
765+ reserve_display t
804− let pic = picForImage image
766+ let pic = pic_for_image image
805− image = horizCat [border, column0, border, column1, border]
767+ image = horiz_cat [border, column_0, border, column_1, border]
806− border = vertCat $ replicate (length attrCombos) $ string defAttr " | "
768+ border = vert_cat $ replicate (length attr_combos) $ string def_attr " | "
807− column0 = vertCat $ map lineWithAttrs attrCombos
769+ column_0 = vert_cat $ map line_with_attrs attr_combos
808− column1 = vertCat $ map (string defAttr . fst) attrCombos
770+ column_1 = vert_cat $ map (string def_attr . fst) attr_combos
809− lineWithAttrs (desc, attrF) = string (attrF defAttr) desc
771+ line_with_attrs (desc, attr_f) = string (attr_f def_attr) desc
810− d <- displayBounds t >>= displayContext t
772+ d <- display_bounds t >>= display_context t
811− outputPicture d pic
773+ output_picture d pic
813− releaseDisplay t
775+ release_display t
814− releaseTerminal t
776+ release_terminal t
815 return ()
777 return ()
816− , printSummary = do
778+ , print_summary = do
817− putStr $ [s|
779+ putStr $ [$heredoc|
818Once return is pressed:
780Once return is pressed:
819 0. The screen will be cleared.
781 0. The screen will be cleared.
820 1. The cursor will be hidden.
782 1. The cursor will be hidden.
821− 2. 8 rows of text in two columns.
783+ 2. 8 rows of text in two columns.
822 The rows will contain the following text:
784 The rows will contain the following text:
826 underline
788 underline
827 bold + blink
789 bold + blink
@@ -830,8 +792,8 @@ Once return is pressed:
830 bold + blink + underline
792 bold + blink + underline
831 The first column will be rendered with the described attributes. The second
793 The first column will be rendered with the described attributes. The second
832 column will be rendered with the default attributes.
794 column will be rendered with the default attributes.
835 * The vertical bars used in each line to mark the border of a column are
797 * The vertical bars used in each line to mark the border of a column are
836 lined up.
798 lined up.
837 * The text in the first column is rendered as described.
799 * The text in the first column is rendered as described.
@@ -840,353 +802,67 @@ After return is pressed for the second time:
840 0. The screen containing the test summary should be restored.
802 0. The screen containing the test summary should be restored.
841 1. The cursor should be visible.
803 1. The cursor should be visible.
843− , confirmResults = do
805+ , confirm_results = do
844− putStr $ [s|
806+ putStr $ [$heredoc|
845Did the test output match the description?
807Did the test output match the description?
847− defaultSuccessConfirmResults
809+ default_success_confirm_results
850−attributesTest5 = Test
812+attributes_test_5 = Test
851− { testName = "Character attributes: 240 color palette"
813+ { test_name = "Character attributes: 240 color palette"
852− , testID = "attributesTest5"
814+ , test_ID = "attributes_test_5"
853− , testAction = do
815+ , test_action = do
854− t <- standardIOConfig >>= outputForConfig
816+ t <- terminal_handle
855− reserveDisplay t
817+ reserve_display t
856− let pic = picForImage image
818+ let pic = pic_for_image image
857− image = vertCat $ map horizCat $ splitColorImages colorImages
819+ image = vert_cat $ map horiz_cat $ split_color_images color_images
858− colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
820+ color_images = map (\i -> string (current_attr `with_back_color` Color240 i) " ") [0..239]
859− splitColorImages [] = []
821+ split_color_images [] = []
860− splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
822+ split_color_images is = (take 20 is ++ [string def_attr " "]) : (split_color_images (drop 20 is))
861− d <- displayBounds t >>= displayContext t
823+ d <- display_bounds t >>= display_context t
862− outputPicture d pic
824+ output_picture d pic
864− releaseDisplay t
826+ release_display t
865− releaseTerminal t
827+ release_terminal t
866 return ()
828 return ()
867− , printSummary = do
829+ , print_summary = do
868− putStr $ [s|
830+ putStr $ [$heredoc|
869Once return is pressed:
831Once return is pressed:
870 0. The screen will be cleared.
832 0. The screen will be cleared.
871 1. The cursor will be hidden.
833 1. The cursor will be hidden.
872 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
834 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...
835 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:
839After return is pressed for the second time:
878 0. The screen containing the test summary should be restored.
840 0. The screen containing the test summary should be restored.
879 1. The cursor should be visible.
841 1. The cursor should be visible.
881− , confirmResults = do
843+ , confirm_results = do
882− putStr $ [s|
844+ putStr $ [$heredoc|
883Did the test output match the description?
845Did the test output match the description?
885− defaultSuccessConfirmResults
847+ default_success_confirm_results
888−inlineTest0 = Test
850+inline_test_0 = Test
889− { testName = "Verify styled output can be performed without clearing the screen."
851+ { test_name = "Verify styled output can be performed without clearing the screen."
890− , testID = "inlineTest0"
852+ , test_ID = "inline_test_0"
891− , testAction = do
853+ , test_action = do
854+ t <- terminal_handle
856+ put_attr_change t $ back_color red >> apply_style underline
892 putStrLn "line 1."
857 putStrLn "line 1."
893− putAttrChange_ $ backColor red >> applyStyle underline
858+ put_attr_change t $ default_all
894 putStrLn "line 2."
859 putStrLn "line 2."
895− putAttrChange_ $ defaultAll
860+ release_terminal t
897− , printSummary = putStr $ [s|
899−The second line "line 2" should have a red background and the text underline.
900−The third line "line 3" should be drawn in the same style as the first line.
903− , confirmResults = genericOutputMatchConfirm
907− { testName = "Verify styled output can be performed without clearing the screen."
908− , testID = "inlineTest1"
910− putStr "Not styled. "
911− putAttrChange_ $ backColor red >> applyStyle underline
913− putAttrChange_ $ defaultAll
914− putStrLn "Not styled."
915− , printSummary = putStr $ [s|
918− , confirmResults = genericOutputMatchConfirm
922− { testName = "Verify styled output can be performed without clearing the screen."
923− , testID = "inlineTest1"
925− putStr "Not styled. "
926− putAttrChange_ $ backColor red >> applyStyle underline
928− putAttrChange_ $ defaultAll
929− putStr "Not styled.\n"
930− , printSummary = putStr $ [s|
932− , confirmResults = genericOutputMatchConfirm
935−cursorHideTest0 :: Test
936−cursorHideTest0 = Test
937− { testName = "Verify the cursor is hid and re-shown. issue #7"
938− , testID = "cursorHideTest0"
940− vty <- mkVty defaultConfig
941− showCursor $ outputIface vty
942− setCursorPos (outputIface vty) 5 5
944− hideCursor $ outputIface vty
947 return ()
861 return ()
948− , printSummary = putStr $ [s|
862+ , print_summary = putStr $ [$heredoc|
949− 1. verify the cursor is displayed.
863+lines are in order.
950− 2. press enter
864+the second line "line 1" should have a red background and the text underline.
951− 3. verify the cursor is hid.
953− 5. the display should return to the state before the test.
955− , confirmResults = genericOutputMatchConfirm
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
1110−layer0 :: Test
867+ , 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 ()
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−蔰 虈觿, 腷腯葹 鍹餳駷 蛚袲褁蜸 皯竻 瀁瀎 蜭蜸覟 梪涫湴 揗斝湁 毼