r43842 - in /trunk/libtest-warn-perl/debian: changelog patches/language.patch
dmn at users.alioth.debian.org
dmn at users.alioth.debian.org
Tue Sep 8 14:02:51 UTC 2009
Author: dmn
Date: Tue Sep 8 14:02:43 2009
New Revision: 43842
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=43842
Log:
adjust language.patch
Modified:
trunk/libtest-warn-perl/debian/changelog
trunk/libtest-warn-perl/debian/patches/language.patch
Modified: trunk/libtest-warn-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-warn-perl/debian/changelog?rev=43842&op=diff
==============================================================================
--- trunk/libtest-warn-perl/debian/changelog (original)
+++ trunk/libtest-warn-perl/debian/changelog Tue Sep 8 14:02:43 2009
@@ -13,6 +13,7 @@
[ Damyan Ivanov ]
* debian/watch: use the general CPAN pattern
* New upstream release
+ + adjust language.patch
-- Damyan Ivanov <dmn at debian.org> Tue, 08 Sep 2009 16:34:04 +0300
Modified: trunk/libtest-warn-perl/debian/patches/language.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libtest-warn-perl/debian/patches/language.patch?rev=43842&op=diff
==============================================================================
--- trunk/libtest-warn-perl/debian/patches/language.patch (original)
+++ trunk/libtest-warn-perl/debian/patches/language.patch Tue Sep 8 14:02:43 2009
@@ -4,7 +4,7 @@
--- a/Warn.pm
+++ b/Warn.pm
-@@ -9,13 +9,13 @@
+@@ -9,13 +9,13 @@ Test::Warn - Perl extension to test meth
warning_is {foo(-dri => "/")} "Unknown Parameter 'dri'", "dri != dir gives warning";
warnings_are {bar(1,1)} ["Width very small", "Height very small"];
@@ -21,9 +21,9 @@
warnings_like {foo()} [qr/undefined/,qr/undefined/,{carped => qr/no result/i}];
warning_like {foo(undef)} 'uninitialized';
-@@ -27,9 +27,9 @@
-
- =head1 DESCRIPTION
+@@ -31,9 +31,9 @@ Test::Warn - Perl extension to test meth
+
+ A good style of Perl programming calls for a lot of diverse regression tests.
-This module provides a few convenience methods for testing warning based code.
+This module provides a few convenience methods for testing warning-based code.
@@ -33,17 +33,17 @@
now would be the time to go take a look.
=head2 FUNCTIONS
-@@ -38,29 +38,29 @@
+@@ -42,29 +42,29 @@ now would be the time to go take a look.
=item warning_is BLOCK STRING, TEST_NAME
-Tests that BLOCK gives exactly the one specificated warning.
-The test fails if the BLOCK warns more then one times or doesn't warn.
-+Tests that BLOCK give exactly the one specified warning.
-+The test fails if the BLOCK warns more then one time or doesn't warn.
++Tests that BLOCK gives exactly the one specified warning.
++The test fails if the BLOCK warns more than one time or doesn't warn.
If the string is undef,
- then the tests succeeds iff the BLOCK doesn't give any warning.
--Another way to say that there aren't ary warnings in the block,
+ then the tests succeeds if the BLOCK doesn't give any warning.
+-Another way to say that there aren't any warnings in the block,
-is C<warnings_are {foo()} [], "no warnings in">.
+Another way to say that there aren't any warnings in the block
+is C<warnings_are {foo()} [], "no warnings">.
@@ -67,12 +67,12 @@
warning_is and warning_are are only aliases to the same method.
So you also could write
C<warning_is {foo()} [], "no warning"> or something similar.
--I decided me to give two methods to have some better readable method names.
+-I decided to give two methods to have some better readable method names.
+I decided to give two methods to have some more readable method names.
A true value is returned if the test succeeds, false otherwise.
-@@ -70,32 +70,33 @@
+@@ -74,32 +74,32 @@ The test name is optional, but recommend
=item warnings_are BLOCK ARRAYREF, TEST_NAME
Tests to see that BLOCK gives exactly the specificated warnings.
@@ -80,7 +80,7 @@
-would have expected.
+The test fails if the warnings from BLOCK are not exactly the ones in ARRAYREF.
If the ARRAYREF is equal to [],
- then the test succeeds iff the BLOCK doesn't give any warning.
+ then the test succeeds if the BLOCK doesn't give any warning.
Please read also the notes to warning_is as these methods are only aliases.
@@ -102,7 +102,7 @@
-The REGEXP is matched after the whole warn line,
-which consists in general of "WARNING at __FILE__ line __LINE__".
-So you can check for a warning in at File Foo.pm line 5 with
-+The REGEXP is matched against the whole warning message,
++The REGEXP is matched sagainst the whole warning line,
+which in general has the form "WARNING at __FILE__ line __LINE__".
+So you can check for a warning in the file Foo.pm on line 5 with
C<warning_like {bar()} qr/at Foo.pm line 5/, "Testname">.
@@ -110,14 +110,13 @@
-However, you should be prepared as a matching with 'at', 'file', '\d'
+Perhaps it isn't sensible to perform such a test;
+however, you should be aware that matching on a sweeping regular expression
-+such as 'at', 'file', '\d'
or similar will always pass.
-Think to the qr/^foo/ if you want to test for warning "foo something" in file foo.pl.
+Consider qr/^foo/ if you want to test for warning "foo something" in file foo.pl.
You can also write the regexp in a string as "/.../"
instead of using the qr/.../ syntax.
-@@ -103,7 +104,7 @@
+@@ -107,7 +107,7 @@ Note that the slashes are important in t
as strings without slashes are reserved for warning categories
(to match warning categories as can be seen in the perllexwarn man page).
@@ -126,19 +125,19 @@
you can test for warnings via C<carp> with:
C<warning_like {bar()} {carped => qr/bar called too early/i};>
-@@ -119,17 +120,18 @@
+@@ -123,17 +123,19 @@ The test name is optional, but recommend
Tests whether a BLOCK gives exactly one warning of the passed category.
The categories are grouped in a tree,
like it is expressed in perllexwarn.
-Note, that they have the hierarchical structure from perl 5.8.0,
-wich has a little bit changed to 5.6.1 or earlier versions
-(You can access the internal used tree with C<$Test::Warn::Categorization::tree>,
--allthough I wouldn't recommend it)
+Note that they have the hierarchical structure from perl 5.8.0,
-+which is slightly different from how it was organized up through perl 5.6.1.
-+(You can access the internal hierarchy with
++u can access the internal hierarchy with
+C<$Test::Warn::Categorization::tree>,
+although it isn't recommended).
++
+ although I wouldn't recommend it)
Thanks to the grouping in a tree,
-it's simple possible to test for an 'io' warning,
@@ -153,7 +152,7 @@
warning_like {eval q/"$x"; $x;/}
[qw/void uninitialized/],
-@@ -138,9 +140,8 @@
+@@ -142,9 +144,8 @@ can only be catched in an eval block. So
will work,
while it wouldn't work without the eval.
@@ -165,26 +164,26 @@
=item warnings_like BLOCK ARRAYREF, TEST_NAME
-@@ -160,7 +161,7 @@
+@@ -164,7 +165,7 @@ and for warning categories, too:
{carped => qr/bar warning/i},
'io'
],
- "I hope, you'll never have to write a test for so many warnings :-)";
+ "I hope you'll never have to write a test for so many warnings :-)";
- =back
-
-@@ -174,27 +175,28 @@
+ =item warnings_exist BLOCK STRING|ARRAYREF, TEST_NAME
+
+@@ -190,27 +191,28 @@ C<warnings_exist> by default.
=head1 BUGS
Please note that warnings with newlines inside are making a lot of trouble.
--The only sensful way to handle them is to use are the C<warning_like> or
+-The only sensible way to handle them is to use are the C<warning_like> or
-C<warnings_like> methods. Background for these problems is that there is no
-really secure way to distinguish between warnings with newlines and a tracing
+The only sensible way to handle them is to use the C<warning_like> or
+C<warnings_like> methods.
+The background for these problems is that there is no
-+really secure way to distinguish between warnings with newlines and a trailing
++really secure way to distinguish between warnings with newlines and a triling
stacktrace.
-If a method has it's own warn handler,
@@ -212,7 +211,7 @@
=head1 SEE ALSO
-@@ -359,7 +361,7 @@
+@@ -407,7 +409,7 @@ sub _diag_found_warning {
$Tester->diag( "found warning: $_" );
}
}
@@ -223,7 +222,7 @@
sub _diag_exp_warning {
--- a/t/warning_is.t
+++ b/t/warning_is.t
-@@ -77,7 +77,7 @@
+@@ -77,7 +77,7 @@ sub _found_warn_msg {
__FILE__,
"line",
WARN_LINE . ".") )
@@ -232,7 +231,7 @@
}
sub _exp_warn_msg {
-@@ -94,7 +94,7 @@
+@@ -94,7 +94,7 @@ sub _found_carp_msg {
__FILE__,
"line",
CARP_LINE) ) # Note the difference, that carp msg
@@ -243,7 +242,7 @@
sub _exp_carp_msg {
--- a/t/warning_like.t
+++ b/t/warning_like.t
-@@ -79,7 +79,7 @@
+@@ -80,7 +80,7 @@ sub _found_warn_msg {
__FILE__,
"line",
WARN_LINE . ".") )
@@ -252,7 +251,7 @@
}
sub _exp_warn_msg {
-@@ -96,7 +96,7 @@
+@@ -97,7 +97,7 @@ sub _found_carp_msg {
__FILE__,
"line",
CARP_LINE) ) # Note the difference, that carp msg
@@ -263,7 +262,7 @@
sub _exp_carp_msg {
--- a/t/warnings_are.t
+++ b/t/warnings_are.t
-@@ -81,12 +81,12 @@
+@@ -81,12 +81,12 @@ sub test_warnings_are {
sub _found_warn_msg {
@_ ? map({"found warning: $_ at ". __FILE__ . " line " . WARN_LINE . "." } @_)
@@ -280,7 +279,7 @@
--- a/t/warnings_like.t
+++ b/t/warnings_like.t
-@@ -83,12 +83,12 @@
+@@ -84,12 +84,12 @@ sub test_warnings_like {
sub _found_warn_msg {
@_ ? map({"found warning: $_ at ". __FILE__ . " line " . WARN_LINE . "." } @_)
More information about the Pkg-perl-cvs-commits
mailing list