test/expand_test.clj

@@ -5,11 +5,9 @@
    [clojure.test :as t]
    [expand :as sut]))
 
-(t/deftest scheme-base-env-test
-  (t/is (s/valid? ::sut/environment sut/scheme-base-env)))
-
-(t/deftest symtable-for-env-test
-  (t/is (s/valid? ::sut/symtable (sut/symtable-for-env sut/scheme-base-env))))
+(t/deftest scheme-base-test
+  (t/is (s/valid? ::sut/environment (:env sut/scheme-base)))
+  (t/is (s/valid? ::sut/symtable (:symtable sut/scheme-base))))
 
 (t/deftest nearest-test
   (t/is (= [:primitive 'lambda]
@@ -93,7 +91,7 @@
                                    (λ (x)
                                       (m))))))
             "`when` does not capture caller's scope")
-      #_(t/is (= '(if 123 (begin (display "hello")
+      (t/is (= '(if 123 (begin (display "hello")
                                (newline)))
                (sut/us-expand '(when 123
                                  (display "hello")