From efcca72de7b45461e07b75fb90e234a6b76db6c3 Mon Sep 17 00:00:00 2001
From: Eric Dobson <eric.n.dobson@gmail.com>
Date: Sun, 1 Dec 2013 18:27:01 -0800
Subject: [PATCH] Simplify special-env-typecheck-tests and give them better
 names.

original commit: 0e8cf664f4b91a210ca695ba604fd9a043b5c8e4
---
 .../special-env-typecheck-tests.rkt           | 21 ++++++++++---------
 .../typed-racket/unit-tests/test-utils.rkt    |  5 -----
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
index 7a9adf04..4af3e861 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/special-env-typecheck-tests.rkt
@@ -34,16 +34,17 @@
     [(_ expr ty) (syntax/loc stx (tc-e expr #:ret (ret ty)))]
     [(id a #:ret b)
      (syntax/loc stx
-       (let-values
-         ([(res1 expanded)
-           (phase1-phase0-eval
-             (let ([ex (local-expand #'a 'expression null)])
-               (find-mutated-vars ex mvar-env)
-               #`(values '#,(tc-expr ex) '#,(syntax->datum ex))))]
-          [(res2) (phase1-phase0-eval #`'#,b)])
-         (with-check-info (['expanded expanded])
-           (check-tc-result-equal? (format "~a ~a" (quote-line-number id) 'a)
-                                   res1 res2))))]))
+       (test-case (format "~a ~a" (quote-line-number id) 'a)
+         (let-values
+           ([(res1 expanded)
+             (phase1-phase0-eval
+               (let ([ex (local-expand #'a 'expression null)])
+                 (find-mutated-vars ex mvar-env)
+                 #`(values '#,(tc-expr ex) '#,(syntax->datum ex))))]
+            [(res2) (phase1-phase0-eval #`'#,b)])
+           (with-check-info (['expanded expanded])
+             (unless (tc-result-equal/test? res1 res2)
+               (fail-check "Expression didn't have expected type."))))))]))
 
 (define tests
   (test-suite
diff --git a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
index 5e2b8cc7..505f463a 100644
--- a/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
+++ b/pkgs/typed-racket-pkgs/typed-racket-test/tests/typed-racket/unit-tests/test-utils.rkt
@@ -20,11 +20,6 @@
   (syntax-case stx ()
     [(_ nm a b)
      (syntax/loc stx (test-check nm type-equal? a b))]))
-(define-binary-check (check-tc-result-equal?* tc-result-equal/test? a b))
-(define-syntax (check-tc-result-equal? stx)
-  (syntax-case stx ()
-    [(_ nm a b)
-     (syntax/loc stx (test-case nm (check-tc-result-equal?* a b)))]))
 
 (define-syntax gen-test-main
   (syntax-parser