Skip to content

Commit

Permalink
update tests for grepInvert fix
Browse files Browse the repository at this point in the history
  • Loading branch information
isaacs committed Jun 23, 2017
1 parent 3c62917 commit b4a6c8f
Show file tree
Hide file tree
Showing 4 changed files with 114 additions and 86 deletions.
43 changes: 25 additions & 18 deletions test/test/grep--bail--buffer.tap
@@ -1,15 +1,22 @@
TAP version 13
ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - ___/.*/~~~ok.js ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - nesting # SKIP filter out: /nesting/
ok 2 - this passes
ok 3 - this passes too
ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
1..2
ok 1 - timeout
ok 2 - timeout
ok 1 - first # SKIP filter: /[ASDF].*d$/gi
ok 2 - second ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - but that is ok
ok 2 - this passes
ok 3 - nested ok
1..3
}

# skip: 1
}

ok 2 - this passes
ok 3 - this passes too
ok 4 - async kid # SKIP filter: /nesting/
ok 5 - pass after async kid
1..5
# skip: 1
Expand Down Expand Up @@ -44,35 +51,35 @@ ok 2 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=
# invert=false
ok 3 - a ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - x ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc # SKIP filter out: /b/
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 # SKIP filter out: /[246]+/
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - this is fine
1..1
}

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
}

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
}

ok 2 - y ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc # SKIP filter out: /b/
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 # SKIP filter out: /[246]+/
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - this is fine
1..1
}

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
}

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
}
Expand All @@ -87,18 +94,18 @@ ok 4 - a ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - x # SKIP filter out: /[^z]/
ok 2 - y # SKIP filter out: /[^z]/
ok 3 - z ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc # SKIP filter out: /b/
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 # SKIP filter out: /[246]+/
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - this is fine
1..1
}

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
}

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
}
Expand Down
57 changes: 32 additions & 25 deletions test/test/grep--bail.tap
@@ -1,15 +1,22 @@
TAP version 13
# Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi
# Subtest: ___/.*/~~~ok.js
ok 1 - nesting # SKIP filter out: /nesting/
ok 2 - this passes
ok 3 - this passes too
# Subtest: async kid
# Subtest: nesting
1..2
ok 1 - timeout
ok 2 - timeout
ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~
ok 1 - first # SKIP filter: /[ASDF].*d$/gi
# Subtest: second
ok 1 - but that is ok
ok 2 - this passes
ok 3 - nested ok
1..3
ok 2 - second ___/# time=[0-9.]+(ms)?/~~~

# skip: 1
ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~

ok 2 - this passes
ok 3 - this passes too
ok 4 - async kid # SKIP filter: /nesting/
ok 5 - pass after async kid
1..5
# skip: 1
Expand Down Expand Up @@ -44,35 +51,35 @@ ok 2 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=
# invert=false
# Subtest: a
# Subtest: x
ok 1 - abc # SKIP filter out: /b/
# Subtest: xyz
ok 1 - 123 # SKIP filter out: /[246]+/
# Subtest: ijk
# Subtest: abc
# Subtest: 123
ok 1 - this is fine
1..1
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
ok 1 - x ___/# time=[0-9.]+(ms)?/~~~

# Subtest: y
ok 1 - abc # SKIP filter out: /b/
# Subtest: xyz
ok 1 - 123 # SKIP filter out: /[246]+/
# Subtest: ijk
# Subtest: abc
# Subtest: 123
ok 1 - this is fine
1..1
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
ok 2 - y ___/# time=[0-9.]+(ms)?/~~~
Expand All @@ -87,18 +94,18 @@ ok 3 - a ___/# time=[0-9.]+(ms)?/~~~
ok 1 - x # SKIP filter out: /[^z]/
ok 2 - y # SKIP filter out: /[^z]/
# Subtest: z
ok 1 - abc # SKIP filter out: /b/
# Subtest: xyz
ok 1 - 123 # SKIP filter out: /[246]+/
# Subtest: ijk
# Subtest: abc
# Subtest: 123
ok 1 - this is fine
1..1
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
ok 3 - z ___/# time=[0-9.]+(ms)?/~~~
Expand Down
43 changes: 25 additions & 18 deletions test/test/grep--buffer.tap
@@ -1,15 +1,22 @@
TAP version 13
ok 1 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - ___/.*/~~~ok.js ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - nesting # SKIP filter out: /nesting/
ok 2 - this passes
ok 3 - this passes too
ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~ {
1..2
ok 1 - timeout
ok 2 - timeout
ok 1 - first # SKIP filter: /[ASDF].*d$/gi
ok 2 - second ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - but that is ok
ok 2 - this passes
ok 3 - nested ok
1..3
}

