From c24258b45fb1136b640d654a0e48c70e4dd128d6 Mon Sep 17 00:00:00 2001 From: Stephen Bloch Date: Mon, 22 Apr 2013 20:07:32 -0400 Subject: [PATCH] Corrected error messages in test file to match new wordings. --- .../tests/map-image-bsl-tests.rkt | 36 +++++++++---------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/collects/picturing-programs/tests/map-image-bsl-tests.rkt b/collects/picturing-programs/tests/map-image-bsl-tests.rkt index 6eb46066f3..7da5b93cca 100644 --- a/collects/picturing-programs/tests/map-image-bsl-tests.rkt +++ b/collects/picturing-programs/tests/map-image-bsl-tests.rkt @@ -42,18 +42,18 @@ ; Test cases for map3-image: ;(check-error (map3-image 5 + + pic:bloch) -; "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> num(r) as first argument") +; "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> [0-255] as first argument") ; Actually, the above is caught by Check Syntax, before map3-image has a chance to check anything. (check-error (map3-image sqrt + + pic:bloch) - "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> num(r) as first argument") + "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> [0-255] as first argument") ;(check-error (map3-image + 5 + pic:bloch) -; "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> num(g) as second argument") +; "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> [0-255] as second argument") (check-error (map3-image + sqrt + pic:bloch) - "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> num(g) as second argument") + "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> [0-255] as second argument") ;(check-error (map3-image + + 5 pic:bloch) -; "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> num(b) as third argument") +; "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> [0-255] as third argument") (check-error (map3-image + + sqrt pic:bloch) - "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> num(b) as third argument") + "map3-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> [0-255] as third argument") (check-error (map3-image + + + 5) "map3-image: Expected an image as fourth argument, but received 5") @@ -98,21 +98,21 @@ "Test cases for map4-image:" ;(check-error (map4-image 5 + + + pic:bloch) -; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> num(r) as first argument") +; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) -> [0-255] as first argument") (check-error (map4-image sqrt + + + pic:bloch) - "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(alpha) -> num(r) as first argument") + "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(a) -> [0-255] as first argument") ;(check-error (map4-image + 5 + + pic:bloch) -; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(alpha) -> num(g) as second argument") +; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(a) -> [0-255] as second argument") (check-error (map4-image + sqrt + + pic:bloch) - "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(alpha) -> num(g) as second argument") + "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(a) -> [0-255] as second argument") ;(check-error (map4-image + + 5 + pic:bloch) -; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(alpha) -> num(b) as third argument") +; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(a) -> [0-255] as third argument") (check-error (map4-image + + sqrt + pic:bloch) - "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(alpha) -> num(b) as third argument") + "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(a) -> [0-255] as third argument") ;(check-error (map4-image + + + 5 pic:bloch) -; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(alpha) -> num(a) as fourth argument") +; "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(a) -> [0-255] as fourth argument") (check-error (map4-image + + + sqrt pic:bloch) - "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(alpha) -> num(alpha) as fourth argument") + "map4-image: Expected a function with contract num(x) num(y) num(r) num(g) num(b) num(a) -> [0-255] as fourth argument") (check-error (map4-image + + + + 5) "map4-image: Expected an image as fifth argument, but received 5") ; red-id6 : x y r g b a -> num @@ -152,7 +152,7 @@ ;(check-error (map-image 5 pic:bloch) ; "map-image: Expected a function with contract num(x) num(y) color -> color as first argument") (check-error (map-image make-posn pic:bloch) - "map-image: Expected a function of one or three parameters as first argument") + "map-image: Expected a function of one or three parameters, returning a color, as first argument") (check-error (map-image + 5) "map-image: Expected an image as second argument, but received 5") @@ -207,11 +207,11 @@ (check-error (build3-image 17 true sqrt sqrt sqrt) "build3-image: Expected a natural number as second argument, but received true") (check-error (build3-image 17 24 sqrt sqrt sqrt) - "build3-image: Expected a function with contract num(x) num(y) -> color as third argument") + "build3-image: Expected a function with contract num(x) num(y) -> [0-255] as third argument") (check-error (build3-image 17 24 x-gradient-2 sqrt sqrt) - "build3-image: Expected a function with contract num(x) num(y) -> color as fourth argument") + "build3-image: Expected a function with contract num(x) num(y) -> [0-255] as fourth argument") (check-error (build3-image 17 24 x-gradient-2 y-gradient-2 sqrt) - "build3-image: Expected a function with contract num(x) num(y) -> color as fifth argument") + "build3-image: Expected a function with contract num(x) num(y) -> [0-255] as fifth argument") (define (return-minus-5 x y) -5) (check-error (build3-image 17 24 x-gradient-2 y-gradient-2 return-minus-5)