GroupText.t: fix number of tests

Session/Id.pm: add a method to validate GUIDs, change s/// to tr/// for efficiency.
Session.pm: change open to use new Id.pm validation method
Scratch.t: Change test from ok to is so that it tells you what the failing ID is.
Id.t: Add validation tests in addition to uniqueness tests.  Fix the uniqueness test so that it works.  Add tests to check the new validation method
This commit is contained in:
Colin Kuskie 2006-07-15 01:54:49 +00:00
parent 41bdf0e28d
commit f3a1f0f9f2
6 changed files with 65 additions and 8 deletions

View file

@ -23,7 +23,7 @@ my $session = WebGUI::Test->session;
use Test::More; # increment this value for each test you create
plan tests => 4 + 4;
plan tests => 3 + 4;
unless ($session->config->get('macros')->{'GroupText'}) {
Macro_Config::insert_macro($session, 'GroupText', 'GroupText');

View file

@ -14,21 +14,64 @@ use lib "$FindBin::Bin/../lib";
use WebGUI::Test;
use WebGUI::Session;
use Test::More tests => 2; # increment this value for each test you create
use WebGUI::Utility;
use Test::More;
my @testSets = (
{
comment => 'too short',
guid => 'tooShort',
valid => '',
},
{
comment => 'too long',
guid => '12345678901234567890123',
valid => '',
},
{
comment => 'contains white space',
guid => ' 23456 890123456789012',
valid => '',
},
{
comment => 'contains illegal punctuation',
guid => '12#4%67*901234&678901.',
valid => '',
},
{
comment => 'MD5 style',
guid => '==//abcdeZYXWV01234567',
valid => '',
},
{
comment => 'GUID style',
guid => '--__abcdeZYXWV0123456A',
valid => 1,
},
);
my $session = WebGUI::Test->session;
plan tests => scalar(@testSets) + 3;
# generate
my $generateId = $session->id->generate();
is(length($generateId), 22, "generate() - length of 22 characters");
my @uniqueIds;
my $isUnique = 1;
my $isValid = 1;
for (1..2000) {
last unless $isUnique;
my $id = $session->id->generate();
$isUnique = !isIn($id,@uniqueIds);
$isUnique = ($isUnique ? !isIn($id,@uniqueIds) : 0);
$isValid = ($isValid ? $session->id->valid($id) : 0);
push(@uniqueIds,$id);
}
ok($isUnique, "generate() - unique");
ok($isValid, "generate() - valid id generated");
foreach my $testSet (@testSets) {
is($session->id->valid($testSet->{guid}), $testSet->{valid}, $testSet->{comment});
}

View file

@ -58,7 +58,7 @@ for (my $count = 1; $count <= $maxCount; $count++){
##Creating a new session with the previous session's Id should clone the scratch data
my $newSession = WebGUI::Session->open(WebGUI::Test->root, WebGUI::Test->file, undef, undef, $session->getId);
ok($newSession->getId eq $session->getId, "Successful session duplication");
is($newSession->getId, $session->getId, "Successful session duplication");
for (my $count = 1; $count <= $maxCount; $count++){
is($newSession->scratch->get("dBase$count"), $count, "Passed set/get $count");