fixing test errors

This commit is contained in:
Spencer Florence 2015-03-30 22:39:29 -04:00
parent e051103467
commit 06c9d417dd
2 changed files with 10 additions and 9 deletions

View File

@ -75,13 +75,13 @@
(define (make-irrelevant? lexer f submods) (define (make-irrelevant? lexer f submods)
(define s (mutable-set)) (define s (mutable-set))
(define-values (for-lex for-str) (replicate-file-port f (current-input-port))) (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 str (apply vector (string->list (port->string for-str))))
(define init-offset (- (string-length (file->string f)) (define init-offset (- (string-length (file->string f))
(vector-length str))) (vector-length str)))
(define offset (make-byte->str-offset str)) (define offset (make-byte->str-offset str))
(let loop ([mode #f]) (let loop ([mode #f])
(define-values (v type _m start end backup-dist new-mode/ds) (define-values (v type _m start end backup-dist new-mode/ds)
(lexer for-lex 0 mode)) (lexer for-lex 0 mode))

View File

@ -29,15 +29,16 @@
(with-input-from-file cover (lambda () (values (ranges->numbers (read)) (with-input-from-file cover (lambda () (values (ranges->numbers (read))
(ranges->numbers (read)))))) (ranges->numbers (read))))))
(define covered? (make-covered? actual-coverage program)) (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 (test-begin
(for ([i expected-coverage]) (test-range expected-coverage 'covered)
(check-equal? (covered? i) 'covered (test-range expected-uncoverage 'uncovered)))
(format "expected char ~a to be covered, but it was not, in: ~s"
i program)))
(for ([i expected-uncoverage])
(check-equal? (covered? i) 'uncovered
(format "expected char ~a to be uncovered, but it was, in: ~s"
i program)))))
(clear-coverage!)) (clear-coverage!))