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