git.iko.soy/vty
on master help sign in
fix QuickCheck dependency. add interactive-terminal-test to executables section. add test for issue 7
8211eadCorey O'Connor
test/interactive_terminal_test.hs+26−1
compare with master
unifiedsplit
@@ -2,12 +2,14 @@
2{-# LANGUAGE ScopedTypeVariables #-}
2{-# LANGUAGE ScopedTypeVariables #-}
3module Main where
3module Main where
4
4
5+import Graphics.Vty
5import Graphics.Vty.Attributes
6import Graphics.Vty.Attributes
6import Graphics.Vty.Inline
7import Graphics.Vty.Inline
7import Graphics.Vty.Picture
8import Graphics.Vty.Picture
8import Graphics.Vty.Terminal
9import Graphics.Vty.Terminal
9import Graphics.Vty.DisplayRegion
10import Graphics.Vty.DisplayRegion
10
11
12+import Control.Exception
11import Control.Monad
13import Control.Monad
12
14
13import Data.List ( lookup )
15import Data.List ( lookup )
@@ -71,7 +73,7 @@ to debug terminal support.
71 wait_for_return
73 wait_for_return
72 results <- do_test_menu 1
74 results <- do_test_menu 1
73 env_attributes <- mapM ( \env_name -> catch ( Env.getEnv env_name >>= return . (,) env_name )
75 env_attributes <- mapM ( \env_name -> catch ( Env.getEnv env_name >>= return . (,) env_name )
74− ( const $ return (env_name, "") )
76+ ( \ (_ :: SomeException) -> return (env_name, "") )
75 )
77 )
76 [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
78 [ "TERM", "COLORTERM", "LANG", "TERM_PROGRAM", "XTERM_VERSION" ]
77 t <- terminal_handle
79 t <- terminal_handle
@@ -168,6 +170,7 @@ all_tests
168 , inline_test_0
170 , inline_test_0
169 , inline_test_1
171 , inline_test_1
170 , inline_test_2
172 , inline_test_2
173+ , cursor_hide_test_0
171 ]
174 ]
172
175
173reserve_output_test = Test
176reserve_output_test = Test
@@ -920,7 +923,29 @@ inline_test_2 = Test
920 return ()
923 return ()
921 , print_summary = putStr $ [s|
924 , print_summary = putStr $ [s|
922|]
925|]
926+ , confirm_results = generic_output_match_confirm
927+ }
923
928
929+cursor_hide_test_0 :: Test
930+cursor_hide_test_0 = Test
931+ { test_name = "Verify the cursor is hid and re-shown. issue #7"
932+ , test_ID = "cursor_hide_test_0"
933+ , test_action = do
934+ vty <- mkVty
935+ show_cursor $ terminal vty
936+ set_cursor_pos (terminal vty) 5 5
937+ next_event vty
938+ hide_cursor $ terminal vty
939+ next_event vty
940+ shutdown vty
941+ return ()
942+ , print_summary = putStr $ [s|
943+ 1. verify the cursor is displayed.
944+ 2. press enter
945+ 3. verify the cursor is hid.
946+ 4. press enter.
947+ 5. the display should return to the state before the test.
948+|]
924 , confirm_results = generic_output_match_confirm
949 , confirm_results = generic_output_match_confirm
925 }
950 }
926
951
vty.cabal+43−14
@@ -92,7 +92,7 @@ test-suite verify-attribute-ops
92 hs-source-dirs: src test
92 hs-source-dirs: src test
93 test-module: VerifyAttributeOps
93 test-module: VerifyAttributeOps
94 build-depends: Cabal == 1.17.*,
94 build-depends: Cabal == 1.17.*,
95− QuickCheck == 2.4.*,
95+ QuickCheck >= 2.4,
96 random == 1.0.*,
96 random == 1.0.*,
97 base >= 4 && < 5,
97 base >= 4 && < 5,
98 bytestring,
98 bytestring,
@@ -143,7 +143,7 @@ test-suite verify-using-mock-terminal
143 include-dirs: cbits
143 include-dirs: cbits
144
144
145 build-depends: Cabal == 1.17.*,
145 build-depends: Cabal == 1.17.*,
146− QuickCheck == 2.4.*,
146+ QuickCheck >= 2.4,
147 random == 1.0.*,
147 random == 1.0.*,
148 base >= 4 && < 5,
148 base >= 4 && < 5,
149 bytestring,
149 bytestring,
@@ -194,7 +194,7 @@ test-suite verify-display-attributes
194 include-dirs: cbits
194 include-dirs: cbits
195
195
196 build-depends: Cabal == 1.17.*,
196 build-depends: Cabal == 1.17.*,
197− QuickCheck == 2.4.*,
197+ QuickCheck >= 2.4,
198 random == 1.0.*,
198 random == 1.0.*,
199 base >= 4 && < 5,
199 base >= 4 && < 5,
200 bytestring,
200 bytestring,
@@ -222,7 +222,7 @@ test-suite verify-empty-image-props
222 Verify
222 Verify
223
223
224 build-depends: Cabal == 1.17.*,
224 build-depends: Cabal == 1.17.*,
225− QuickCheck == 2.4.*,
225+ QuickCheck >= 2.4,
226 random == 1.0.*,
226 random == 1.0.*,
227 base >= 4 && < 5,
227 base >= 4 && < 5,
228 bytestring,
228 bytestring,
@@ -253,7 +253,7 @@ test-suite verify-eval-terminfo-caps
253 Verify
253 Verify
254
254
255 build-depends: Cabal == 1.17.*,
255 build-depends: Cabal == 1.17.*,
256− QuickCheck == 2.4.*,
256+ QuickCheck >= 2.4,
257 random == 1.0.*,
257 random == 1.0.*,
258 base >= 4 && < 5,
258 base >= 4 && < 5,
259 bytestring,
259 bytestring,
@@ -296,7 +296,7 @@ test-suite verify-image-ops
296 include-dirs: cbits
296 include-dirs: cbits
297
297
298 build-depends: Cabal == 1.17.*,
298 build-depends: Cabal == 1.17.*,
299− QuickCheck == 2.4.*,
299+ QuickCheck >= 2.4,
300 random == 1.0.*,
300 random == 1.0.*,
301 base >= 4 && < 5,
301 base >= 4 && < 5,
302 bytestring,
302 bytestring,
@@ -333,7 +333,7 @@ test-suite verify-image-trans
333 include-dirs: cbits
333 include-dirs: cbits
334
334
335 build-depends: Cabal == 1.17.*,
335 build-depends: Cabal == 1.17.*,
336− QuickCheck == 2.4.*,
336+ QuickCheck >= 2.4,
337 random == 1.0.*,
337 random == 1.0.*,
338 base >= 4 && < 5,
338 base >= 4 && < 5,
339 bytestring,
339 bytestring,
@@ -380,7 +380,7 @@ test-suite verify-inline
380 include-dirs: cbits
380 include-dirs: cbits
381
381
382 build-depends: Cabal == 1.17.*,
382 build-depends: Cabal == 1.17.*,
383− QuickCheck == 2.4.*,
383+ QuickCheck >= 2.4,
384 random == 1.0.*,
384 random == 1.0.*,
385 base >= 4 && < 5,
385 base >= 4 && < 5,
386 bytestring,
386 bytestring,
@@ -411,7 +411,7 @@ test-suite verify-parse-terminfo-caps
411 include-dirs: cbits
411 include-dirs: cbits
412
412
413 build-depends: Cabal == 1.17.*,
413 build-depends: Cabal == 1.17.*,
414− QuickCheck == 2.4.*,
414+ QuickCheck >= 2.4,
415 random == 1.0.*,
415 random == 1.0.*,
416 base >= 4 && < 5,
416 base >= 4 && < 5,
417 bytestring,
417 bytestring,
@@ -441,7 +441,7 @@ test-suite verify-picture-ops
441 include-dirs: cbits
441 include-dirs: cbits
442
442
443 build-depends: Cabal == 1.17.*,
443 build-depends: Cabal == 1.17.*,
444− QuickCheck == 2.4.*,
444+ QuickCheck >= 2.4,
445 random == 1.0.*,
445 random == 1.0.*,
446 base >= 4 && < 5,
446 base >= 4 && < 5,
447 bytestring,
447 bytestring,
@@ -492,7 +492,7 @@ test-suite verify-picture-to-span
492 include-dirs: cbits
492 include-dirs: cbits
493
493
494 build-depends: Cabal == 1.17.*,
494 build-depends: Cabal == 1.17.*,
495− QuickCheck == 2.4.*,
495+ QuickCheck >= 2.4,
496 random == 1.0.*,
496 random == 1.0.*,
497 base >= 4 && < 5,
497 base >= 4 && < 5,
498 bytestring,
498 bytestring,
@@ -543,7 +543,7 @@ test-suite verify-span-ops
543 include-dirs: cbits
543 include-dirs: cbits
544
544
545 build-depends: Cabal == 1.17.*,
545 build-depends: Cabal == 1.17.*,
546− QuickCheck == 2.4.*,
546+ QuickCheck >= 2.4,
547 random == 1.0.*,
547 random == 1.0.*,
548 base >= 4 && < 5,
548 base >= 4 && < 5,
549 bytestring,
549 bytestring,
@@ -577,7 +577,7 @@ test-suite verify-utf8-width
577 include-dirs: cbits
577 include-dirs: cbits
578
578
579 build-depends: Cabal == 1.17.*,
579 build-depends: Cabal == 1.17.*,
580− QuickCheck == 2.4.*,
580+ QuickCheck >= 2.4,
581 random == 1.0.*,
581 random == 1.0.*,
582 base >= 4 && < 5,
582 base >= 4 && < 5,
583 bytestring,
583 bytestring,
@@ -592,6 +592,36 @@ test-suite verify-utf8-width
592 utf8-string >= 0.3 && < 0.4,
592 utf8-string >= 0.3 && < 0.4,
593 vector >= 0.7
593 vector >= 0.7
594
594
595+executable vty-interactive-terminal-test
596+ main-is: interactive_terminal_test.hs
597+
598+ default-language: Haskell2010
599+
600+ hs-source-dirs: src test
601+
602+ c-sources: cbits/gwinsz.c
603+ cbits/set_term_timing.c
604+ cbits/mk_wcwidth.c
605+
606+ include-dirs: cbits
607+
608+ build-depends: Cabal == 1.17.*,
609+ QuickCheck >= 2.4,
610+ random == 1.0.*,
611+ base >= 4 && < 5,
612+ bytestring,
613+ containers,
614+ deepseq >= 1.1 && < 1.4,
615+ ghc-prim,
616+ mtl >= 1.1.1.0 && < 2.2,
617+ parallel >= 2.2 && < 3.3,
618+ parsec >= 2 && < 4,
619+ string-qq,
620+ terminfo >= 0.3 && < 0.4,
621+ unix,
622+ utf8-string >= 0.3 && < 0.4,
623+ vector >= 0.7
624+
595-- Bench.hs
625-- Bench.hs
596-- Bench2.hs
626-- Bench2.hs
597-- BenchRenderChar.hs
627-- BenchRenderChar.hs
@@ -606,7 +636,6 @@ test-suite verify-utf8-width
606-- Verify/Graphics/Vty/Image.hs
636-- Verify/Graphics/Vty/Image.hs
607-- Verify/Graphics/Vty/Picture.hs
637-- Verify/Graphics/Vty/Picture.hs
608-- Verify/Graphics/Vty/Span.hs
638-- Verify/Graphics/Vty/Span.hs
609−-- interactive_terminal_test.hs
610-- vty_inline_example.hs
639-- vty_inline_example.hs
611-- vty_issue_18.hs
640-- vty_issue_18.hs
612-- yi_issue_264.hs
641-- yi_issue_264.hs