fixed a port-line/character counting issue.

This commit is contained in:
Spencer Florence 2015-03-30 22:56:24 -04:00
parent 06c9d417dd
commit 85896752a9

View File

@ -75,7 +75,6 @@
(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)))
@ -163,19 +162,20 @@
(module+ test (module+ test
(define-runtime-path path2 "../tests/prog.rkt") (define-runtime-path path2 "../tests/prog.rkt")
(test-begin (parameterize ([irrelevant-submodules #f])
(define f (path->string (simplify-path path2))) (test-begin
(test-files! f) (define f (path->string (simplify-path path2)))
(define coverage (hash-ref (get-test-coverage) f)) (test-files! f)
(define covered? (make-covered? coverage f)) (define coverage (hash-ref (get-test-coverage) f))
(check-equal? (covered? 14) 'irrelevant) (define covered? (make-covered? coverage f))
(check-equal? (covered? 14 #:byte? #t) 'irrelevant) (check-equal? (covered? 14) 'irrelevant)
(check-equal? (covered? 17) 'irrelevant) (check-equal? (covered? 14 #:byte? #t) 'irrelevant)
(check-equal? (covered? 28) 'irrelevant) (check-equal? (covered? 17) 'irrelevant)
(check-equal? (covered? 35) 'covered) (check-equal? (covered? 28) 'irrelevant)
(check-equal? (covered? 50) 'uncovered) (check-equal? (covered? 35) 'covered)
(check-equal? (covered? 51 #:byte? #t) 'uncovered) (check-equal? (covered? 50) 'uncovered)
(check-equal? (covered? 52) 'irrelevant) (check-equal? (covered? 51 #:byte? #t) 'uncovered)
(check-equal? (covered? 53) 'irrelevant) (check-equal? (covered? 52) 'irrelevant)
(check-equal? (covered? 54) 'irrelevant) (check-equal? (covered? 53) 'irrelevant)
(clear-coverage!))) (check-equal? (covered? 54) 'irrelevant)
(clear-coverage!))))