Author: dylan
Date: 2005-06-20 17:21:42 -0400 (Mon, 20 Jun 2005)
New Revision: 784
Added:
trunk/perl/core/t/005_util.t
Modified:
trunk/
trunk/perl/core/lib/Haver/Util.pm
Log:
[EMAIL PROTECTED]: dylan | 2005-06-20 17:20:20 -0400
added new test case for Haver::Util and uncovered a bug in Haver::Util
because of it. Whee!
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43050
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1116
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
+ 1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/havercurs-objc:43050
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk:11166
1f59643a-e6e5-0310-bc24-f7d4c744f460:/haver/local/trunk-merge-10131:11178
27e50396-46e3-0310-8b22-ae223a1f35ce:/local:212
e9404bb1-7af0-0310-a7ff-e22194cd388b:/haver/local:1117
edfcd8bd-4ce7-0310-a97e-bb1efd40edf3:/local:238
Modified: trunk/perl/core/lib/Haver/Util.pm
===================================================================
--- trunk/perl/core/lib/Haver/Util.pm 2005-06-20 21:21:40 UTC (rev 783)
+++ trunk/perl/core/lib/Haver/Util.pm 2005-06-20 21:21:42 UTC (rev 784)
@@ -13,15 +13,17 @@
name => [qw( is_valid_name is_reserved_name )],
);
-our $NamePattern = qr/^&?[a-z][a-z0-9_.'@-]+$/i;
+our $NamePattern = qr/^&?[a-z][a-z0-9_.'[EMAIL PROTECTED]/i;
sub is_valid_name {
my $name = shift;
+ return undef unless defined $name;
$name =~ $NamePattern;
}
sub is_reserved_name {
my $name = shift;
+ return undef unless defined $name;
$name =~ /^&/ or $name =~ /@/;
}
Added: trunk/perl/core/t/005_util.t
===================================================================
--- trunk/perl/core/t/005_util.t 2005-06-20 21:21:40 UTC (rev 783)
+++ trunk/perl/core/t/005_util.t 2005-06-20 21:21:42 UTC (rev 784)
@@ -0,0 +1,23 @@
+#!/usr/bin/perl
+# vim: set ft=perl:
+
+use Test::More tests => 14;
+BEGIN {
+ use_ok('Haver::Util', qw( is_valid_name is_reserved_name ));
+};
+
+ok(is_reserved_name('&bob'), "is_reserved_name");
+ok(is_reserved_name('[EMAIL PROTECTED]'), "is_reserved_name");
+ok(not(is_reserved_name('bob')), "is_reserved_name");
+ok(is_valid_name(q{foo}), "is_valid_name");
+ok(is_valid_name(q{o'foo}), "is_valid_name");
+ok(is_valid_name([EMAIL PROTECTED]), "is_valid_name");
+ok(is_valid_name(q{o'[EMAIL PROTECTED]), "is_valid_name");
+ok(not(is_valid_name('123')), 'is_valid_name');
+ok(not(is_valid_name('foo%bar')), 'is_valid_name');
+ok(not(is_valid_name('#foo')), 'is_valid_name');
+ok(not(is_valid_name(undef)), 'is_valid_name');
+ok(not(is_valid_name('')), 'is_valid_name');
+ok(not(is_valid_name(' ')), 'is_valid_name');
+
+
