From aedeccb8cdc8fdf21b90c3911ca0e27489fdc216 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Thu, 24 Jul 2014 07:26:18 +0100 Subject: [PATCH] move udp tests out of weird nesting within file tests --- .../racket-test/tests/racket/core-tests.rktl | 1 + .../racket-test/tests/racket/file.rktl | 56 ------------------- .../racket-test/tests/racket/udp.rktl | 47 ++++++++++++++++ 3 files changed, 48 insertions(+), 56 deletions(-) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/core-tests.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/core-tests.rktl index 1516a68e6b..2039381be8 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/core-tests.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/core-tests.rktl @@ -34,6 +34,7 @@ (load-relative "param.rktl")) (load-relative "port.rktl") (load-relative "file.rktl") +(load-relative "udp.rktl") (load-relative "path.rktl") (unless (or building-flat-tests? in-drscheme?) (load-relative "optimize.rktl")) diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/file.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/file.rktl index c6d9af628f..7f3223c32b 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/file.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/file.rktl @@ -1530,62 +1530,6 @@ (custodian-shutdown-all c) (port-closed? i)) -;;---------------------------------------------------------------------- -;; UDP - -(unless (eq? 'macos (system-type)) - (load-relative "udp.rktl")) - -(when (eq? 'macos (system-type)) - (err/rt-test (udp-open-socket) exn:misc:unsupported?) - ;; All others fail b/c can't supply a UDP. - ) - -(test #f udp? 5) - -;; more type tests in udp.rktl, where we have UDP socket values -(err/rt-test (udp-close 5)) -(err/rt-test (udp-bound? 5)) -(err/rt-test (udp-connected? 5)) -(err/rt-test (udp-bind! 5 #f 40000)) -(err/rt-test (udp-connect! 5 "localhost" 40000)) -(err/rt-test (udp-send-to 5 "localhost" 40000 #"hello")) -(err/rt-test (udp-send-to* 5 "localhost" 40000 #"hello")) -(err/rt-test (udp-send-to/enable-break 5 "localhost" 40000 #"hello")) -(err/rt-test (udp-send 5 #"hello")) -(err/rt-test (udp-send* 5 #"hello")) -(err/rt-test (udp-send/enable-break 5 #"hello")) -(err/rt-test (udp-receive! 5 (make-bytes 10))) -(err/rt-test (udp-receive!* 5 (make-bytes 10))) -(err/rt-test (udp-receive!/enable-break 5 (make-bytes 10))) -(err/rt-test (udp-receive!-evt 5 (make-bytes 10))) -(err/rt-test (udp-send-ready-evt 5)) -(err/rt-test (udp-receive-ready-evt 5)) - -(arity-test udp-open-socket 0 2) -(arity-test udp-close 1 1) -(arity-test udp? 1 1) -(arity-test udp-bound? 1 1) -(arity-test udp-connected? 1 1) -(arity-test udp-bind! 3 4) -(arity-test udp-connect! 3 3) -(arity-test udp-send-to 4 6) -(arity-test udp-send-to* 4 6) -(arity-test udp-send-to/enable-break 4 6) -(arity-test udp-send 2 4) -(arity-test udp-send* 2 4) -(arity-test udp-send/enable-break 2 4) -(arity-test udp-send-to-evt 4 6) -(arity-test udp-send-evt 2 4) -(arity-test udp-receive! 2 4) -(arity-test udp-receive!* 2 4) -(arity-test udp-receive!/enable-break 2 4) -(arity-test udp-receive!-evt 2 4) -(arity-test udp-send-ready-evt 1 1) -(arity-test udp-receive-ready-evt 1 1) - -(Section 'file-after-udp) - ;;---------------------------------------------------------------------- ;; Security guards: diff --git a/pkgs/racket-pkgs/racket-test/tests/racket/udp.rktl b/pkgs/racket-pkgs/racket-test/tests/racket/udp.rktl index c28429541f..c545b83a5e 100644 --- a/pkgs/racket-pkgs/racket-test/tests/racket/udp.rktl +++ b/pkgs/racket-pkgs/racket-test/tests/racket/udp.rktl @@ -1,8 +1,53 @@ +;;---------------------------------------------------------------------- +;; UDP (load-relative "loadtest.rktl") (Section 'udp) +(test #f udp? 5) + +;; more type tests in udp.rktl, where we have UDP socket values +(err/rt-test (udp-close 5)) +(err/rt-test (udp-bound? 5)) +(err/rt-test (udp-connected? 5)) +(err/rt-test (udp-bind! 5 #f 40000)) +(err/rt-test (udp-connect! 5 "localhost" 40000)) +(err/rt-test (udp-send-to 5 "localhost" 40000 #"hello")) +(err/rt-test (udp-send-to* 5 "localhost" 40000 #"hello")) +(err/rt-test (udp-send-to/enable-break 5 "localhost" 40000 #"hello")) +(err/rt-test (udp-send 5 #"hello")) +(err/rt-test (udp-send* 5 #"hello")) +(err/rt-test (udp-send/enable-break 5 #"hello")) +(err/rt-test (udp-receive! 5 (make-bytes 10))) +(err/rt-test (udp-receive!* 5 (make-bytes 10))) +(err/rt-test (udp-receive!/enable-break 5 (make-bytes 10))) +(err/rt-test (udp-receive!-evt 5 (make-bytes 10))) +(err/rt-test (udp-send-ready-evt 5)) +(err/rt-test (udp-receive-ready-evt 5)) + +(arity-test udp-open-socket 0 2) +(arity-test udp-close 1 1) +(arity-test udp? 1 1) +(arity-test udp-bound? 1 1) +(arity-test udp-connected? 1 1) +(arity-test udp-bind! 3 4) +(arity-test udp-connect! 3 3) +(arity-test udp-send-to 4 6) +(arity-test udp-send-to* 4 6) +(arity-test udp-send-to/enable-break 4 6) +(arity-test udp-send 2 4) +(arity-test udp-send* 2 4) +(arity-test udp-send/enable-break 2 4) +(arity-test udp-send-to-evt 4 6) +(arity-test udp-send-evt 2 4) +(arity-test udp-receive! 2 4) +(arity-test udp-receive!* 2 4) +(arity-test udp-receive!/enable-break 2 4) +(arity-test udp-receive!-evt 2 4) +(arity-test udp-send-ready-evt 1 1) +(arity-test udp-receive-ready-evt 1 1) + (define udp1 (udp-open-socket)) (define us1 (make-bytes 10)) @@ -291,4 +336,6 @@ (err/rt-test (udp-multicast-set-loopback! s #t) exn:fail:network?) ) +;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(report-errs)