@@ -6,9 +6,9 @@ import Graphics.Vty
66import Graphics.Vty.Attributes
77import Graphics.Vty.Inline
88import Graphics.Vty.Picture
9−import Graphics.Vty.Output
9+import Graphics.Vty.Terminal
10+import Graphics.Vty.DisplayRegion
1011
11−import Control.Concurrent (threadDelay)
1212import Control.Exception
1313import Control.Monad
1414
@@ -18,18 +18,18 @@ import Data.Monoid
1818import Data.String.QQ
1919import Data.Word
2020
21−import Foreign.Marshal.Array
21+import Foreign.Marshal.Array
2222
2323import qualified System.Environment as Env
2424
2525import System.IO ( hFlush, hPutStr, hPutBuf, stdout )
2626
2727main = do
28− printIntro
28+ print_intro
2929
30−outputFilePath = "test_results.list"
30+output_file_path = "test_results.list"
3131
32−printIntro = do
32+print_intro = do
3333 putStr $ [s|
3434This is an interactive verification program for the terminal input and output
3535support 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
3737performs as expected with your terminal.
3838
3939This program produces a file named
40− |] ++ outputFilePath ++ [s|
40+ |] ++ output_file_path ++ [s|
4141in the current directory that contains the results for each test assertion. This
4242can be emailed to coreyoconnor@gmail.com and used by the VTY authors to improve
4343support for your terminal. No personal information is contained in the report.
@@ -66,40 +66,41 @@ All the tests assume the following about the terminal display:
6666Thanks for the help! :-D
6767To exit the test early enter "q" anytime at the following menu screen.
6868
69−If any test fails then please post an issue to
69+If any test failed then please post an issue to
7070 https://github.com/coreyoconnor/vty/issues
71−with the test_results.list file pasted into the issue. A suitable summary is:
72−"interactive terminal test failure".
71+with the test_results.list file pasted into the issue. The issue summary can
72+mention the specific tests that failed or just say "interactive terminal test
73+failure".
7374|]
74− waitForReturn
75− results <- doTestMenu 1
76− envAttributes <- mapM ( \envName -> Control.Exception.catch ( Env.getEnv envName >>= return . (,) envName )
77− ( \ (_ :: SomeException) -> return (envName, "") )
78− )
79− [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
80− t <- standardIOConfig >>= outputForConfig
81− let resultsTxt = show envAttributes ++ "\n"
82− ++ terminalID t ++ "\n"
83− ++ show results ++ "\n"
84− releaseTerminal t
85− writeFile outputFilePath resultsTxt
86−
87−waitForReturn = do
75+ wait_for_return
76+ results <- do_test_menu 1
77+ env_attributes <- mapM ( \env_name -> Control.Exception.catch ( Env.getEnv env_name >>= return . (,) env_name )
78+ ( \ (_ :: SomeException) -> return (env_name, "") )
79+ )
80+ [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
81+ t <- current_terminal
82+ let results_txt = show env_attributes ++ "\n"
83+ ++ terminal_ID t ++ "\n"
84+ ++ show results ++ "\n"
85+ release_terminal t
86+ writeFile output_file_path results_txt
87+
88+wait_for_return = do
8889 putStr "\n(press return to continue)"
8990 hFlush stdout
9091 getLine
9192
92−testMenu :: [(String, Test)]
93−testMenu = zip (map show [1..]) allTests
93+test_menu :: [(String, Test)]
94+test_menu = zip (map show [1..]) all_tests
9495
95−doTestMenu :: Int -> IO [(String, Bool)]
96−doTestMenu nextID
97− | nextID > length allTests = do
98− putStrLn $ "Done! Please email the " ++ outputFilePath ++ " file to coreyoconnor@gmail.com"
96+do_test_menu :: Int -> IO [(String, Bool)]
97+do_test_menu next_ID
98+ | next_ID > length all_tests = do
99+ putStrLn $ "Done! Please email the " ++ output_file_path ++ " file to coreyoconnor@gmail.com"
99100 return []
100101 | otherwise = do
101− displayTestMenu
102− putStrLn $ "Press return to start with #" ++ show nextID ++ "."
102+ display_test_menu
103+ putStrLn $ "Press return to start with #" ++ show next_ID ++ "."
103104 putStrLn "Enter a test number to perform only that test."
104105 putStrLn "q (or control-C) to quit."
105106 putStr "> "
@@ -107,102 +108,100 @@ doTestMenu nextID
107108 s <- getLine >>= return . filter (/= '\n')
108109 case s of
109110 "q" -> return mempty
110− "" -> do
111− r <- runTest $ show nextID
112− rs <- doTestMenu ( nextID + 1 )
111+ "" -> do
112+ r <- run_test $ show next_ID
113+ rs <- do_test_menu ( next_ID + 1 )
113114 return $ r : rs
114− i | isJust ( lookup i testMenu ) -> do
115− r <- runTest i
116− rs <- doTestMenu ( read i + 1 )
115+ i | isJust ( lookup i test_menu ) -> do
116+ r <- run_test i
117+ rs <- do_test_menu ( read i + 1 )
117118 return $ r : rs
118119 where
119− displayTestMenu
120− = mapM_ displayTestMenu' testMenu
121− displayTestMenu' ( i, t )
122− = putStrLn $ ( if i == show nextID
123− then "> "
120+ display_test_menu
121+ = mapM_ display_test_menu' test_menu
122+ display_test_menu' ( i, t )
123+ = putStrLn $ ( if i == show next_ID
124+ then "> "
124125 else " "
125− ) ++ i ++ ". " ++ testName t
126−
127−runTest :: String -> IO (String, Bool)
128−runTest i = do
129− let t = fromJust $ lookup i testMenu
130− printSummary t
131− waitForReturn
132− testAction t
133− r <- confirmResults t
134− return (testID t, r)
135−
136−defaultSuccessConfirmResults = do
126+ ) ++ i ++ ". " ++ test_name t
127+
128+run_test :: String -> IO (String, Bool)
129+run_test i = do
130+ let t = fromJust $ lookup i test_menu
131+ print_summary t
132+ wait_for_return
133+ test_action t
134+ r <- confirm_results t
135+ return (test_ID t, r)
136+
137+default_success_confirm_results = do
137138 putStr "\n"
138139 putStr "[Y/n] "
139140 hFlush stdout
140141 r <- getLine
141142 case r of
142− "" -> return True
143+ "" -> return True
143144 "y" -> return True
144145 "Y" -> return True
145146 "n" -> return False
146147
147148data Test = Test
148− { testName :: String
149− , testID :: String
150− , testAction :: IO ()
151− , printSummary :: IO ()
152− , confirmResults :: IO Bool
149+ { test_name :: String
150+ , test_ID :: String
151+ , test_action :: IO ()
152+ , print_summary :: IO ()
153+ , confirm_results :: IO Bool
153154 }
154155
155−allTests
156− = [ reserveOutputTest
157− , displayBoundsTest0
158− , displayBoundsTest1
159− , displayBoundsTest2
160− , displayBoundsTest3
161− , unicodeSingleWidth0
162− , unicodeSingleWidth1
163− , unicodeDoubleWidth0
164− , unicodeDoubleWidth1
165− , attributesTest0
166− , attributesTest1
167− , attributesTest2
168− , attributesTest3
169− , attributesTest4
170− , attributesTest5
171− , inlineTest0
172− , inlineTest1
173− , inlineTest2
174− , cursorHideTest0
175− , vertCropTest0
176− , vertCropTest1
177− , vertCropTest2
178− , vertCropTest3
179− , horizCropTest0
180− , horizCropTest1
181− , horizCropTest2
182− , horizCropTest3
183− , layer0
184− , layer1
156+all_tests
157+ = [ reserve_output_test
158+ , display_bounds_test_0
159+ , display_bounds_test_1
160+ , display_bounds_test_2
161+ , display_bounds_test_3
162+ , unicode_single_width_0
163+ , unicode_single_width_1
164+ , unicode_double_width_0
165+ , unicode_double_width_1
166+ , attributes_test_0
167+ , attributes_test_1
168+ , attributes_test_2
169+ , attributes_test_3
170+ , attributes_test_4
171+ , attributes_test_5
172+ , inline_test_0
173+ , inline_test_1
174+ , inline_test_2
175+ , cursor_hide_test_0
176+ , vert_crop_test_0
177+ , vert_crop_test_1
178+ , vert_crop_test_2
179+ , vert_crop_test_3
180+ , horiz_crop_test_0
181+ , horiz_crop_test_1
182+ , horiz_crop_test_2
183+ , horiz_crop_test_3
185184 ]
186185
187−reserveOutputTest = Test
188− { testName = "Initialize and reserve terminal output then restore previous state."
189− , testID = "reserveOutputTest"
190− , testAction = do
191− t <- standardIOConfig >>= outputForConfig
192− reserveDisplay t
186+reserve_output_test = Test
187+ { test_name = "Initialize and reserve terminal output then restore previous state."
188+ , test_ID = "reserve_output_test"
189+ , test_action = do
190+ t <- current_terminal
191+ reserve_display t
193192 putStrLn "Line 1"
194193 putStrLn "Line 2"
195194 putStrLn "Line 3"
196195 putStrLn "Line 4 (press return)"
197196 hFlush stdout
198197 getLine
199− releaseDisplay t
200− releaseTerminal t
198+ release_display t
199+ release_terminal t
201200 return ()
202− , printSummary = do
201+ , print_summary = do
203202 putStr $ [s|
204203Once return is pressed:
205− 0. The screen will be cleared.
204+ 0. The screen will be cleared.
206205 1. Four lines of text should be visible.
207206 1. The cursor should be visible and at the start of the fifth line.
208207
@@ -210,123 +209,123 @@ After return is pressed for the second time this test then:
210209 * The screen containing the test summary should be restored;
211210 * The cursor is visible.
212211|]
213− , confirmResults = do
212+ , confirm_results = do
214213 putStr $ [s|
215214Did the test output match the description?
216215|]
217− defaultSuccessConfirmResults
216+ default_success_confirm_results
218217 }
219218
220−displayBoundsTest0 = Test
221− { testName = "Verify display bounds are correct test 0: Using spaces."
222− , testID = "displayBoundsTest0"
223− , testAction = do
224− t <- standardIOConfig >>= outputForConfig
225− reserveDisplay t
226− (w,h) <- displayBounds t
227− let row0 = replicate (fromEnum w) 'X' ++ "\n"
228− rowH = replicate (fromEnum w - 1) 'X'
229− rowN = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
230− image = row0 ++ (concat $ replicate (fromEnum h - 2) rowN) ++ rowH
219+display_bounds_test_0 = Test
220+ { test_name = "Verify display bounds are correct test 0: Using spaces."
221+ , test_ID = "display_bounds_test_0"
222+ , test_action = do
223+ t <- current_terminal
224+ reserve_display t
225+ DisplayRegion w h <- display_bounds t
226+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
227+ row_h = replicate (fromEnum w - 1) 'X'
228+ row_n = "X" ++ replicate (fromEnum w - 2) ' ' ++ "X\n"
229+ image = row_0 ++ (concat $ replicate (fromEnum h - 2) row_n) ++ row_h
231230 putStr image
232231 hFlush stdout
233232 getLine
234− releaseDisplay t
235− releaseTerminal t
233+ release_display t
234+ release_terminal t
236235 return ()
237− , printSummary = displayBoundsTestSummary True
238− , confirmResults = genericOutputMatchConfirm
236+ , print_summary = display_bounds_test_summary True
237+ , confirm_results = generic_output_match_confirm
239238 }
240239
241−displayBoundsTest1 = Test
242− { testName = "Verify display bounds are correct test 0: Using cursor movement."
243− , testID = "displayBoundsTest1"
244− , testAction = do
245− t <- standardIOConfig >>= outputForConfig
246− reserveDisplay t
247− (w,h) <- displayBounds t
248− setCursorPos t 0 0
249− let row0 = replicate (fromEnum w) 'X' ++ "\n"
250− putStr row0
240+display_bounds_test_1 = Test
241+ { test_name = "Verify display bounds are correct test 0: Using cursor movement."
242+ , test_ID = "display_bounds_test_1"
243+ , test_action = do
244+ t <- current_terminal
245+ reserve_display t
246+ DisplayRegion w h <- display_bounds t
247+ set_cursor_pos t 0 0
248+ let row_0 = replicate (fromEnum w) 'X' ++ "\n"
249+ putStr row_0
251250 forM_ [1 .. h - 2] $ \y -> do
252− setCursorPos t 0 y
251+ set_cursor_pos t 0 y
253252 putStr "X"
254253 hFlush stdout
255− setCursorPos t (w - 1) y
254+ set_cursor_pos t (w - 1) y
256255 putStr "X"
257256 hFlush stdout
258− setCursorPos t 0 (h - 1)
259− let rowH = replicate (fromEnum w - 1) 'X'
260− putStr rowH
257+ set_cursor_pos t 0 (h - 1)
258+ let row_h = replicate (fromEnum w - 1) 'X'
259+ putStr row_h
261260 hFlush stdout
262261 getLine
263− releaseDisplay t
264− releaseTerminal t
262+ release_display t
263+ release_terminal t
265264 return ()
266− , printSummary = displayBoundsTestSummary True
267− , confirmResults = genericOutputMatchConfirm
265+ , print_summary = display_bounds_test_summary True
266+ , confirm_results = generic_output_match_confirm
268267 }
269268
270−displayBoundsTest2 = Test
271− { testName = "Verify display bounds are correct test 0: Using Image ops."
272− , testID = "displayBoundsTest2"
273− , testAction = do
274− t <- standardIOConfig >>= outputForConfig
275− reserveDisplay t
276− bounds@(w,h) <- displayBounds t
277− let firstRow = horizCat $ replicate (fromEnum w) (char defAttr 'X')
278− middleRows = vertCat $ replicate (fromEnum h - 2) middleRow
279− middleRow = (char defAttr 'X') <|> backgroundFill (w - 2) 1 <|> (char defAttr 'X')
280− endRow = firstRow
281− image = firstRow <-> middleRows <-> endRow
282− pic = (picForImage image) { picCursor = Cursor (w - 1) (h - 1) }
283− d <- displayContext t bounds
284− outputPicture d pic
269+display_bounds_test_2 = Test
270+ { test_name = "Verify display bounds are correct test 0: Using Image ops."
271+ , test_ID = "display_bounds_test_2"
272+ , test_action = do
273+ t <- current_terminal
274+ reserve_display t
275+ bounds@(DisplayRegion w h) <- display_bounds t
276+ let first_row = horiz_cat $ replicate (fromEnum w) (char def_attr 'X')
277+ middle_rows = vert_cat $ replicate (fromEnum h - 2) middle_row
278+ middle_row = (char def_attr 'X') <|> background_fill (w - 2) 1 <|> (char def_attr 'X')
279+ end_row = first_row
280+ image = first_row <-> middle_rows <-> end_row
281+ pic = (pic_for_image image) { pic_cursor = Cursor (w - 1) (h - 1) }
282+ d <- display_context t bounds
283+ output_picture d pic
285284 getLine
286− releaseDisplay t
287− releaseTerminal t
285+ release_display t
286+ release_terminal t
288287 return ()
289− , printSummary = displayBoundsTestSummary True
290− , confirmResults = genericOutputMatchConfirm
288+ , print_summary = display_bounds_test_summary True
289+ , confirm_results = generic_output_match_confirm
291290 }
292291
293−displayBoundsTest3 = Test
294− { testName = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
295− , testID = "displayBoundsTest3"
296− , testAction = do
297− t <- standardIOConfig >>= outputForConfig
298− reserveDisplay t
299− (w,h) <- displayBounds t
300− hideCursor t
301− setCursorPos t 0 0
302− let row0 = replicate (fromEnum w) 'X'
303− putStrLn row0
292+display_bounds_test_3 = Test
293+ { test_name = "Verify display bounds are correct test 0: Hide cursor; Set cursor pos."
294+ , test_ID = "display_bounds_test_3"
295+ , test_action = do
296+ t <- current_terminal
297+ reserve_display t
298+ DisplayRegion w h <- display_bounds t
299+ hide_cursor t
300+ set_cursor_pos t 0 0
301+ let row_0 = replicate (fromEnum w) 'X'
302+ putStrLn row_0
304303 forM_ [1 .. h - 2] $ \y -> do
305− setCursorPos t 0 y
304+ set_cursor_pos t 0 y
306305 putStr "X"
307306 hFlush stdout
308− setCursorPos t (w - 1) y
307+ set_cursor_pos t (w - 1) y
309308 putStr "X"
310309 hFlush stdout
311− setCursorPos t 0 (h - 1)
312− let rowH = row0
313− putStr rowH
310+ set_cursor_pos t 0 (h - 1)
311+ let row_h = row_0
312+ putStr row_h
314313 hFlush stdout
315314 getLine
316− showCursor t
317− releaseDisplay t
318− releaseTerminal t
315+ show_cursor t
316+ release_display t
317+ release_terminal t
319318 return ()
320− , printSummary = displayBoundsTestSummary False
321− , confirmResults = genericOutputMatchConfirm
319+ , print_summary = display_bounds_test_summary False
320+ , confirm_results = generic_output_match_confirm
322321 }
323322
324−displayBoundsTestSummary hasCursor = do
323+display_bounds_test_summary has_cursor = do
325324 putStr $ [s|
326325Once return is pressed:
327326 0. The screen will be cleared.
328327|]
329− if hasCursor
328+ if has_cursor
330329 then putStr " 1. The cursor will be visible."
331330 else putStr " 1. The cursor will NOT be visible."
332331 putStr [s|
@@ -337,7 +336,7 @@ Once return is pressed:
337336 |XXXXXXXXXXXXX|
338337 |X X||]
339338
340− if hasCursor
339+ if has_cursor
341340 then putStr $ [s|
342341
343342 |XXXXXXXXXXXXC| |]
@@ -358,13 +357,13 @@ After return is pressed for the second time:
358357 1. The cursor should be visible.
359358|]
360359
361−genericOutputMatchConfirm = do
360+generic_output_match_confirm = do
362361 putStr $ [s|
363362Did the test output match the description?
364363|]
365− defaultSuccessConfirmResults
364+ default_success_confirm_results
366365
367−-- Explicitly define the bytes that encode each example text.
366+-- Explicitely definethe bytes that encode each example text.
368367-- This avoids any issues with how the compiler represents string literals.
369368--
370369-- This document is UTF-8 encoded so the UTF-8 string is still included for
@@ -373,24 +372,24 @@ Did the test output match the description?
373372-- It's assumed the compiler will at least not barf on UTF-8 encoded text in
374373-- comments ;-)
375374--
376−-- txt0 = ↑↑↓↓←→←→BA
377−
378−utf8Txt0 :: [[Word8]]
379−utf8Txt0 = [ [ 0xe2 , 0x86 , 0x91 ]
380− , [ 0xe2 , 0x86 , 0x91 ]
381− , [ 0xe2 , 0x86 , 0x93 ]
382− , [ 0xe2 , 0x86 , 0x93 ]
383− , [ 0xe2 , 0x86 , 0x90 ]
384− , [ 0xe2 , 0x86 , 0x92 ]
385− , [ 0xe2 , 0x86 , 0x90 ]
386− , [ 0xe2 , 0x86 , 0x92 ]
387− , [ 0x42 ]
388− , [ 0x41 ]
389− ]
390−
391−iso10646Txt0 :: String
392−iso10646Txt0 = map toEnum
393− [ 8593
375+-- txt_0 = ↑↑↓↓←→←→BA
376+
377+utf8_txt_0 :: [[Word8]]
378+utf8_txt_0 = [ [ 0xe2 , 0x86 , 0x91 ]
379+ , [ 0xe2 , 0x86 , 0x91 ]
380+ , [ 0xe2 , 0x86 , 0x93 ]
381+ , [ 0xe2 , 0x86 , 0x93 ]
382+ , [ 0xe2 , 0x86 , 0x90 ]
383+ , [ 0xe2 , 0x86 , 0x92 ]
384+ , [ 0xe2 , 0x86 , 0x90 ]
385+ , [ 0xe2 , 0x86 , 0x92 ]
386+ , [ 0x42 ]
387+ , [ 0x41 ]
388+ ]
389+
390+iso_10646_txt_0 :: String
391+iso_10646_txt_0 = map toEnum
392+ [ 8593
394393 , 8593
395394 , 8595
396395 , 8595
@@ -402,46 +401,46 @@ iso10646Txt0 = map toEnum
402401 , 65
403402 ]
404403
405−unicodeSingleWidth0 = Test
406− { testName = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
407− , testID = "unicodeSingleWidth0"
408− , testAction = do
409− t <- standardIOConfig >>= outputForConfig
410− reserveDisplay t
411− hideCursor t
412− withArrayLen (concat utf8Txt0) (flip $ hPutBuf stdout)
404+unicode_single_width_0 = Test
405+ { test_name = "Verify terminal can display unicode single-width characters. (Direct UTF-8)"
406+ , test_ID = "unicode_single_width_0"
407+ , test_action = do
408+ t <- current_terminal
409+ reserve_display t
410+ hide_cursor t
411+ withArrayLen (concat utf8_txt_0) (flip $ hPutBuf stdout)
413412 hPutStr stdout "\n"
414413 hPutStr stdout "0123456789\n"
415414 hFlush stdout
416415 getLine
417− releaseDisplay t
418− releaseTerminal t
416+ release_display t
417+ release_terminal t
419418 return ()
420− , printSummary = unicodeSingleWidthSummary
421− , confirmResults = genericOutputMatchConfirm
419+ , print_summary = unicode_single_width_summary
420+ , confirm_results = generic_output_match_confirm
422421 }
423422
424−unicodeSingleWidth1 = Test
425− { testName = "Verify terminal can display unicode single-width characters. (Image ops)"
426− , testID = "unicodeSingleWidth1"
427− , testAction = do
428− t <- standardIOConfig >>= outputForConfig
429− reserveDisplay t
430− let pic = picForImage image
431− image = line0 <-> line1
432− line0 = iso10646String defAttr iso10646Txt0
433− line1 = string defAttr "0123456789"
434− d <- displayBounds t >>= displayContext t
435− outputPicture d pic
423+unicode_single_width_1 = Test
424+ { test_name = "Verify terminal can display unicode single-width characters. (Image ops)"
425+ , test_ID = "unicode_single_width_1"
426+ , test_action = do
427+ t <- current_terminal
428+ reserve_display t
429+ let pic = pic_for_image image
430+ image = line_0 <-> line_1
431+ line_0 = iso_10646_string def_attr iso_10646_txt_0
432+ line_1 = string def_attr "0123456789"
433+ d <- display_bounds t >>= display_context t
434+ output_picture d pic
436435 getLine
437− releaseDisplay t
438− releaseTerminal t
436+ release_display t
437+ release_terminal t
439438 return ()
440− , printSummary = unicodeSingleWidthSummary
441− , confirmResults = genericOutputMatchConfirm
439+ , print_summary = unicode_single_width_summary
440+ , confirm_results = generic_output_match_confirm
442441 }
443442
444−unicodeSingleWidthSummary = putStr [s|
443+unicode_single_width_summary = putStr [s|
445444Once return is pressed:
446445 0. The screen will be cleared.
447446 1. The cursor will be hidden.
@@ -475,55 +474,55 @@ After return is pressed for the second time:
475474
476475-- The second example is a unicode string containing double-width glyphs
477476-- 你好吗
478−utf8Txt1 :: [[Word8]]
479−utf8Txt1 = [ [0xe4,0xbd,0xa0]
480− , [0xe5,0xa5,0xbd]
481− , [0xe5,0x90,0x97]
482− ]
483−
484−iso10646Txt1 :: String
485−iso10646Txt1 = map toEnum [20320,22909,21527]
486−
487−unicodeDoubleWidth0 = Test
488− { testName = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
489− , testID = "unicodeDoubleWidth0"
490− , testAction = do
491− t <- standardIOConfig >>= outputForConfig
492− reserveDisplay t
493− hideCursor t
494− withArrayLen (concat utf8Txt1) (flip $ hPutBuf stdout)
477+utf8_txt_1 :: [[Word8]]
478+utf8_txt_1 = [ [0xe4,0xbd,0xa0]
479+ , [0xe5,0xa5,0xbd]
480+ , [0xe5,0x90,0x97]
481+ ]
482+
483+iso_10646_txt_1 :: String
484+iso_10646_txt_1 = map toEnum [20320,22909,21527]
485+
486+unicode_double_width_0 = Test
487+ { test_name = "Verify terminal can display unicode double-width characters. (Direct UTF-8)"
488+ , test_ID = "unicode_double_width_0"
489+ , test_action = do
490+ t <- current_terminal
491+ reserve_display t
492+ hide_cursor t
493+ withArrayLen (concat utf8_txt_1) (flip $ hPutBuf stdout)
495494 hPutStr stdout "\n"
496495 hPutStr stdout "012345\n"
497496 hFlush stdout
498497 getLine
499− releaseDisplay t
500− releaseTerminal t
498+ release_display t
499+ release_terminal t
501500 return ()
502− , printSummary = unicodeDoubleWidthSummary
503− , confirmResults = genericOutputMatchConfirm
501+ , print_summary = unicode_double_width_summary
502+ , confirm_results = generic_output_match_confirm
504503 }
505504
506−unicodeDoubleWidth1 = Test
507− { testName = "Verify terminal can display unicode double-width characters. (Image ops)"
508− , testID = "unicodeDoubleWidth1"
509− , testAction = do
510− t <- standardIOConfig >>= outputForConfig
511− reserveDisplay t
512− let pic = picForImage image
513− image = line0 <-> line1
514− line0 = iso10646String defAttr iso10646Txt1
515− line1 = string defAttr "012345"
516− d <- displayBounds t >>= displayContext t
517− outputPicture d pic
505+unicode_double_width_1 = Test
506+ { test_name = "Verify terminal can display unicode double-width characters. (Image ops)"
507+ , test_ID = "unicode_double_width_1"
508+ , test_action = do
509+ t <- current_terminal
510+ reserve_display t
511+ let pic = pic_for_image image
512+ image = line_0 <-> line_1
513+ line_0 = iso_10646_string def_attr iso_10646_txt_1
514+ line_1 = string def_attr "012345"
515+ d <- display_bounds t >>= display_context t
516+ output_picture d pic
518517 getLine
519− releaseDisplay t
520− releaseTerminal t
518+ release_display t
519+ release_terminal t
521520 return ()
522− , printSummary = unicodeDoubleWidthSummary
523− , confirmResults = genericOutputMatchConfirm
521+ , print_summary = unicode_double_width_summary
522+ , confirm_results = generic_output_match_confirm
524523 }
525524
526−unicodeDoubleWidthSummary = putStr [s|
525+unicode_double_width_summary = putStr [s|
527526Once return is pressed:
528527 0. The screen will be cleared.
529528 1. The cursor will be hidden.
@@ -550,32 +549,32 @@ After return is pressed for the second time:
550549 1. The cursor should be visible.
551550|]
552551
553−allColors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
554− [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
552+all_colors = zip [ black, red, green, yellow, blue, magenta, cyan, white ]
553+ [ "black", "red", "green", "yellow", "blue", "magenta", "cyan", "white" ]
555554
556−allBrightColors
557− = zip [ brightBlack, brightRed, brightGreen, brightYellow, brightBlue, brightMagenta, brightCyan, brightWhite ]
555+all_bright_colors
556+ = zip [ bright_black, bright_red, bright_green, bright_yellow, bright_blue, bright_magenta, bright_cyan, bright_white ]
558557 [ "bright black", "bright red", "bright green", "bright yellow", "bright blue", "bright magenta", "bright cyan", "bright white" ]
559558
560−attributesTest0 = Test
561− { testName = "Character attributes: foreground colors."
562− , testID = "attributesTest0"
563− , testAction = do
564− t <- standardIOConfig >>= outputForConfig
565− reserveDisplay t
566− let pic = picForImage image
567− image = border <|> column0 <|> border <|> column1 <|> border
568− column0 = vertCat $ map lineWithColor allColors
569− border = vertCat $ replicate (length allColors) $ string defAttr " | "
570− column1 = vertCat $ map (string defAttr . snd) allColors
571− lineWithColor (c, cName) = string (defAttr `withForeColor` c) cName
572− d <- displayBounds t >>= displayContext t
573− outputPicture d pic
559+attributes_test_0 = Test
560+ { test_name = "Character attributes: foreground colors."
561+ , test_ID = "attributes_test_0"
562+ , test_action = do
563+ t <- current_terminal
564+ reserve_display t
565+ let pic = pic_for_image image
566+ image = border <|> column_0 <|> border <|> column_1 <|> border
567+ column_0 = vert_cat $ map line_with_color all_colors
568+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
569+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
570+ line_with_color (c, c_name) = string (def_attr `with_fore_color` c) c_name
571+ d <- display_bounds t >>= display_context t
572+ output_picture d pic
574573 getLine
575− releaseDisplay t
576− releaseTerminal t
574+ release_display t
575+ release_terminal t
577576 return ()
578− , printSummary = do
577+ , print_summary = do
579578 putStr $ [s|
580579Once return is pressed:
581580 0. The screen will be cleared.
@@ -596,32 +595,32 @@ After return is pressed for the second time:
596595 0. The screen containing the test summary should be restored.
597596 1. The cursor should be visible.
598597|]
599− , confirmResults = do
598+ , confirm_results = do
600599 putStr $ [s|
601600Did the test output match the description?
602601|]
603− defaultSuccessConfirmResults
602+ default_success_confirm_results
604603 }
605604
606−attributesTest1 = Test
607− { testName = "Character attributes: background colors."
608− , testID = "attributesTest1"
609− , testAction = do
610− t <- standardIOConfig >>= outputForConfig
611− reserveDisplay t
612− let pic = picForImage image
613− image = border <|> column0 <|> border <|> column1 <|> border
614− column0 = vertCat $ map lineWithColor allColors
615− border = vertCat $ replicate (length allColors) $ string defAttr " | "
616− column1 = vertCat $ map (string defAttr . snd) allColors
617− lineWithColor (c, cName) = string (defAttr `withBackColor` c) cName
618− d <- displayBounds t >>= displayContext t
619− outputPicture d pic
605+attributes_test_1 = Test
606+ { test_name = "Character attributes: background colors."
607+ , test_ID = "attributes_test_1"
608+ , test_action = do
609+ t <- current_terminal
610+ reserve_display t
611+ let pic = pic_for_image image
612+ image = border <|> column_0 <|> border <|> column_1 <|> border
613+ column_0 = vert_cat $ map line_with_color all_colors
614+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
615+ column_1 = vert_cat $ map (string def_attr . snd) all_colors
616+ line_with_color (c, c_name) = string (def_attr `with_back_color` c) c_name
617+ d <- display_bounds t >>= display_context t
618+ output_picture d pic
620619 getLine
621− releaseDisplay t
622− releaseTerminal t
620+ release_display t
621+ release_terminal t
623622 return ()
624− , printSummary = do
623+ , print_summary = do
625624 putStr $ [s|
626625Once return is pressed:
627626 0. The screen will be cleared.
@@ -651,57 +650,57 @@ After return is pressed for the second time:
651650 0. The screen containing the test summary should be restored.
652651 1. The cursor should be visible.
653652|]
654− , confirmResults = do
653+ , confirm_results = do
655654 putStr $ [s|
656655Did the test output match the description?
657656|]
658− defaultSuccessConfirmResults
657+ default_success_confirm_results
659658 }
660659
661−attributesTest2 = Test
662− { testName = "Character attributes: Vivid foreground colors."
663− , testID = "attributesTest2"
664− , testAction = do
665− t <- standardIOConfig >>= outputForConfig
666− reserveDisplay t
667− let pic = picForImage image
668− image = horizCat [border, column0, border, column1, border, column2, border]
669− border = vertCat $ replicate (length allColors) $ string defAttr " | "
670− column0 = vertCat $ map lineWithColor0 allColors
671− column1 = vertCat $ map lineWithColor1 allBrightColors
672− column2 = vertCat $ map (string defAttr . snd) allColors
673− lineWithColor0 (c, cName) = string (defAttr `withForeColor` c) cName
674− lineWithColor1 (c, cName) = string (defAttr `withForeColor` c) cName
675− d <- displayBounds t >>= displayContext t
676− outputPicture d pic
660+attributes_test_2 = Test
661+ { test_name = "Character attributes: Vivid foreground colors."
662+ , test_ID = "attributes_test_2"
663+ , test_action = do
664+ t <- current_terminal
665+ reserve_display t
666+ let pic = pic_for_image image
667+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
668+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
669+ column_0 = vert_cat $ map line_with_color_0 all_colors
670+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
671+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
672+ line_with_color_0 (c, c_name) = string (def_attr `with_fore_color` c) c_name
673+ line_with_color_1 (c, c_name) = string (def_attr `with_fore_color` c) c_name
674+ d <- display_bounds t >>= display_context t
675+ output_picture d pic
677676 getLine
678− releaseDisplay t
679− releaseTerminal t
677+ release_display t
678+ release_terminal t
680679 return ()
681− , printSummary = do
680+ , print_summary = do
682681 putStr $ [s|
683682Once return is pressed:
684683 0. The screen will be cleared.
685684 1. The cursor will be hidden.
686685 2. 9 lines of text in three columns will be drawn:
687686 a. The first column will be a name of a standard color (for an 8 color
688− terminal) rendered with that color as the foreground color.
687+ terminal) rendered with that color as the foreground color.
689688 b. The next column will be also be the name of a standard color rendered
690689 with that color as the foreground color but the shade used should be
691− more vivid than the shade used in the first column.
690+ more vivid than the shade used in the first column.
692691 c. The final column will be the name of a color rendered with the
693692 default attributes.
694693
695694For instance, one line will be the word "magenta" and that word should be
696−rendered in the magenta color.
695+rendered in the magenta color.
697696
698697I'm not actually sure exactly what "vivid" means in this context. For xterm the
699−vivid colors are brighter.
698+vivid colors are brighter.
700699
701−Verify:
700+Verify:
702701 * The first column: The foreground color matches the named color.
703702 * The second column: The foreground color matches the named color but is
704− more vivid than the color used in the first column.
703+ more vivid than the color used in the first column.
705704 * The third column: All text is rendered with the default attributes.
706705 * The vertical bars used in each line to mark the border of a column are
707706 lined up.
@@ -710,34 +709,34 @@ After return is pressed for the second time:
710709 0. The screen containing the test summary should be restored.
711710 1. The cursor should be visible.
712711|]
713− , confirmResults = do
712+ , confirm_results = do
714713 putStr $ [s|
715714Did the test output match the description?
716715|]
717− defaultSuccessConfirmResults
716+ default_success_confirm_results
718717 }
719718
720−attributesTest3 = Test
721− { testName = "Character attributes: Vivid background colors."
722− , testID = "attributesTest3"
723− , testAction = do
724− t <- standardIOConfig >>= outputForConfig
725− reserveDisplay t
726− let pic = picForImage image
727− image = horizCat [border, column0, border, column1, border, column2, border]
728− border = vertCat $ replicate (length allColors) $ string defAttr " | "
729− column0 = vertCat $ map lineWithColor0 allColors
730− column1 = vertCat $ map lineWithColor1 allBrightColors
731− column2 = vertCat $ map (string defAttr . snd) allColors
732− lineWithColor0 (c, cName) = string (defAttr `withBackColor` c) cName
733− lineWithColor1 (c, cName) = string (defAttr `withBackColor` c) cName
734− d <- displayBounds t >>= displayContext t
735− outputPicture d pic
719+attributes_test_3 = Test
720+ { test_name = "Character attributes: Vivid background colors."
721+ , test_ID = "attributes_test_3"
722+ , test_action = do
723+ t <- current_terminal
724+ reserve_display t
725+ let pic = pic_for_image image
726+ image = horiz_cat [border, column_0, border, column_1, border, column_2, border]
727+ border = vert_cat $ replicate (length all_colors) $ string def_attr " | "
728+ column_0 = vert_cat $ map line_with_color_0 all_colors
729+ column_1 = vert_cat $ map line_with_color_1 all_bright_colors
730+ column_2 = vert_cat $ map (string def_attr . snd) all_colors
731+ line_with_color_0 (c, c_name) = string (def_attr `with_back_color` c) c_name
732+ line_with_color_1 (c, c_name) = string (def_attr `with_back_color` c) c_name
733+ d <- display_bounds t >>= display_context t
734+ output_picture d pic
736735 getLine
737− releaseDisplay t
738− releaseTerminal t
736+ release_display t
737+ release_terminal t
739738 return ()
740− , printSummary = do
739+ , print_summary = do
741740 putStr $ [s|
742741Once return is pressed:
743742 0. The screen will be cleared.
@@ -745,23 +744,23 @@ Once return is pressed:
745744 2. 9 lines of text in three columns will be drawn:
746745 a. The first column will contain be a name of a standard color for an 8
747746 color terminal rendered with the default foreground color with a
748− background the named color.
747+ background the named color.
749748 b. The first column will contain be a name of a standard color for an 8
750749 color terminal rendered with the default foreground color with the
751− background a vivid version of the named color.
750+ background a vivid version of the named color.
752751 c. The third column will be the name of a standard color rendered with
753752 the default attributes.
754−
753+
755754For instance, one line will contain be the word "magenta" and the word should
756−be rendered in the default foreground color over a magenta background.
755+be rendered in the default foreground color over a magenta background.
757756
758757I'm not actually sure exactly what "vivid" means in this context. For xterm the
759758vivid colors are brighter.
760759
761−Verify:
760+Verify:
762761 * The first column: The background color matches the named color.
763762 * The second column: The background color matches the named color and is
764− more vivid than the color used in the first column.
763+ more vivid than the color used in the first column.
765764 * The third column column: All text is rendered with the default attributes.
766765 * The vertical bars used in each line to mark the border of a column are
767766 lined up.
@@ -777,51 +776,51 @@ After return is pressed for the second time:
777776 0. The screen containing the test summary should be restored.
778777 1. The cursor should be visible.
779778|]
780− , confirmResults = do
779+ , confirm_results = do
781780 putStr $ [s|
782781Did the test output match the description?
783782|]
784− defaultSuccessConfirmResults
783+ default_success_confirm_results
785784 }
786785
787−attrCombos =
786+attr_combos =
788787 [ ( "default", id )
789− , ( "bold", flip withStyle bold )
790− , ( "blink", flip withStyle blink )
791− , ( "underline", flip withStyle underline )
792− , ( "bold + blink", flip withStyle (bold + blink) )
793− , ( "bold + underline", flip withStyle (bold + underline) )
794− , ( "underline + blink", flip withStyle (underline + blink) )
795− , ( "bold + blink + underline", flip withStyle (bold + blink + underline) )
788+ , ( "bold", flip with_style bold )
789+ , ( "blink", flip with_style blink )
790+ , ( "underline", flip with_style underline )
791+ , ( "bold + blink", flip with_style (bold + blink) )
792+ , ( "bold + underline", flip with_style (bold + underline) )
793+ , ( "underline + blink", flip with_style (underline + blink) )
794+ , ( "bold + blink + underline", flip with_style (bold + blink + underline) )
796795 ]
797796
798−attributesTest4 = Test
799− { testName = "Character attributes: Bold; Blink; Underline."
800− , testID = "attributesTest4"
801− , testAction = do
802− t <- standardIOConfig >>= outputForConfig
803− reserveDisplay t
804− let pic = picForImage image
805− image = horizCat [border, column0, border, column1, border]
806− border = vertCat $ replicate (length attrCombos) $ string defAttr " | "
807− column0 = vertCat $ map lineWithAttrs attrCombos
808− column1 = vertCat $ map (string defAttr . fst) attrCombos
809− lineWithAttrs (desc, attrF) = string (attrF defAttr) desc
810− d <- displayBounds t >>= displayContext t
811− outputPicture d pic
797+attributes_test_4 = Test
798+ { test_name = "Character attributes: Bold; Blink; Underline."
799+ , test_ID = "attributes_test_4"
800+ , test_action = do
801+ t <- current_terminal
802+ reserve_display t
803+ let pic = pic_for_image image
804+ image = horiz_cat [border, column_0, border, column_1, border]
805+ border = vert_cat $ replicate (length attr_combos) $ string def_attr " | "
806+ column_0 = vert_cat $ map line_with_attrs attr_combos
807+ column_1 = vert_cat $ map (string def_attr . fst) attr_combos
808+ line_with_attrs (desc, attr_f) = string (attr_f def_attr) desc
809+ d <- display_bounds t >>= display_context t
810+ output_picture d pic
812811 getLine
813− releaseDisplay t
814− releaseTerminal t
812+ release_display t
813+ release_terminal t
815814 return ()
816− , printSummary = do
815+ , print_summary = do
817816 putStr $ [s|
818817Once return is pressed:
819818 0. The screen will be cleared.
820819 1. The cursor will be hidden.
821− 2. 8 rows of text in two columns.
820+ 2. 8 rows of text in two columns.
822821 The rows will contain the following text:
823822 default
824− bold
823+ bold
825824 blink
826825 underline
827826 bold + blink
@@ -830,8 +829,8 @@ Once return is pressed:
830829 bold + blink + underline
831830 The first column will be rendered with the described attributes. The second
832831 column will be rendered with the default attributes.
833−
834−Verify:
832+
833+Verify:
835834 * The vertical bars used in each line to mark the border of a column are
836835 lined up.
837836 * The text in the first column is rendered as described.
@@ -840,31 +839,31 @@ After return is pressed for the second time:
840839 0. The screen containing the test summary should be restored.
841840 1. The cursor should be visible.
842841|]
843− , confirmResults = do
842+ , confirm_results = do
844843 putStr $ [s|
845844Did the test output match the description?
846845|]
847− defaultSuccessConfirmResults
846+ default_success_confirm_results
848847 }
849848
850−attributesTest5 = Test
851− { testName = "Character attributes: 240 color palette"
852− , testID = "attributesTest5"
853− , testAction = do
854− t <- standardIOConfig >>= outputForConfig
855− reserveDisplay t
856− let pic = picForImage image
857− image = vertCat $ map horizCat $ splitColorImages colorImages
858− colorImages = map (\i -> string (currentAttr `withBackColor` Color240 i) " ") [0..239]
859− splitColorImages [] = []
860− splitColorImages is = (take 20 is ++ [string defAttr " "]) : (splitColorImages (drop 20 is))
861− d <- displayBounds t >>= displayContext t
862− outputPicture d pic
849+attributes_test_5 = Test
850+ { test_name = "Character attributes: 240 color palette"
851+ , test_ID = "attributes_test_5"
852+ , test_action = do
853+ t <- current_terminal
854+ reserve_display t
855+ let pic = pic_for_image image
856+ image = vert_cat $ map horiz_cat $ split_color_images color_images
857+ color_images = map (\i -> string (current_attr `with_back_color` Color240 i) " ") [0..239]
858+ split_color_images [] = []
859+ split_color_images is = (take 20 is ++ [string def_attr " "]) : (split_color_images (drop 20 is))
860+ d <- display_bounds t >>= display_context t
861+ output_picture d pic
863862 getLine
864− releaseDisplay t
865− releaseTerminal t
863+ release_display t
864+ release_terminal t
866865 return ()
867− , printSummary = do
866+ , print_summary = do
868867 putStr $ [s|
869868Once return is pressed:
870869 0. The screen will be cleared.
@@ -872,304 +871,239 @@ Once return is pressed:
872871 2. A 20 character wide and 12 row high block of color squares. This should look like a palette
873872 of some sort. I'm not exactly sure if all color terminals use the same palette. I doubt it...
874873
875−Verify:
874+Verify:
876875
877876After return is pressed for the second time:
878877 0. The screen containing the test summary should be restored.
879878 1. The cursor should be visible.
880879|]
881− , confirmResults = do
880+ , confirm_results = do
882881 putStr $ [s|
883882Did the test output match the description?
884883|]
885− defaultSuccessConfirmResults
884+ default_success_confirm_results
886885 }
887886
888−inlineTest0 = Test
889− { testName = "Verify styled output can be performed without clearing the screen."
890− , testID = "inlineTest0"
891− , testAction = do
887+inline_test_0 = Test
888+ { test_name = "Verify styled output can be performed without clearing the screen."
889+ , test_ID = "inline_test_0"
890+ , test_action = do
892891 putStrLn "line 1."
893− putAttrChange_ $ backColor red >> applyStyle underline
892+ put_attr_change_ $ back_color red >> apply_style underline
894893 putStrLn "line 2."
895− putAttrChange_ $ defaultAll
894+ put_attr_change_ $ default_all
896895 putStrLn "line 3."
897− , printSummary = putStr $ [s|
896+ , print_summary = putStr $ [s|
898897lines are in order.
899898The second line "line 2" should have a red background and the text underline.
900899The third line "line 3" should be drawn in the same style as the first line.
901900|]
902901
903− , confirmResults = genericOutputMatchConfirm
902+ , confirm_results = generic_output_match_confirm
904903 }
905904
906−inlineTest1 = Test
907− { testName = "Verify styled output can be performed without clearing the screen."
908− , testID = "inlineTest1"
909− , testAction = do
905+inline_test_1 = Test
906+ { test_name = "Verify styled output can be performed without clearing the screen."
907+ , test_ID = "inline_test_1"
908+ , test_action = do
910909 putStr "Not styled. "
911− putAttrChange_ $ backColor red >> applyStyle underline
910+ put_attr_change_ $ back_color red >> apply_style underline
912911 putStr " Styled! "
913− putAttrChange_ $ defaultAll
912+ put_attr_change_ $ default_all
914913 putStrLn "Not styled."
915− , printSummary = putStr $ [s|
914+ , print_summary = putStr $ [s|
916915|]
917916
918− , confirmResults = genericOutputMatchConfirm
917+ , confirm_results = generic_output_match_confirm
919918 }
920919
921−inlineTest2 = Test
922− { testName = "Verify styled output can be performed without clearing the screen."
923− , testID = "inlineTest1"
924− , testAction = do
920+inline_test_2 = Test
921+ { test_name = "Verify styled output can be performed without clearing the screen."
922+ , test_ID = "inline_test_1"
923+ , test_action = do
925924 putStr "Not styled. "
926− putAttrChange_ $ backColor red >> applyStyle underline
925+ put_attr_change_ $ back_color red >> apply_style underline
927926 putStr " Styled! "
928− putAttrChange_ $ defaultAll
927+ put_attr_change_ $ default_all
929928 putStr "Not styled.\n"
930− , printSummary = putStr $ [s|
929+ , print_summary = putStr $ [s|
931930|]
932− , confirmResults = genericOutputMatchConfirm
931+ , confirm_results = generic_output_match_confirm
933932 }
934933
935−cursorHideTest0 :: Test
936−cursorHideTest0 = Test
937− { testName = "Verify the cursor is hid and re-shown. issue #7"
938− , testID = "cursorHideTest0"
939− , testAction = do
940− vty <- mkVty defaultConfig
941− showCursor $ outputIface vty
942− setCursorPos (outputIface vty) 5 5
943− nextEvent vty
944− hideCursor $ outputIface vty
945− nextEvent vty
934+cursor_hide_test_0 :: Test
935+cursor_hide_test_0 = Test
936+ { test_name = "Verify the cursor is hid and re-shown. issue #7"
937+ , test_ID = "cursor_hide_test_0"
938+ , test_action = do
939+ vty <- mkVty
940+ show_cursor $ terminal vty
941+ set_cursor_pos (terminal vty) 5 5
942+ next_event vty
943+ hide_cursor $ terminal vty
944+ next_event vty
946945 shutdown vty
947946 return ()
948− , printSummary = putStr $ [s|
947+ , print_summary = putStr $ [s|
949948 1. verify the cursor is displayed.
950949 2. press enter
951950 3. verify the cursor is hid.
952951 4. press enter.
953952 5. the display should return to the state before the test.
954953|]
955− , confirmResults = genericOutputMatchConfirm
954+ , confirm_results = generic_output_match_confirm
956955 }
957956
958−outputImageAndWait :: Image -> IO ()
959−outputImageAndWait image = do
960− let pic = picForImage image
961− outputPicAndWait pic
962−
963−outputPicAndWait :: Picture -> IO ()
964−outputPicAndWait pic = do
965− t <- standardIOConfig >>= outputForConfig
966− reserveDisplay t
967− d <- displayBounds t >>= displayContext t
968− outputPicture d pic
957+output_image_and_wait :: Image -> IO ()
958+output_image_and_wait image = do
959+ t <- current_terminal
960+ reserve_display t
961+ let pic = pic_for_image image
962+ d <- display_bounds t >>= display_context t
963+ output_picture d pic
969964 getLine
970− releaseDisplay t
971− releaseTerminal t
965+ release_display t
966+ release_terminal t
972967 return ()
973968
974−vertCropTest0 :: Test
975−vertCropTest0 = Test
976− { testName = "Verify bottom cropping works as expected with single column chars"
977− , testID = "cropTest0"
978− , testAction = do
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|
969+vert_crop_test_0 :: Test
970+vert_crop_test_0 = Test
971+ { test_name = "Verify bottom cropping works as expected with single column chars"
972+ , test_ID = "crop_test_0"
973+ , test_action = do
974+ let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum
975+ block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum
976+ image = block_0 <-> background_fill 10 2 <-> block_1
977+ output_image_and_wait image
978+ , print_summary = putStr $ [s|
984979 1. Verify the two text blocks are identical.
985980 2. press enter.
986981 3. the display should return to the state before the test.
987982|]
988− , confirmResults = genericOutputMatchConfirm
983+ , confirm_results = generic_output_match_confirm
989984 }
990985
991−vertCropTest1 :: Test
992−vertCropTest1 = Test
993− { testName = "Verify bottom cropping works as expected with double column chars"
994− , testID = "cropTest0"
995− , testAction = do
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|
986+vert_crop_test_1 :: Test
987+vert_crop_test_1 = Test
988+ { test_name = "Verify bottom cropping works as expected with double column chars"
989+ , test_ID = "crop_test_0"
990+ , test_action = do
991+ let block_0 = crop_bottom 2 $ vert_cat $ map (string def_attr) lorum_ipsum_chinese
992+ block_1 = vert_cat $ map (string def_attr) $ take 2 lorum_ipsum_chinese
993+ image = block_0 <-> background_fill 10 2 <-> block_1
994+ output_image_and_wait image
995+ , print_summary = putStr $ [s|
1001996 1. Verify the two text blocks are identical.
1002997 2. press enter.
1003998 3. the display should return to the state before the test.
1004999|]
1005− , confirmResults = genericOutputMatchConfirm
1000+ , confirm_results = generic_output_match_confirm
10061001 }
10071002
1008−vertCropTest2 :: Test
1009−vertCropTest2 = Test
1010− { testName = "Verify top cropping works as expected with single column chars"
1011− , testID = "cropTest2"
1012− , testAction = do
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|
1003+vert_crop_test_2 :: Test
1004+vert_crop_test_2 = Test
1005+ { test_name = "Verify top cropping works as expected with single column chars"
1006+ , test_ID = "crop_test_0"
1007+ , test_action = do
1008+ let block_0 = crop_top 2 $ vert_cat $ map (string def_attr) lorum_ipsum
1009+ block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum - 2) lorum_ipsum
1010+ image = block_0 <-> background_fill 10 2 <-> block_1
1011+ output_image_and_wait image
1012+ , print_summary = putStr $ [s|
10181013 1. Verify the two text blocks are identical.
10191014 2. press enter.
10201015 3. the display should return to the state before the test.
10211016|]
1022− , confirmResults = genericOutputMatchConfirm
1017+ , confirm_results = generic_output_match_confirm
10231018 }
10241019
1025−vertCropTest3 :: Test
1026−vertCropTest3 = Test
1027− { testName = "Verify top cropping works as expected with double column chars"
1028− , testID = "cropTest0"
1029− , testAction = do
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|
1020+vert_crop_test_3 :: Test
1021+vert_crop_test_3 = Test
1022+ { test_name = "Verify top cropping works as expected with double column chars"
1023+ , test_ID = "crop_test_0"
1024+ , test_action = do
1025+ let block_0 = crop_top 2 $ vert_cat $ map (string def_attr) lorum_ipsum_chinese
1026+ block_1 = vert_cat $ map (string def_attr) $ drop (length lorum_ipsum_chinese - 2 ) lorum_ipsum_chinese
1027+ image = block_0 <-> background_fill 10 2 <-> block_1
1028+ output_image_and_wait image
1029+ , print_summary = putStr $ [s|
10351030 1. Verify the two text blocks are identical.
10361031 2. press enter.
10371032 3. the display should return to the state before the test.
10381033|]
1039− , confirmResults = genericOutputMatchConfirm
1034+ , confirm_results = generic_output_match_confirm
10401035 }
10411036
1042−horizCropTest0 :: Test
1043−horizCropTest0 = Test
1044− { testName = "Verify right cropping works as expected with single column chars"
1045− , testID = "cropTest0"
1046− , testAction = do
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|
1037+horiz_crop_test_0 :: Test
1038+horiz_crop_test_0 = Test
1039+ { test_name = "Verify right cropping works as expected with single column chars"
1040+ , test_ID = "crop_test_0"
1041+ , test_action = do
1042+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum
1043+ cropped_image = crop_right (image_width base_image `div` 2) base_image
1044+ image = base_image <-> background_fill 10 2 <-> cropped_image
1045+ output_image_and_wait image
1046+ , print_summary = putStr $ [s|
10521047 1. Verify the bottom text block is about half the width of the top text block.
10531048 2. press enter.
10541049 3. the display should return to the state before the test.
10551050|]
1056− , confirmResults = genericOutputMatchConfirm
1051+ , confirm_results = generic_output_match_confirm
10571052 }
10581053
1059−horizCropTest1 :: Test
1060−horizCropTest1 = Test
1061− { testName = "Verify right cropping works as expected with double column chars"
1062− , testID = "cropTest0"
1063− , testAction = do
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|
1054+horiz_crop_test_1 :: Test
1055+horiz_crop_test_1 = Test
1056+ { test_name = "Verify right cropping works as expected with double column chars"
1057+ , test_ID = "crop_test_0"
1058+ , test_action = do
1059+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1060+ cropped_image = crop_right (image_width base_image `div` 2) base_image
1061+ image = base_image <-> background_fill 10 2 <-> cropped_image
1062+ output_image_and_wait image
1063+ , print_summary = putStr $ [s|
10691064 1. Verify the bottom text block is the left half of the top block. Ellipses on the right edge are OK.
10701065 2. press enter.
10711066 3. the display should return to the state before the test.
10721067|]
1073− , confirmResults = genericOutputMatchConfirm
1068+ , confirm_results = generic_output_match_confirm
10741069 }
10751070
1076−horizCropTest2 :: Test
1077−horizCropTest2 = Test
1078− { testName = "Verify left cropping works as expected with single column chars"
1079− , testID = "cropTest0"
1080− , testAction = do
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|
1071+horiz_crop_test_2 :: Test
1072+horiz_crop_test_2 = Test
1073+ { test_name = "Verify left cropping works as expected with single column chars"
1074+ , test_ID = "crop_test_0"
1075+ , test_action = do
1076+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum
1077+ cropped_image = crop_left (image_width base_image `div` 2) base_image
1078+ image = base_image <-> background_fill 10 2 <-> cropped_image
1079+ output_image_and_wait image
1080+ , print_summary = putStr $ [s|
10861081 1. Verify the bottom text block is the right half of the top text block.
10871082 2. press enter.
10881083 3. the display should return to the state before the test.
10891084|]
1090− , confirmResults = genericOutputMatchConfirm
1085+ , confirm_results = generic_output_match_confirm
10911086 }
10921087
1093−horizCropTest3 :: Test
1094−horizCropTest3 = Test
1095− { testName = "Verify right cropping works as expected with double column chars"
1096− , testID = "cropTest0"
1097− , testAction = do
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|
1088+horiz_crop_test_3 :: Test
1089+horiz_crop_test_3 = Test
1090+ { test_name = "Verify right cropping works as expected with double column chars"
1091+ , test_ID = "crop_test_0"
1092+ , test_action = do
1093+ let base_image = vert_cat $ map (string def_attr) lorum_ipsum_chinese
1094+ cropped_image = crop_left (image_width base_image `div` 2) base_image
1095+ image = base_image <-> background_fill 10 2 <-> cropped_image
1096+ output_image_and_wait image
1097+ , print_summary = putStr $ [s|
11031098 1. Verify the bottom text block is the right half of the top block. Ellipses on the left edge are OK.
11041099 2. press enter.
11051100 3. the display should return to the state before the test.
11061101|]
1107− , confirmResults = genericOutputMatchConfirm
1108− }
1109−
1110−layer0 :: Test
1111−layer0 = Test
1112− { testName = "verify layer 0"
1113− , testID = "layer0"
1114− , testAction = do
1115− let upperImage = vertCat $ map (string defAttr) lorumIpsumChinese
1116− lowerImage = vertCat $ map (string defAttr) lorumIpsum
1117− p = picForLayers [upperImage, lowerImage]
1118− outputPicAndWait p
1119− , printSummary = putStr $ [s|
1120− 1. Verify the text block appears to be Chinese text placed on top Latin text.
1121− 2. press enter.
1122− 3. the display should return to the state before the test.
1123−|]
1124− , confirmResults = genericOutputMatchConfirm
1125− }
1126−
1127−layer1 :: Test
1128−layer1 = Test
1129− { testName = "verify layer 1"
1130− , testID = "layer1"
1131− , testAction = do
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.
1140− 2. press enter.
1141− 3. the display should return to the state before the test.
1142−|]
1143− , confirmResults = genericOutputMatchConfirm
1102+ , confirm_results = generic_output_match_confirm
11441103 }
11451104
1146−cheesyAnim0 :: Image -> [Image] -> IO ()
1147−cheesyAnim0 i background = do
1148− t <- standardIOConfig >>= outputForConfig
1149− reserveDisplay t
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)
1156− i
1157− let pic = picForLayers $ i_offset : background
1158− outputPicture d pic
1159− threadDelay 50000
1160− forM_ [0..100] $ \t -> do
1161− let i_offset = translate (t * (-1) `mod` fst bounds)
1162− (t * (-1) `div` 2 `mod` snd bounds)
1163− i
1164− let pic = picForLayers $ i_offset : background
1165− outputPicture d pic
1166− threadDelay 50000
1167− releaseDisplay t
1168− releaseTerminal t
1169− return ()
1170−
1171−lorumIpsum :: [String]
1172−lorumIpsum = lines [s|
1105+lorum_ipsum :: [String]
1106+lorum_ipsum = lines [s|
11731107Sed ut perspiciatis unde omnis iste natus error sit voluptatem accusantium doloremque laudantium,
11741108totam rem aperiam, eaque ipsa quae ab illo inventore veritatis et quasi architecto beatae vitae
11751109dicta sunt explicabo. Nemo enim ipsam voluptatem quia voluptas sit aspernatur aut odit aut fugit,
@@ -1181,8 +1115,8 @@ commodi consequatur? Quis autem vel eum iure reprehenderit qui in ea voluptate v
11811115molestiae consequatur, vel illum qui dolorem eum fugiat quo voluptas nulla pariatur?
11821116|]
11831117
1184−lorumIpsumChinese :: [String]
1185−lorumIpsumChinese = lines [s|
1118+lorum_ipsum_chinese :: [String]
1119+lorum_ipsum_chinese = lines [s|
11861120輐銛 螷蟞覮 裌覅詵 暕 鴅噮 槶 惝掭掝 婸媥媕 耏胠臿, 汫汭沎 忕汌卣 蚡袀 僣 蒮 瀁瀎瀊 渮湸湤 緌翢,
11871121腠腶舝 糲蘥蠩 樏殣氀 蒮 蹢鎒 滍 鸄齴 櫧櫋瀩 鬄鵊鵙 莃荶衒, 毸溠 橀 簎艜薤 莃荶衒 翣聜蒢
11881122斔櫅檷 晛桼桾 拻敁柧 犿玒 膣, 墐 笓粊紒 bacon 鼀齕, 蔝蓶蓨 顊顃餭 姴怤 骱 暕 蹢鎒鎛 藒襓謥 鄻鎟霣