test_runner: add tests for TapParser

nodejs · Jun 27, 2022 · 4f44c29 · 4f44c29
1 parent ef65ab3
commit 4f44c29
Show file tree

Hide file tree

Showing 3 changed files with 396 additions and 4 deletions.
diff --git a/lib/internal/test_runner/tap_lexer.js b/lib/internal/test_runner/tap_lexer.js
@@ -29,10 +29,15 @@ class Token {
     this.value = value;
     this.location = {
       line: stream.line,
-      column: Math.max(stream.column - ('' + value).length + 1, 0),
-      start: stream.pos - ('' + value).length - 1, // zero based
-      end: stream.pos - 2, // zero based
+      column: Math.max(stream.column - ('' + value).length + 1, 1),
+      start: Math.max(stream.pos - ('' + value).length, 0), // zero based
+      end: stream.pos - 1, // zero based
     };
+
+    if (value === TokenKind.EOF) {
+      this.location.end = stream.pos;
+      this.location.column = stream.column;
+    }
   }
 }
 

diff --git a/lib/internal/test_runner/tap_parser.js b/lib/internal/test_runner/tap_parser.js
@@ -104,6 +104,7 @@ class TapParser {
         TokenKind.LITERAL,
         TokenKind.NUMERIC,
         TokenKind.DASH,
+        TokenKind.PLUS,
         TokenKind.WHITESPACE,
         TokenKind.ESCAPE,
       ].includes(nextToken.kind)
@@ -557,7 +558,7 @@ class TapParser {
     const pragmas = {};
 
     let nextToken = this.peek();
-    while (nextToken) {
+    while (nextToken && [TokenKind.EOL, TokenKind.EOF].includes(nextToken.kind) === false) {
       let isEnabled = true;
       const pragmaKeySign = this.next();
       if (pragmaKeySign.kind === TokenKind.PLUS) {