Chipping away at the barfly

MANIFEST

@@ -70,8 +70,8 @@ t/ack-underline.barfly
 t/ack-underline.t
 t/ack-v.yaml
 t/ack-version.t
-t/ack-w.barfly
 t/ack-w.t
+t/ack-w.yaml
 t/ack-x.t
 t/anchored.t
 t/bad-ackrc-opt.t

t/ack-w.t

@@ -3,18 +3,15 @@
 use warnings;
 use strict;
 
-use Test::More tests => 15;
+use Test::More tests => 8;
 
 use lib 't';
 use Util;
-use Barfly;
 
 prep_environment();
 
 my $ACK = $ENV{ACK_TEST_STANDALONE} ? 'ack-standalone' : 'ack';
 
-Barfly->run_tests( 't/ack-w.barfly' );
-
 subtest '-w with trailing metachar \w' => sub {
     plan tests => 1;
 

t/ack-w.yaml

@@ -0,0 +1,130 @@
+---
+name: Straight -w
+args: -w foo
+ordered: true
+stdin: |
+  foo
+  foo bar
+  foobar
+  foot
+  underfoot
+  football
+  foo-foo football
+  End of the line foo
+  I pity da foo'.
+stdout: |
+  foo
+  foo bar
+  foo-foo football
+  End of the line foo
+  I pity da foo'.
+
+---
+name: -w and optional character
+args:
+  - -w foot?
+  - -w (foot?)
+  - "-w (?:foot?)"
+ordered: true
+stdin: |
+  foo
+  foot
+  Trampled underfoot
+  foobarf
+  foo-bar
+  foo-bart
+  Our ten-foot foo-bird is foobar.
+  football
+stdout: |
+  foo
+  foot
+  foo-bar
+  foo-bart
+  Our ten-foot foo-bird is foobar.
+
+---
+name: -w and optional character, highlighting
+args: -w foot? --underline
+ordered: true
+stdin: |
+  Trampled underfoot
+  foobarf
+  Our ten-foot foo-bird is foobar.
+  football
+stdout: |
+  Our ten-foot foo-bird is foobar.
+          ^^^^ ^^^
+
+---
+name: -w and optional group
+args:
+  - -w foo(bar)?
+ordered: true
+stdin: |
+  foo
+  foobar
+  foo-bar
+  foo-bart
+  Trampled underfoot
+  foobarf
+stdout: |
+  foo
+  foobar
+  foo-bar
+  foo-bart
+  
+---
+name: -w and alternation
+args:
+  - -w foo|bar
+  - -w (foo|bar)
+ordered: true
+stdin: |
+  bar
+  barfly
+  barometric
+  foo
+  fubar
+  schmfoo
+  schmofool
+  subarometric
+stdout: |
+  bar
+  foo
+
+---
+name: -w and function definition
+args:
+  - -w (set|get)_user_(name|perm)
+  - -w ((set|get)_user_(name|perm))
+  - "-w (?:(?:set|get)_user_(?:name|perm))"
+  - "-w (?:(set|get)_user_(name|perm))"
+  - "-w ((?:set|get)_user_(?:name|perm))"
+ordered: true
+stdin: |
+  get_user_perm
+  get_user_permission
+  reset_user_name
+  set_user_name
+stdout: |
+  get_user_perm
+  set_user_name
+
+---
+name: Single-letter words
+args:
+  - -w \w
+ordered: true
+stdin: |
+  A
+  b
+  c
+  !E!
+  NO
+  dd
+  xxx
+stdout: |
+  A
+  b
+  c
+  !E!

t/yaml.t

@@ -3,7 +3,7 @@
 use warnings;
 use strict;
 
-use Test::More tests => 16;
+use Test::More tests => 17;
 
 use lib 't';
 use Util;