Skip to content

Commit 5b75bba

Browse files
codeZeilencodeZeilen
committed
Converts setup and tearDown to macros to not require the explicit lambda
1 parent 9594670 commit 5b75bba

File tree

4 files changed

+126
-120
lines changed

4 files changed

+126
-120
lines changed

‎rosetta-test-suites/fs.ros‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@
1616

1717
(define test-file '())
1818

19-
(setup (lambda () (begin
20-
(create-test-file "my-test-file" "first line\nsecond line"))))
19+
(setup
20+
(create-test-file "my-test-file" "first line\nsecond line"))
2121

22-
(tearDown (lambda ()
23-
(remove-test-file "my-test-file")))
22+
(tearDown
23+
(remove-test-file "my-test-file"))
2424

2525
(capability 'open (list
2626
(test "open returns a file descriptor"
@@ -32,12 +32,12 @@
3232
(assert (is-file-error? (open "my-test-file" "qr"))))))
3333

3434
(capability 'close (list
35-
(setup (lambda ()
36-
(set! test-file (open "my-test-file" "r"))))
35+
(setup
36+
(set! test-file (open "my-test-file" "r")))
3737

38-
(tearDown (lambda () (begin
38+
(tearDown
3939
(close test-file)
40-
(set! test-file '()))))
40+
(set! test-file '()))
4141

4242
(test "a closed file descriptor does not allow further reads"
4343
(close test-file)
@@ -48,12 +48,12 @@
4848
(assert (is-file-error? (write test-file "abc"))))))
4949

5050
(capability 'read (list
51-
(setup (lambda ()
52-
(set! test-file (open "my-test-file" "r"))))
51+
(setup
52+
(set! test-file (open "my-test-file" "r")))
5353

54-
(tearDown (lambda () (begin
54+
(tearDown
5555
(close test-file)
56-
(set! test-file '()))))
56+
(set! test-file '()))
5757

5858
(test "read can read one value"
5959
(assert-equal

‎rosetta-test-suites/sendmail.ros‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -82,11 +82,11 @@
8282
(define (server-message-contains-ci? content)
8383
(string-contains-ci? (server-message-data server) content))
8484

85-
(setup (lambda ()
86-
(set! server '())))
85+
(setup
86+
(set! server '()))
8787

88-
(tearDown (lambda ()
89-
(stop-mock-server)))
88+
(tearDown
89+
(stop-mock-server))
9090

9191
;
9292
; Capabilities
@@ -96,7 +96,7 @@
9696

9797
(define sendmail-connection '())
9898

99-
(setup (lambda ()
99+
(setup
100100
(set! server (start-mock-server))
101101
(server-set-extensions! server '("STARTTLS"))
102102
(server-set-auths! server '(("LOGIN" ("account" "password"))))
@@ -114,11 +114,11 @@
114114
(if (and (= login-user-response "YWNjb3VudA==") (= login-password-response "cGFzc3dvcmQ="))
115115
(success)
116116
(failure)))))
117-
(server-set-auth-proc! server login-auth-proc)))
117+
(server-set-auth-proc! server login-auth-proc))
118118

119-
(tearDown (lambda ()
119+
(tearDown
120120
(sendmail-disconnect sendmail-connection)
121-
(set! sendmail-connection '())))
121+
(set! sendmail-connection '()))
122122

123123
(capability 'eager-connection (list
124124
(test "Connect to server"
@@ -162,13 +162,13 @@
162162
(define (connect-smtp-server)
163163
(set! sendmail-connection (sendmail-connect "localhost" (server-port server))))
164164

165-
(setup (lambda ()
165+
(setup
166166
(set! server (start-mock-server))
167-
(connect-smtp-server)))
167+
(connect-smtp-server))
168168

169-
(tearDown (lambda ()
169+
(tearDown
170170
(sendmail-disconnect sendmail-connection)
171-
(set! sendmail-connection '())))
171+
(set! sendmail-connection '()))
172172

173173
(test "Send a message"
174174
(let
@@ -280,13 +280,13 @@
280280
(define (connect-smtp-server)
281281
(set! sendmail-connection (sendmail-connect "localhost" (server-port server))))
282282

283-
(setup (lambda ()
283+
(setup
284284
(set! server (start-mock-server))
285-
(connect-smtp-server)))
285+
(connect-smtp-server))
286286

287-
(tearDown (lambda ()
287+
(tearDown
288288
(sendmail-disconnect sendmail-connection)
289-
(set! sendmail-connection '())))
289+
(set! sendmail-connection '()))
290290

291291
(define (sendmail-send-with-headers headers)
292292
(sendmail-send-message-full
@@ -357,13 +357,13 @@
357357
(define (connect-smtp-server)
358358
(set! sendmail-connection (sendmail-connect "localhost" (server-port server))))
359359

360-
(setup (lambda ()
360+
(setup
361361
(set! server (start-mock-server))
362-
(connect-smtp-server)))
362+
(connect-smtp-server))
363363

364-
(tearDown (lambda ()
364+
(tearDown
365365
(sendmail-disconnect sendmail-connection)
366-
(set! sendmail-connection '())))
366+
(set! sendmail-connection '()))
367367

368368
; attachments-properties is a list of alists with the following keys:
369369
; "data", "file-name", "content-type", or "content-disposition"
@@ -492,13 +492,13 @@
492492
(define (connect-smtp-server)
493493
(set! sendmail-connection (sendmail-connect "localhost" (server-port server))))
494494

495-
(setup (lambda ()
495+
(setup
496496
(set! server (start-mock-server))
497-
(connect-smtp-server)))
497+
(connect-smtp-server))
498498

499-
(tearDown (lambda ()
499+
(tearDown
500500
(sendmail-disconnect sendmail-connection)
501-
(set! sendmail-connection '())))
501+
(set! sendmail-connection '()))
502502

503503
(define (assert-crlf-injection-error test-function failure-description)
504504
(let
@@ -569,13 +569,13 @@
569569
(define (connect-smtp-server)
570570
(set! sendmail-connection (sendmail-connect "localhost" (server-port server))))
571571

572-
(setup (lambda ()
572+
(setup
573573
(set! server (start-mock-server))
574-
(connect-smtp-server)))
574+
(connect-smtp-server))
575575

576-
(tearDown (lambda ()
576+
(tearDown
577577
(sendmail-disconnect sendmail-connection)
578-
(set! sendmail-connection '())))
578+
(set! sendmail-connection '()))
579579

580580
(capability '8bitmime (list
581581

@@ -647,13 +647,13 @@
647647
(define (connect-smtp-server)
648648
(set! sendmail-connection (sendmail-connect "localhost" (server-port server))))
649649

650-
(setup (lambda ()
650+
(setup
651651
(set! server (start-mock-server))
652-
(connect-smtp-server)))
652+
(connect-smtp-server))
653653

654-
(tearDown (lambda ()
654+
(tearDown
655655
(sendmail-disconnect sendmail-connection)
656-
(set! sendmail-connection '())))
656+
(set! sendmail-connection '()))
657657

658658

659659
(capability 'smtputf8 (list

0 commit comments

Comments
 (0)