From 304b4f11f33fe9967c2eda13b8c77c7c7002ac31 Mon Sep 17 00:00:00 2001 From: Spencer Florence Date: Mon, 30 Mar 2015 22:39:29 -0400 Subject: [PATCH] cherrying --- private/format-utils.rkt | 2 +- tests/main.rkt | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/private/format-utils.rkt b/private/format-utils.rkt index 839c225..51b6082 100644 --- a/private/format-utils.rkt +++ b/private/format-utils.rkt @@ -77,13 +77,13 @@ (define (make-irrelevant? lexer f submods) (define s (mutable-set)) (define-values (for-lex for-str) (replicate-file-port f (current-input-port))) + (port-count-lines! for-lex) (define str (apply vector (string->list (port->string for-str)))) (define init-offset (- (string-length (file->string f)) (vector-length str))) (define offset (make-byte->str-offset str)) - (let loop ([mode #f]) (define-values (v type _m start end backup-dist new-mode/ds) (lexer for-lex 0 mode)) diff --git a/tests/main.rkt b/tests/main.rkt index 6c09c15..d71d1af 100644 --- a/tests/main.rkt +++ b/tests/main.rkt @@ -28,15 +28,16 @@ (with-input-from-file cover (lambda () (values (ranges->numbers (read)) (ranges->numbers (read)))))) (define covered? (make-covered? actual-coverage program)) + (define (test-range range type) + (for ([i range]) + (define v (covered? i)) + (unless (eq? v 'irrelevant) + (check-equal? v type + (format "expected char ~a to be covered, but it was not, in: ~s" + i program))))) (test-begin - (for ([i expected-coverage]) - (check-true (covered? i actual-coverage) - (format "expected char ~a to be covered, but it was not, in: ~s" - i program))) - (for ([i expected-uncoverage]) - (check-true (not (covered? i actual-coverage)) - (format "expected char ~a to be uncovered, but it was, in: ~s" - i program))))) + (test-range expected-coverage 'covered) + (test-range expected-uncoverage 'uncovered))) (clear-coverage!))