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