From ee0033b6bef0aae0ffc3ca64e8e7cfa3f1e93bc5 Mon Sep 17 00:00:00 2001
From: Tony Garnock-Jones <tonygarnockjones@gmail.com>
Date: Thu, 3 May 2018 22:08:52 +0100
Subject: [PATCH] Make test-implementation language expose all of `racket`
 rather than just `racket/base`, for convenience.

---
 syndicate/test-implementation.rkt                  | 7 ++-----
 syndicate/test/core/clean-adhoc-on-termination.rkt | 4 ++--
 syndicate/test/core/nesting-confusion.rkt          | 2 --
 syndicate/test/core/partial-retraction.rkt         | 1 -
 4 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/syndicate/test-implementation.rkt b/syndicate/test-implementation.rkt
index c9cbcf8..8a32e31 100644
--- a/syndicate/test-implementation.rkt
+++ b/syndicate/test-implementation.rkt
@@ -1,4 +1,4 @@
-#lang racket/base
+#lang racket
 ;; Test drivers for Syndicate implementation.
 
 (provide collected-events
@@ -23,15 +23,12 @@
          run-syndicate-test!
          log-test-result!
 
-         (all-from-out racket/base)
+         (all-from-out racket)
          (all-from-out "main.rkt"))
 
 (module reader syntax/module-reader imperative-syndicate/test-implementation)
 
 (require racket/exn)
-(require racket/match)
-(require racket/set)
-(require (only-in racket/string string-split string-join string-contains?))
 
 (require "bag.rkt")
 (require "main.rkt")
diff --git a/syndicate/test/core/clean-adhoc-on-termination.rkt b/syndicate/test/core/clean-adhoc-on-termination.rkt
index 25cc147..04ed53a 100644
--- a/syndicate/test/core/clean-adhoc-on-termination.rkt
+++ b/syndicate/test/core/clean-adhoc-on-termination.rkt
@@ -23,8 +23,8 @@
 
 (define (only-seen-monitor-assertions?)
   (lambda ()
-    (define actual-assertions (dataspace-assertions (final-dataspace)))
-    (define expected-assertions (make-hash (list (cons (observe (capture (discard))) 1))))
+    (define actual-assertions (final-assertions))
+    (define expected-assertions (set (observe (capture (discard)))))
     (or (equal? actual-assertions expected-assertions)
         (error 'only-seen-monitor-assertions? "Actual-assertions ~v <> expected-assertions ~v"
                actual-assertions
diff --git a/syndicate/test/core/nesting-confusion.rkt b/syndicate/test/core/nesting-confusion.rkt
index a12fe40..cbbe069 100644
--- a/syndicate/test/core/nesting-confusion.rkt
+++ b/syndicate/test/core/nesting-confusion.rkt
@@ -12,8 +12,6 @@
 ;;
 ;; then the second one will see a literal `(discard)` for `z`!
 
-(require racket/string)
-
 (assertion-struct researcher (name topic))
 
 (define no-mention-of-discard
diff --git a/syndicate/test/core/partial-retraction.rkt b/syndicate/test/core/partial-retraction.rkt
index 91e3865..5bbafec 100644
--- a/syndicate/test/core/partial-retraction.rkt
+++ b/syndicate/test/core/partial-retraction.rkt
@@ -45,7 +45,6 @@
              (pause)
              (local-require "../../bag.rkt")
              (for [(a (in-bag (current-adhoc-assertions)))]
-               (local-require racket/match)
                (match a
                  [(entry 'a _) (retract! a)]
                  [_ (void)]))