diff --git a/library/test/gadgets/models.factor b/library/test/gadgets/models.factor index d90005e417..1024cff3a6 100644 --- a/library/test/gadgets/models.factor +++ b/library/test/gadgets/models.factor @@ -25,7 +25,7 @@ M: model-tester model-changed t swap set-model-tester-hit? ; [ { 3 4 } ] [ "model-c" get model-value ] unit-test -T{ model-tester f f } dup "tester" set +T{ model-tester f f } "tester" set [ T{ model-tester f t } { 6 4 } ] [ diff --git a/library/test/gadgets/rectangles.factor b/library/test/gadgets/rectangles.factor index 80e97b7e8e..f6833312b1 100644 --- a/library/test/gadgets/rectangles.factor +++ b/library/test/gadgets/rectangles.factor @@ -1,47 +1,33 @@ USING: gadgets kernel namespaces test ; -[ T{ rect f { 10 10 0 } { 20 20 0 } } ] +[ T{ rect f { 10 10 } { 20 20 } } ] [ - T{ rect f { 10 10 0 } { 50 50 0 } } - T{ rect f { -10 -10 0 } { 40 40 0 } } + T{ rect f { 10 10 } { 50 50 } } + T{ rect f { -10 -10 } { 40 40 } } rect-intersect ] unit-test -[ T{ rect f { 200 200 0 } { 0 0 0 } } ] +[ T{ rect f { 200 200 } { 0 0 } } ] [ - T{ rect f { 100 100 0 } { 50 50 0 } } - T{ rect f { 200 200 0 } { 40 40 0 } } + T{ rect f { 100 100 } { 50 50 } } + T{ rect f { 200 200 } { 40 40 } } rect-intersect ] unit-test -[ T{ rect f { -10 -10 0 } { 70 70 0 } } ] -[ - T{ rect f { 10 10 0 } { 50 50 0 } } - T{ rect f { -10 -10 0 } { 40 40 0 } } - rect-union -] unit-test - -[ T{ rect f { 100 100 0 } { 140 140 0 } } ] -[ - T{ rect f { 100 100 0 } { 50 50 0 } } - T{ rect f { 200 200 0 } { 40 40 0 } } - rect-union -] unit-test - [ f ] [ - T{ rect f { 100 100 0 } { 50 50 0 } } - T{ rect f { 200 200 0 } { 40 40 0 } } + T{ rect f { 100 100 } { 50 50 } } + T{ rect f { 200 200 } { 40 40 } } intersects? ] unit-test [ t ] [ - T{ rect f { 100 100 0 } { 50 50 0 } } - T{ rect f { 120 120 0 } { 40 40 0 } } + T{ rect f { 100 100 } { 50 50 } } + T{ rect f { 120 120 } { 40 40 } } intersects? ] unit-test [ f ] [ - T{ rect f { 1000 100 0 } { 50 50 0 } } - T{ rect f { 120 120 0 } { 40 40 0 } } + T{ rect f { 1000 100 } { 50 50 } } + T{ rect f { 120 120 } { 40 40 } } intersects? ] unit-test