fixed RT #132059, -dac was causing an error exit

diff --git a/t/snippets/expect/rt132059.def b/t/snippets/expect/rt132059.def
new file mode 100644 (file)
index 0000000..56854f5
--- /dev/null
+++ b/t/snippets/expect/rt132059.def
@@ -0,0 +1,14 @@
+# Test deleting comments and pod
+$1 = 2;
+
+sub f {    # a side comment
+           # a hanging side comment
+
+    # a block comment
+}
+
+=pod
+bonjour!
+=cut
+
+$i++;

diff --git a/t/snippets/expect/rt132059.rt132059 b/t/snippets/expect/rt132059.rt132059
new file mode 100644 (file)
index 0000000..dd8c4ab
--- /dev/null
+++ b/t/snippets/expect/rt132059.rt132059
@@ -0,0 +1,8 @@
+$1 = 2;
+
+sub f {
+    
+}
+
+
+$i++;

diff --git a/t/snippets/rt132059.in b/t/snippets/rt132059.in
new file mode 100644 (file)
index 0000000..604e3ce
--- /dev/null
+++ b/t/snippets/rt132059.in
@@ -0,0 +1,13 @@
+# Test deleting comments and pod
+$1=2;
+sub f { # a side comment
+ # a hanging side comment
+
+# a block comment
+}
+
+=pod
+bonjour!
+=cut
+
+$i++;

diff --git a/t/snippets/rt132059.par b/t/snippets/rt132059.par
new file mode 100644 (file)
index 0000000..7ae8ead
--- /dev/null
+++ b/t/snippets/rt132059.par
@@ -0,0 +1 @@
+-dac

diff --git a/t/snippets17.t b/t/snippets17.t
new file mode 100644 (file)
index 0000000..0a6c1ec
--- /dev/null
+++ b/t/snippets17.t
@@ -0,0 +1,142 @@
+# Created with: ./make_t.pl
+
+# Contents:
+#1 rt132059.def
+#2 rt132059.rt132059
+
+# To locate test #13 you can search for its name or the string '#13'
+
+use strict;
+use Test;
+use Carp;
+use Perl::Tidy;
+my $rparams;
+my $rsources;
+my $rtests;
+
+BEGIN {
+
+    ###########################################
+    # BEGIN SECTION 1: Parameter combinations #
+    ###########################################
+    $rparams = {
+        'def'      => "",
+        'rt132059' => "-dac",
+    };
+
+    ############################
+    # BEGIN SECTION 2: Sources #
+    ############################
+    $rsources = {
+
+        'rt132059' => <<'----------',
+# Test deleting comments and pod
+$1=2;
+sub f { # a side comment
+ # a hanging side comment
+
+# a block comment
+}
+
+=pod
+bonjour!
+=cut
+
+$i++;
+----------
+    };
+
+    ####################################
+    # BEGIN SECTION 3: Expected output #
+    ####################################
+    $rtests = {
+
+        'rt132059.def' => {
+            source => "rt132059",
+            params => "def",
+            expect => <<'#1...........',
+# Test deleting comments and pod
+$1 = 2;
+
+sub f {    # a side comment
+           # a hanging side comment
+
+    # a block comment
+}
+
+=pod
+bonjour!
+=cut
+
+$i++;
+#1...........
+        },
+
+        'rt132059.rt132059' => {
+            source => "rt132059",
+            params => "rt132059",
+            expect => <<'#2...........',
+$1 = 2;
+
+sub f {
+    
+}
+
+
+$i++;
+#2...........
+        },
+    };
+
+    my $ntests = 0 + keys %{$rtests};
+    plan tests => $ntests;
+}
+
+###############
+# EXECUTE TESTS
+###############
+
+foreach my $key ( sort keys %{$rtests} ) {
+    my $output;
+    my $sname  = $rtests->{$key}->{source};
+    my $expect = $rtests->{$key}->{expect};
+    my $pname  = $rtests->{$key}->{params};
+    my $source = $rsources->{$sname};
+    my $params = defined($pname) ? $rparams->{$pname} : "";
+    my $stderr_string;
+    my $errorfile_string;
+    my $err = Perl::Tidy::perltidy(
+        source      => \$source,
+        destination => \$output,
+        perltidyrc  => \$params,
+        argv        => '',             # for safety; hide any ARGV from perltidy
+        stderr      => \$stderr_string,
+        errorfile => \$errorfile_string,    # not used when -se flag is set
+    );
+    if ( $err || $stderr_string || $errorfile_string ) {
+        if ($err) {
+            print STDERR
+"This error received calling Perl::Tidy with '$sname' + '$pname'\n";
+            ok( !$err );
+        }
+        if ($stderr_string) {
+            print STDERR "---------------------\n";
+            print STDERR "<<STDERR>>\n$stderr_string\n";
+            print STDERR "---------------------\n";
+            print STDERR
+"This error received calling Perl::Tidy with '$sname' + '$pname'\n";
+            ok( !$stderr_string );
+        }
+        if ($errorfile_string) {
+            print STDERR "---------------------\n";
+            print STDERR "<<.ERR file>>\n$errorfile_string\n";
+            print STDERR "---------------------\n";
+            print STDERR
+"This error received calling Perl::Tidy with '$sname' + '$pname'\n";
+            ok( !$errorfile_string );
+        }
+    }
+    else {
+        ok( $output, $expect );
+    }
+}