Merge branch 'jc/streaming-filter' into next

[git.git] / t / t4018-diff-funcname.sh

diff --git a/t/t4018-diff-funcname.sh b/t/t4018-diff-funcname.sh
index ad74c605a4a63e61593646110d651ebbf05f7e4e..b68c56b68c0f80a0d96b513733bc5fb17db6fed4 100755 (executable)
--- a/t/t4018-diff-funcname.sh
+++ b/t/t4018-diff-funcname.sh
@@ -29,6 +29,69 @@ public class Beer
 }
 EOF
 sed 's/beer\\/beer,\\/' <Beer.java >Beer-correct.java
+cat >Beer.perl <<\EOT
+package Beer;
+
+use strict;
+use warnings;
+use parent qw(Exporter);
+our @EXPORT_OK = qw(round finalround);
+
+sub other; # forward declaration
+
+# hello
+
+sub round {
+       my ($n) = @_;
+       print "$n bottles of beer on the wall ";
+       print "$n bottles of beer\n";
+       print "Take one down, pass it around, ";
+       $n = $n - 1;
+       print "$n bottles of beer on the wall.\n";
+}
+
+sub finalround
+{
+       print "Go to the store, buy some more\n";
+       print "99 bottles of beer on the wall.\n");
+}
+
+sub withheredocument {
+       print <<"EOF"
+decoy here-doc
+EOF
+       # some lines of context
+       # to pad it out
+       print "hello\n";
+}
+
+__END__
+
+=head1 NAME
+
+Beer - subroutine to output fragment of a drinking song
+
+=head1 SYNOPSIS
+
+       use Beer qw(round finalround);
+
+       sub song {
+               for (my $i = 99; $i > 0; $i--) {
+                       round $i;
+               }
+               finalround;
+       }
+
+       song;
+
+=cut
+EOT
+sed -e '
+       s/hello/goodbye/
+       s/beer\\/beer,\\/
+       s/more\\/more,\\/
+       s/song;/song();/
+' <Beer.perl >Beer-correct.perl
 
 test_config () {
        git config "$1" "$2" &&
@@ -36,8 +99,9 @@ test_config () {
 }
 
 test_expect_funcname () {
-       test_expect_code 1 git diff --no-index \
-               Beer.java Beer-correct.java >diff &&
+       lang=${2-java}
+       test_expect_code 1 git diff --no-index -U1 \
+               "Beer.$lang" "Beer-correct.$lang" >diff &&
        grep "^@@.*@@ $1" diff
 }
 
@@ -65,13 +129,40 @@ test_expect_success 'default behaviour' '
 '
 
 test_expect_success 'set up .gitattributes declaring drivers to test' '
-       echo "*.java diff=java" >.gitattributes
+       cat >.gitattributes <<-\EOF
+       *.java diff=java
+       *.perl diff=perl
+       EOF
 '
 
 test_expect_success 'preset java pattern' '
        test_expect_funcname "public static void main("
 '
 
+test_expect_success 'preset perl pattern' '
+       test_expect_funcname "sub round {\$" perl
+'
+
+test_expect_success 'perl pattern accepts K&R style brace placement, too' '
+       test_expect_funcname "sub finalround\$" perl
+'
+
+test_expect_success 'but is not distracted by end of <<here document' '
+       test_expect_funcname "sub withheredocument {\$" perl
+'
+
+test_expect_success 'perl pattern is not distracted by sub within POD' '
+       test_expect_funcname "=head" perl
+'
+
+test_expect_success 'perl pattern gets full line of POD header' '
+       test_expect_funcname "=head1 SYNOPSIS\$" perl
+'
+
+test_expect_success 'perl pattern is not distracted by forward declaration' '
+       test_expect_funcname "package Beer;\$" perl
+'
+
 test_expect_success 'custom pattern' '
        test_config diff.java.funcname "!static
 !String