Fix commands tests, and chop off trailing dot

db4
Slava Pestov 2009-01-30 23:52:02 -06:00
parent e090c6ed92
commit 8e5c085b57
2 changed files with 27 additions and 11 deletions

View File

@ -1,18 +1,16 @@
IN: ui.commands.tests
USING: ui.commands ui.gestures tools.test help.markup io
io.streams.string ;
io.streams.string system kernel ;
[ "A+a" ] [ T{ key-down f { A+ } "a" } gesture>string ] unit-test
[ "b" ] [ T{ key-down f f "b" } gesture>string ] unit-test
[ "Press Button 2" ] [ T{ button-down f f 2 } gesture>string ] unit-test
: com-test-1 ;
: com-test-1 ( -- ) ;
\ com-test-1 H{ } define-command
[ [ 3 com-test-1 ] ] [ 3 \ com-test-1 command-quot ] unit-test
: com-test-2 ;
: com-test-2 ( -- ) ;
\ com-test-2 H{ { +nullary+ t } } define-command
@ -24,8 +22,26 @@ testing "testing" "hey" {
{ T{ key-down f { C+ } "x" } com-test-1 }
} define-command-map
[ "C+x" ] [
[
{ $command testing "testing" com-test-1 } print-element
] with-string-writer
] unit-test
os macosx? [
[ "⌘A" ] [ T{ key-down f { A+ } "a" } gesture>string ] unit-test
[ "B" ] [ T{ key-down f f "b" } gesture>string ] unit-test
[ "⌃X" ] [
[
{ $command testing "testing" com-test-1 } print-element
] with-string-writer
] unit-test
] [
[ "A+a" ] [ T{ key-down f { A+ } "a" } gesture>string ] unit-test
[ "b" ] [ T{ key-down f f "b" } gesture>string ] unit-test
[ "C+x" ] [
[
{ $command testing "testing" com-test-1 } print-element
] with-string-writer
] unit-test
] if
: com-foo. ( -- ) ;
[ "Foo" ] [ \ com-foo. command-name ] unit-test

View File

@ -56,7 +56,7 @@ TR: convert-command-name "-" " " ;
M: word command-name ( word -- str )
name>>
"com-" ?head drop
"com-" ?head drop "." ?tail drop
dup first Letter? [ rest ] unless
(command-name) ;