steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'zedas/master'

release
Slava Pestov 2007-11-04 17:22:36 -05:00
parent 049ceb7044 7b3fee0b64
commit 8e8273a316
2 changed files with 38 additions and 3 deletions

39
extra/models/models-tests.factor
View File

@ -1,6 +1,6 @@
IN: temporary
USING: arrays generic kernel math models namespaces sequences
tools.test assocs ;
USING: arrays generic kernel math models namespaces sequences assocs
tools.test ;
TUPLE: model-tester hit? ;
@ -137,3 +137,38 @@ f <history> "history" set
] unit-test
[ ] [ "m" get deactivate-model ] unit-test
! Test <range>
: setup-range 0 0 0 255 <range> ;
! clamp-value should not go past range ends
[ 0 ] [ -10 setup-range clamp-value ] unit-test
[ 255 ] [ 2000 setup-range clamp-value ] unit-test
[ 14 ] [ 14 setup-range clamp-value ] unit-test
! range min/max/page values should be correct
[ 0 ] [ setup-range range-page-value ] unit-test
[ 0 ] [ setup-range range-min-value ] unit-test
[ 255 ] [ setup-range range-max-value ] unit-test
! should be able to set the value within the range and get back
[ 15 ] [ setup-range 15 over set-range-value range-value ] unit-test
[ 0 ] [ setup-range -15 over set-range-value range-value ] unit-test
[ 255 ] [ setup-range 4000 over set-range-value range-value ] unit-test
! should be able to change the range min/max/page value
[ 1 ] [ setup-range 1 over set-range-page-value range-page-value ] unit-test
[ 50 ] [ setup-range 50 over set-range-min-value range-min-value ] unit-test
[ 4000 ] [ setup-range 4000 over set-range-max-value range-max-value ] unit-test
! should be able to move by positive and negative values
[ 30 ] [ setup-range 30 over move-by range-value ] unit-test
[ 0 ] [ setup-range 30 over move-by -30 over move-by range-value ] unit-test
! should be able to move by a page of 10
[ 10 ] [
setup-range 10 over set-range-page-value
1 over move-by-page range-value
] unit-test

2
extra/models/models.factor
View File

@ -207,7 +207,7 @@ M: range range-max-value range-max model-value ;
M: range range-max-value*
dup range-max-value swap range-page-value [-] ;
M: range set-range-value range-model set-model ;
M: range set-range-value [ clamp-value ] keep range-model set-model ;
M: range set-range-page-value range-page set-model ;