From c25ed7473c3d06477e56a418787ecc6ad1eb9ecf Mon Sep 17 00:00:00 2001 From: Stephen Bloch Date: Fri, 12 Apr 2013 06:43:11 -0400 Subject: [PATCH] Moved error-message tests into a module+ in main source file. --- collects/picturing-programs/private/tiles.rkt | 42 +++++++++++++++++++ .../tests/tiles-error-tests.rkt | 37 ---------------- 2 files changed, 42 insertions(+), 37 deletions(-) delete mode 100644 collects/picturing-programs/tests/tiles-error-tests.rkt diff --git a/collects/picturing-programs/private/tiles.rkt b/collects/picturing-programs/private/tiles.rkt index aa396447fb..bd5ad221b7 100644 --- a/collects/picturing-programs/private/tiles.rkt +++ b/collects/picturing-programs/private/tiles.rkt @@ -37,6 +37,7 @@ ; Modified 8/??/2011: reworded a bunch of error messages in accordance ; with Guillaume & Kathi's research. ; Modified 10/??/2011: fixed error messages in crop functions. +; Modified 10/20/2012: moved error-message tests into this file (require 2htdp/image @@ -161,3 +162,44 @@ (define (rotate-180 picture) (check-image 'rotate-180 picture "first") (rotate 180 picture)) + + + (module+ test + (require picturing-programs) +(require test-engine/racket-tests) +(check-error (reflect-horiz 17) + "reflect-horiz: expected as first argument, given 17") +(check-error (reflect-horiz pic:hacker) "shouldn't actually error out") +(check-expect 3 4) +(check-error (reflect-vert "hello") + "reflect-vert: expected as first argument, given \"hello\"") +(check-error (reflect-main-diag #t) + "reflect-main-diag: expected as first argument, given #t") +(check-error (reflect-other-diag #f) + "reflect-other-diag: expected as first argument, given #f") +(check-error (flip-main 'blue) + "flip-main: expected as first argument, given 'blue") +(check-error (flip-other "snark") + "flip-other: expected as first argument, given \"snark\"") +(check-error (crop-left pic:hacker 50) + "crop-left: expected as second argument, given 50") +(check-error (crop-right pic:bloch 100) + "crop-right: expected as second argument, given 100") +(check-error (crop-top pic:book 56) + "crop-top: expected as second argument, given 56") +(check-error (crop-bottom pic:hacker 56) + "crop-bottom: expected as second argument, given 56") +(check-error (crop-left pic:hacker -3) + "crop-left: expected as second argument, given -3") +(check-error (crop-top pic:book 3.2) + "crop-top: expected as second argument, given 3.2") +(check-error (crop-bottom pic:book pic:book) + "crop-bottom: expected as second argument, given (object:image% ...)") ; was "" in *SL, but "(object:image% ...)" in racket/base +(check-error (rotate-cw 17) + "rotate-cw: expected as first argument, given 17") +(check-error (rotate-ccw #t) + "rotate-ccw: expected as first argument, given #t") +(check-error (rotate-180 "goodbye") + "rotate-180: expected as first argument, given \"goodbye\"") +(test) ; need this if not using *SL testing +) diff --git a/collects/picturing-programs/tests/tiles-error-tests.rkt b/collects/picturing-programs/tests/tiles-error-tests.rkt deleted file mode 100644 index a488f15014..0000000000 --- a/collects/picturing-programs/tests/tiles-error-tests.rkt +++ /dev/null @@ -1,37 +0,0 @@ -;; The first three lines of this file were inserted by DrRacket. They record metadata -;; about the language level of this file in a form that our tools can easily process. -#reader(lib "htdp-beginner-reader.ss" "lang")((modname tiles-error-tests) (read-case-sensitive #t) (teachpacks ()) (htdp-settings #(#t constructor repeating-decimal #f #t none #f ()))) -(require picturing-programs) - -(check-error (reflect-horiz 17) - "reflect-horiz: expected as first argument, given 17") -(check-error (reflect-vert "hello") - "reflect-vert: expected as first argument, given \"hello\"") -(check-error (reflect-main-diag true) - "reflect-main-diag: expected as first argument, given true") -(check-error (reflect-other-diag false) - "reflect-other-diag: expected as first argument, given false") -(check-error (flip-main 'blue) - "flip-main: expected as first argument, given 'blue") -(check-error (flip-other "snark") - "flip-other: expected as first argument, given \"snark\"") -(check-error (crop-left pic:hacker 50) - "crop-left: expected as second argument, given 50") -(check-error (crop-right pic:bloch 100) - "crop-right: expected as second argument, given 100") -(check-error (crop-top pic:book 56) - "crop-top: expected as second argument, given 56") -(check-error (crop-bottom pic:hacker 56) - "crop-bottom: expected as second argument, given 56") -(check-error (crop-left pic:hacker -3) - "crop-left: expected as second argument, given -3") -(check-error (crop-top pic:book 3.2) - "crop-top: expected as second argument, given 3.2") -(check-error (crop-bottom pic:book pic:book) - "crop-bottom: expected as second argument, given #") -(check-error (rotate-cw 17) - "rotate-cw: expected as first argument, given 17") -(check-error (rotate-ccw true) - "rotate-ccw: expected as first argument, given true") -(check-error (rotate-180 "goodbye") - "rotate-180: expected as first argument, given \"goodbye\"")