# skip: 1
}

ok 2 - this passes
ok 3 - this passes too
ok 4 - async kid # SKIP filter: /nesting/
ok 5 - pass after async kid
1..5
# skip: 1
Expand Down Expand Up @@ -44,35 +51,35 @@ ok 2 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=
# invert=false
ok 3 - a ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - x ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc # SKIP filter out: /b/
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 # SKIP filter out: /[246]+/
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - this is fine
1..1
}

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
}

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
}

ok 2 - y ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc # SKIP filter out: /b/
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 # SKIP filter out: /[246]+/
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - this is fine
1..1
}

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
}

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
}
Expand All @@ -87,18 +94,18 @@ ok 4 - a ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - x # SKIP filter out: /[^z]/
ok 2 - y # SKIP filter out: /[^z]/
ok 3 - z ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc # SKIP filter out: /b/
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 # SKIP filter out: /[246]+/
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~ {
ok 1 - this is fine
1..1
}

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
}

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
}
Expand Down
57 changes: 32 additions & 25 deletions test/test/grep.tap
@@ -1,15 +1,22 @@
TAP version 13
# Subtest: ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C --grep=nesting --grep=/[ASDF].*d$/gi
# Subtest: ___/.*/~~~ok.js
ok 1 - nesting # SKIP filter out: /nesting/
ok 2 - this passes
ok 3 - this passes too
# Subtest: async kid
# Subtest: nesting
1..2
ok 1 - timeout
ok 2 - timeout
ok 4 - async kid ___/# time=[0-9.]+(ms)?/~~~
ok 1 - first # SKIP filter: /[ASDF].*d$/gi
# Subtest: second
ok 1 - but that is ok
ok 2 - this passes
ok 3 - nested ok
1..3
ok 2 - second ___/# time=[0-9.]+(ms)?/~~~

# skip: 1
ok 1 - nesting ___/# time=[0-9.]+(ms)?/~~~

ok 2 - this passes
ok 3 - this passes too
ok 4 - async kid # SKIP filter: /nesting/
ok 5 - pass after async kid
1..5
# skip: 1
Expand Down Expand Up @@ -44,35 +51,35 @@ ok 2 - ___/.*(node|iojs)(.exe)?/~~~ ./bin/run.js ./test/test/ok.js -C -i --grep=
# invert=false
# Subtest: a
# Subtest: x
ok 1 - abc # SKIP filter out: /b/
# Subtest: xyz
ok 1 - 123 # SKIP filter out: /[246]+/
# Subtest: ijk
# Subtest: abc
# Subtest: 123
ok 1 - this is fine
1..1
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
ok 1 - x ___/# time=[0-9.]+(ms)?/~~~

# Subtest: y
ok 1 - abc # SKIP filter out: /b/
# Subtest: xyz
ok 1 - 123 # SKIP filter out: /[246]+/
# Subtest: ijk
# Subtest: abc
# Subtest: 123
ok 1 - this is fine
1..1
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
ok 2 - y ___/# time=[0-9.]+(ms)?/~~~
Expand All @@ -87,18 +94,18 @@ ok 3 - a ___/# time=[0-9.]+(ms)?/~~~
ok 1 - x # SKIP filter out: /[^z]/
ok 2 - y # SKIP filter out: /[^z]/
# Subtest: z
ok 1 - abc # SKIP filter out: /b/
# Subtest: xyz
ok 1 - 123 # SKIP filter out: /[246]+/
# Subtest: ijk
# Subtest: abc
# Subtest: 123
ok 1 - this is fine
1..1
ok 2 - ijk ___/# time=[0-9.]+(ms)?/~~~
ok 1 - 123 ___/# time=[0-9.]+(ms)?/~~~

ok 2 - ijk # SKIP filter: /[246]+/
1..2
# skip: 1
ok 2 - xyz ___/# time=[0-9.]+(ms)?/~~~
ok 1 - abc ___/# time=[0-9.]+(ms)?/~~~

ok 2 - xyz # SKIP filter: /b/
1..2
# skip: 1
ok 3 - z ___/# time=[0-9.]+(ms)?/~~~
Expand Down

0 comments on commit b4a6c8f

Please sign in to comment.