diff --git a/mozilla/webtools/testopia/.project b/mozilla/webtools/testopia/.project index 3e1b4df33fa..0b5ffe80c61 100644 --- a/mozilla/webtools/testopia/.project +++ b/mozilla/webtools/testopia/.project @@ -1,6 +1,6 @@ - testopia-1.0 + testopia-1.0-2.22 diff --git a/mozilla/webtools/testopia/Bugzilla/Conifg/Testopia.pm b/mozilla/webtools/testopia/Bugzilla/Conifg/Testopia.pm new file mode 100644 index 00000000000..c3f9ca56eab --- /dev/null +++ b/mozilla/webtools/testopia/Bugzilla/Conifg/Testopia.pm @@ -0,0 +1,136 @@ +#!/usr/bin/perl -wT +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Test Runner System. +# +# The Initial Developer of the Original Code is Maciej Maczynski. +# Portions created by Maciej Maczynski are Copyright (C) 2001 +# Maciej Maczynski. All Rights Reserved. +# +# Contributor(s): Maciej Maczynski +# Ed Fuentetaja +# Greg Hendricks + +package Bugzilla::Config::Testopia; + +use strict; + +use Bugzilla::Config::Common; + +$Bugzilla::Config::Admin::sortkey = "20"; + +sub get_param_list { + my $class = shift; + my @param_list = ( + { + name => 'private-cases-log', + type => 'b', + default => 0, + }, + + { + name => 'allow-test-deletion', + type => 'b', + default => 0, + }, + + { + name => 'print-tag-in-case-log', + type => 'b', + default => 0, + }, + + { + name => 'new-case-action-template', + type => 'l', + default => qq{
    +
  1. +
}, + }, + + { + name => 'new-case-effect-template', + type => 'l', + default => qq{
    +
  1. +
}, + }, + + { + name => 'bug-to-test-case-summary', + type => 'l', + default => 'Check bug %id%', + }, + + { + name => 'bug-to-test-case-action', + type => 'l', + default => 'Verify if a bug %id% is fixed' + }, + + { + name => 'bug-to-test-case-effect', + type => 'l', + default => 'Bug %id% is fixed', + }, + + { + name => 'default-test-case-status', + type => 's', + choices => ['PROPOSED', 'CONFIRMED', 'DISABLED'], + default => 'PROPOSED' + }, + + { + name => 'new-testrun-email-notif', + type => 'l', + default => 'From: bugzilla-daemon'."\n". + 'To: %to%'."\n". + 'Subject: Test run started.'."\n". + "\n". + 'Test run \'%summary%\' for product \'%product%\' and test plan \'%plan%\' has '. + 'just been started.' + }, + + { + name => 'case-failed-email-notif', + type => 'l', + default => 'From: bugzilla-daemon'."\n". + 'To: %manager%'."\n". + 'Subject: Case log \'%id%\' marked as failed.'."\n". + "\n". + 'Test case log \'%id%\' in test run \'%test_run%\' was marked as \'failed\' by %tester%.' + }, + + { + name => 'tester-completed-email-notif', + type => 'l', + default => 'From: bugzilla-daemon'."\n". + 'To: %manager%'."\n". + 'Subject: Test run completed for tester.'."\n". + "\n". + 'Tester %tester% has completed the test run \'%test_run%\'.' + }, + + { + name => 'test-run-completed-email-notif', + type => 'l', + default => 'From: bugzilla-daemon'."\n". + 'To: %manager%'."\n". + 'Subject: Test run completed.'."\n". + "\n". + 'Test run \'%test_run%\' completed.' + } +); +} +1; diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm index 007c411e2f6..524e26204bf 100644 --- a/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm +++ b/mozilla/webtools/testopia/Bugzilla/Testopia/TestCase.pm @@ -729,6 +729,23 @@ sub lookup_status { return $value; } +=head2 lookup_status_by_name + +Returns the id of the status name passed. + +=cut + +sub lookup_status_by_name { + my ($name) = @_; + my $dbh = Bugzilla->dbh; + my ($value) = $dbh->selectrow_array( + "SELECT case_status_id + FROM test_case_status + WHERE name = ?", + undef, $name); + return $value; +} + =head2 lookup_category Takes an ID of the category field and returns the value diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm index f67cc7a74f5..86d681e0327 100644 --- a/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm +++ b/mozilla/webtools/testopia/Bugzilla/Testopia/TestPlan.pm @@ -627,6 +627,25 @@ sub lookup_product { return $value; } +=head2 lookup_product_by_name + +Returns the id of the product name passed. + +=cut + +sub lookup_product_by_name { + my ($name) = @_; + my $dbh = Bugzilla->dbh; + + # TODO 2.22 use Product.pm + my ($value) = $dbh->selectrow_array( + "SELECT id + FROM products + WHERE name = ?", + undef, $name); + return $value; +} + =head2 canedit Returns true if the logged in user has rights to edit this plan diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/Xml.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/Xml.pm new file mode 100644 index 00000000000..86b2a1d5081 --- /dev/null +++ b/mozilla/webtools/testopia/Bugzilla/Testopia/Xml.pm @@ -0,0 +1,448 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Test Runner System. +# +# The Initial Developer of the Original Code is Maciej Maczynski. +# Portions created by Maciej Maczynski are Copyright (C) 2001 +# Maciej Maczynski. All Rights Reserved. +# +# Contributor(s): David Koenig + +=head1 NAME + +Bugzilla::Testopia::Xml - Testopia Xml object + +=head1 DESCRIPTION + +This module parsers a XML representation of a Testopia test plan, +test case, test environment, category or build and returns Testopia +objects re + +=head1 SYNOPSIS + +use Bugzilla::Testopia::Xml; + +=cut + +package Bugzilla::Testopia::Xml; +#use fields qw(testplans testcases tags categories builds); + +use strict; + +use Bugzilla::Config; +use Bugzilla::Error; +use Bugzilla::Product; +use Bugzilla::Testopia::Attachment; +use Bugzilla::Testopia::Build; +use Bugzilla::Testopia::Category; +use Bugzilla::Testopia::TestCase; +use Bugzilla::Testopia::TestPlan; +use Bugzilla::Testopia::TestRun; +use Bugzilla::Testopia::TestTag; +use Bugzilla::Testopia::Util; +use Bugzilla::Testopia::XmlTestCase; +use Bugzilla::User; +use Bugzilla::Util; + +use Class::Struct; +# +# The Xml structure is used to keep track of all new Testopia objects being created. +# +struct +( + 'Bugzilla::Testopia::Xml', + { + attachments => '@', + builds => '@', + categories => '@', + tags => '@', + testenvironments => '@', + testcases => '@', + testplans => '@', + parse_error => '$', + } +); + +#TODO: Add this to checksetup +use Text::Diff; + +#use base qw(Exporter); + + +############################### +#### Initialization #### +############################### + +=head1 FIELDS + +=cut + +############################### +#### Methods #### +############################### + +=head2 new + +Instantiate a new xml object. This takes a single argument + +Instantiate a new test plan. This takes a single argument +either a test plan ID or a reference to a hash containing keys +identical to a test plan's fields and desired values. + +=cut + +#sub new { +# my Bugzilla::Testopia::Xml $self = fields::new(ref($invocant) || $invocant); +# $self->{testplans} = []; +# $self->{testcases} = []; +# $self->{tags} = []; +# $self->{categories} = []; +# $self->{builds} = []; +# return $self; +#} + +sub debug_display() +{ + my ($self) = @_; + my $attachments_array_ref = $self->attachments; + my $categories_array_ref = $self->categories; + my $testcases_array_ref = $self->testcases; + my $testplans_array_ref = $self->testplans; + + foreach my $category ( @$categories_array_ref ) + { + bless($category,"Bugzilla::Testopia::Category"); + + print STDERR "Category: " . $category->name() . "\n"; + my $category_id = "null"; + $category_id = $category->id() if ( $category->id() ); + print STDERR " ID " . $category_id . "\n"; + print STDERR " Product ID " . $category->product_id() . "\n"; + print STDERR " Description " . $category->description() . "\n"; + } + + foreach my $testplan ( @$testplans_array_ref ) + { + bless($testplan,"Bugzilla::Testopia::TestPlan"); + + print STDERR "Testplan: " . $testplan->name() . "\n"; + my $testplan_id = "null"; + $testplan_id = $testplan->id() if ( $testplan->id() ); + print STDERR " ID " . $testplan_id . "\n"; + my %author = %{$testplan->author()}; + my $author_id = $author{"id"}; + my $author_login = $author{"login"}; + print STDERR " Author " . $author_login . " (id=" . $author_id . ", hash=" . $testplan->author() . ")\n"; + print STDERR " Creation Date " . $testplan->creation_date() . "\n"; + print STDERR " Description " . $testplan->text() . "\n"; + print STDERR " Default Product Version " . $testplan->product_version() . "\n"; + print STDERR " Document " . $testplan->text() . "\n"; + my %editor = %{$testplan->editor()}; + my $editor_id = $editor{"id"}; + my $editor_login = $editor{"login"}; + print STDERR " Editor " . $editor_login . " (id=" . $editor_id . ", hash=" . $testplan->editor() . ")\n"; + print STDERR " Is Active " . $testplan->isactive() . "\n"; + print STDERR " Product " . $testplan->product_id() . "\n"; + print STDERR " Type " . $testplan->type_id() . "\n"; + + foreach my $tag ( @{$self->tags} ) + { + print STDERR " Tag " . $tag . "\n"; + } + + my @attachments = @{$testplan->attachments()}; + foreach my $attachment (@attachments) + { + my %submitter = %{$testplan->submitter()}; + my $author_login = $author{"login"}; + print STDERR " Attachment " . $attachment->description() . "\n"; + print STDERR " Creation Date " . $attachment->creation_ts(). "\n"; + print STDERR " Filename " . $attachment->filename() . "\n"; + print STDERR " Mime Type " . $attachment->mime_type(). "\n"; + print STDERR " Submitter " . $author_login . "\n"; + } + } + + foreach my $testcase ( @$testcases_array_ref ) + { + bless($testcase,"Bugzilla::Testopia::XmlTestCase"); + $testcase->debug_display(); + } +} + +sub error() +{ + my ($self, $message) = @_; + + print STDERR $message . "\n"; + + $self->parse_error("TRUE"); +} + +sub parse() +{ + my ($self, $xml) = @_; + my $twig = XML::Twig->new(); + $twig->parse($xml); + my $root = $twig->root; + + my $attachments_array_ref = $self->attachments; + my $categories_array_ref = $self->categories; + my $testplans_array_ref = $self->testplans; + my $testcases_array_ref = $self->testcases; + + foreach my $twig_category ($root->children('category')) + { + my $product = new Bugzilla::Product({name => $twig_category->field('product')}); + if ( ! $product ) + { + $self->error("Cannot find product '" . $twig_category->field('product') . "' for category '" . $twig_category->field('name') . "'."); + $self->{"parser_error"} = 1; + next; + } + my $category = new Bugzilla::Testopia::Category + ({ + name => $twig_category->field('name'), + product_id => $product->id(), + description => $twig_category->field('description'), + }); + push @$categories_array_ref, $category; + } + + my $testplan = Bugzilla::Testopia::TestPlan->new({ 'name' => 'dummy' }); + my %plantype_ids; + my @temparray = @{$testplan->get_plan_types()}; + foreach my $arrayelement (@temparray) + { + my %temphash = %{$arrayelement}; + $plantype_ids{$temphash{"name"}} = $temphash{"id"}; + } + + foreach my $twig_testplan ($root->children('testplan')) + { + my $author = $twig_testplan->field('author'); + # Bugzilla::User::match returns a array with a user hash. Fields of the hash needed + # are 'id' and 'login'. + my $author_ref = Bugzilla::User::match($author, 1, 0); + my $author_id = -1; + if ( ! $author_ref->[0] ) + { + $self->error("Cannot find author '" . $author . "' in test plan '" . $twig_testplan->field('name') . "'."); + } + else + { + my $author_user = $author_ref->[0]; + bless($author_user,"Bugzilla::User"); + $author_id = $author_user->id(); + } + my $editor = $twig_testplan->field('editor'); + my $editor_ref = Bugzilla::User::match($editor, 1, 0); + my $editor_id = -1; + if ( ! $editor_ref->[0] ) + { + $self->error("Cannot find editor '" . $editor . "' in test plan '" . $twig_testplan->field('name') . "'."); + } + else + { + my $editor_user = $editor_ref->[0]; + bless($editor_user,"Bugzilla::User"); + $editor_id = $editor_user->id(); + } + $testplan = Bugzilla::Testopia::TestPlan->new({ + 'name' => $twig_testplan->field('name'), + 'product_id' => Bugzilla::Testopia::TestPlan::lookup_product_by_name($twig_testplan->field('product')), + 'default_product_version' => $twig_testplan->field('productversion'), + 'type_id' => $plantype_ids{$twig_testplan->field('type')}, + 'text' => $twig_testplan->field('document'), + 'author_id' => $author_id, + 'editor_id' => $editor_id, + 'isactive' => $twig_testplan->field('archive'), + 'creation_date' => $twig_testplan->field('created') + }); + push @$testplans_array_ref, $testplan; + + my @tags = $twig_testplan->children('tag'); + foreach my $twig_tag (@tags) + { + push @{$self->tags}, $twig_tag->text(); + } + + my @attachments = $twig_testplan->children('attachment'); + foreach my $twig_attachments (@attachments) + { + my $attachment = Bugzilla::Testopia::Attachment->new({ + 'description' => $twig_attachments->field('description'), + 'filename' => $twig_attachments->field('filename'), + 'submitter_id' => $twig_attachments->field('submitter'), + 'mime_type' => $twig_attachments->field('mimetype'), + 'creation_ts' => $twig_attachments->field('created'), + 'data' => $twig_attachments->field('data') + }); + push @$attachments_array_ref, $attachment; + #$testplan->add_tag($tag->id()); + } + } + + my $testcase = Bugzilla::Testopia::TestCase->new({ 'name' => 'dummy' }); + my %priority_ids; + @temparray = @{$testcase->get_priority_list()}; + foreach my $arrayelement (@temparray) + { + my %temphash = %{$arrayelement}; + my $longname = $temphash{"name"}; + # The long name. "P1 - Urgent" + $priority_ids{$longname} = $temphash{"id"}; + # The short name. "P1" + my $shortname = $longname; + $shortname =~ s/ - .*//; + $priority_ids{$shortname} = $temphash{"id"} if ( $longname ne $shortname ); + } + foreach my $twig_testcase ($root->children('testcase')) + { + my $author = $twig_testcase->field('author'); + # Bugzilla::User::match returns a array with a user hash. Fields of the hash needed + # are 'id' and 'login'. + my $author_ref = Bugzilla::User::match($author, 1, 0); + my $author_id = -1; + if ( ! $author_ref->[0] ) + { + $self->error("Cannot find author '" . $author . "' in test case '" . $twig_testcase->field('summary') . "'."); + } + else + { + my $author_user = $author_ref->[0]; + bless($author_user,"Bugzilla::User"); + $author_id = $author_user->id(); + } + my $tester = $twig_testcase->field('defaulttester'); + # Bugzilla::User::match returns a array with a user hash. Fields of the hash needed + # are 'id' and 'login'. + my $tester_ref = Bugzilla::User::match($tester, 1, 0); + my $tester_id = -1; + if ( ! $tester_ref->[0] ) + { + $self->error("Cannot find default tester '" . $tester . "' in test case '" . $twig_testcase->field('summary') . "'."); + } + else + { + my $tester_user = $tester_ref->[0]; + bless($tester_user,"Bugzilla::User"); + $tester_id = $tester_user->id(); + } + my $status_id = Bugzilla::Testopia::TestCase::lookup_status_by_name($twig_testcase->field('status')); + $self->error("Cannot find status '" . $twig_testcase->field('status') . "' in test case '" . $twig_testcase->field('summary') . "'.") if ( ! defined($status_id) ); + + my $xml_testcase = new Bugzilla::Testopia::XmlTestCase; + $xml_testcase->testcase(Bugzilla::Testopia::TestCase->new({ + 'action' => $twig_testcase->field('action'), + 'alias' => $twig_testcase->field('alias') || undef, + 'arguments' => $twig_testcase->field('arguments'), + 'author_id' => $author_id, + #TODO: Blocks + 'blocks' => undef, + + 'case_status_id' => $status_id, + 'category_id' => undef, + 'creation_date' => $twig_testcase->field('created'), + 'default_tester_id' => $tester_id, + #TODO: Depends On + 'dependson' => undef, + 'effect' => $twig_testcase->field('effect'), + 'expectedresults' => $twig_testcase->field('expectedresults'), + 'isautomated' => $twig_testcase->field('isautomated'), + 'plans' => undef, + 'priority_id' => $priority_ids{$twig_testcase->field('priority')}, + 'requirement' => $twig_testcase->field('requirement'), + 'script' => $twig_testcase->field('script'), + 'summary' => $twig_testcase->field('summary'), + })); + # Action field is html format. + my $action = $twig_testcase->field('action'); + $action =~ s/\n/
/g; + $xml_testcase->action($action); + $xml_testcase->category($twig_testcase->field('category')); + # Expectedresults field is html format. + my $expectedresults = $twig_testcase->field('expectedresults'); + $expectedresults =~ s/\n/
/g; + $xml_testcase->expectedresults($expectedresults); + push @$testcases_array_ref, $xml_testcase; + + my @tags = $twig_testcase->children('tag'); + foreach my $twig_tag (@tags) + { + $xml_testcase->add_tag($twig_tag->text()); + } + + #my @components; + #foreach my $id (@comps){ + # detaint_natural($id); + # validate_selection($id, 'id', 'components'); + # push @components, $id; + #} + + #$case->add_component($_) foreach (@components); + } + + #TODO Verfication of data. + #Test cases require a category or store will fail. + + # Don't really care about the value of parse_error. If it has been defined then a error occurred + # parsing the XML. + if ( ! defined $self->parse_error ) + { +# $self->debug_display(); + my @testplanarray; + + foreach my $testplan ( @{$self->testplans} ) + { + my $plan_id = $testplan->store(); + $testplan->{'plan_id'} = $plan_id; + foreach my $asciitag ( @{$self->tags} ) + { + my $classtag = Bugzilla::Testopia::TestTag->new({'tag_name' => $asciitag}); + my $tagid = $classtag->store; + $testplan->{'tag_id'} = $tagid; + $testplan->add_tag($tagid); + } + + push @testplanarray, $testplan; + } + + foreach my $testcase ( @{$self->testcases} ) + { + bless($testcase,"Bugzilla::Testopia::XmlTestCase"); + my $result = $testcase->store($testplan->{'author_id'},@testplanarray); + if ( $result ne "" ) + { + $self->error($result); + } + } + } + $twig->purge; +} + +=head1 TODO + +Use Bugzilla::Product and Version in 2.22 + +=head1 SEE ALSO + +Testopia::(TestRun, TestCase, Category, Build, Evnironment) + +=head1 AUTHOR + +David Koenig + +=cut + +1; diff --git a/mozilla/webtools/testopia/Bugzilla/Testopia/XmlTestCase.pm b/mozilla/webtools/testopia/Bugzilla/Testopia/XmlTestCase.pm new file mode 100644 index 00000000000..dc6c21f3726 --- /dev/null +++ b/mozilla/webtools/testopia/Bugzilla/Testopia/XmlTestCase.pm @@ -0,0 +1,205 @@ +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Test Runner System. +# +# The Initial Developer of the Original Code is Maciej Maczynski. +# Portions created by Maciej Maczynski are Copyright (C) 2001 +# Maciej Maczynski. All Rights Reserved. +# +# Contributor(s): David Koenig + +=head1 NAME + +Bugzilla::Testopia::XmlTestCase - Testopia XmlTestCase object + +=head1 DESCRIPTION + +This module parsers a XML representation of a Testopia test plan, +test case, test environment, category or build and returns Testopia +objects re + +=head1 SYNOPSIS + +use Bugzilla::Testopia::XmlTestCase; + +=cut + +package Bugzilla::Testopia::XmlTestCase; +#use fields qw(testplans testcases tags categories builds); + +use strict; + +use Bugzilla::Product; +use Bugzilla::Testopia::Attachment; +use Bugzilla::Testopia::Build; +use Bugzilla::Testopia::Category; +use Bugzilla::Testopia::TestCase; +use Bugzilla::Testopia::TestPlan; +use Bugzilla::Testopia::TestRun; +use Bugzilla::Testopia::TestTag; +use Bugzilla::Testopia::Util; +use Bugzilla::User; +use Bugzilla::Util; + +use Class::Struct; +# +# The XmlTestCase structure stores data for the verfication processing. The database is not updated +# until a verfication pass is made through the XML data. Some of the TestCase class references are +# database references that will not be valid until the class has been stored in the database. This +# structure stores these references to be used during verfication and writting to the database. +# +struct +( + 'Bugzilla::Testopia::XmlTestCase', + { + action => '$', + blocks => '@', + category => '$', + dependson => '@', + expectedresults => '$', + tags => '@', + testcase => 'Bugzilla::Testopia::TestCase', + } +); + +sub debug_display() +{ + my ($self) = @_; + my $display_variable = ""; + + print STDERR "Testcase: " . $self->testcase->summary() . "\n"; + my $testcase_id = "null"; + $testcase_id = $self->testcase->id() if ( $self->testcase->id() ); + print STDERR " ID " . $testcase_id . "\n"; + print STDERR " Action\n"; + my @results = split(/\n/,$self->action); + foreach my $result (@results) + { + print STDERR " $result\n"; + } + my $alias = "null"; + $alias = $self->testcase-alias() if ( $self->testcase->alias() ); + print STDERR " Alias " . $alias . "\n"; + my %author = %{$self->testcase->author()}; + my $author_id = $author{"id"}; + my $author_login = $author{"login"}; + print STDERR " Author " . $author_login . " (id=" . $author_id . ", hash=" . $self->testcase->author() . ")\n"; + foreach my $loop ( @{$self->blocks} ) + { + $display_variable .= $loop . ","; + } + chop $display_variable; + print STDERR " Blocks " . $display_variable . "\n"; + $display_variable = ""; + print STDERR " Category " . $self->category . "\n"; + print STDERR " Creation Date " . $self->testcase->creation_date() . "\n"; + foreach my $loop ( @{$self->blocks} ) + { + $display_variable .= $loop . ","; + } + chop $display_variable; + print STDERR " Dependson " . $display_variable . "\n"; + $display_variable = ""; + print STDERR " Expected Results\n"; + @results = split(/\n/,$self->expectedresults); + foreach my $result (@results) + { + print STDERR " $result\n"; + } + print STDERR " Summary " . $self->testcase->summary() . "\n"; + #TODO:print STDERR " Default Product Version " . $self->testcase->product_version() . "\n"; + #TODO:print STDERR " Document " . $self->testcase->text() . "\n"; + my %tester = %{$self->testcase->default_tester()}; + my $tester_id = $tester{"id"}; + my $tester_login = $tester{"login"}; + print STDERR " Tester " . $tester_login . " (id=" . $tester_id . ", hash=" . $self->testcase->default_tester() . ")\n"; + print STDERR " Is Automated " . $self->testcase->isautomated() . "\n"; + #TODO:print STDERR " Plans " . $self->testcase->plans() . "\n"; + #TODO:print STDERR " Priority " . $self->testcase->priority_id() . "\n"; + #TODO:print STDERR " Product " . $self->testcase->product_id() . "\n"; + print STDERR " Requirement " . $self->testcase->requirement() . "\n"; + + print STDERR " Script " . $self->testcase->script() . "\n"; + print STDERR " Script Arguments " . $self->testcase->arguments() . "\n"; + print STDERR " Status " . $self->testcase->status() . "\n"; + + foreach my $tag (@{$self->tags}) + { + print STDERR " Tag " . $tag . "\n"; + } + + my @attachments = @{$self->testcase->attachments()}; + foreach my $attachment (@attachments) + { + my %submitter = %{$self->testcase->submitter()}; + my $author_login = $author{"login"}; + print STDERR " Attachment " . $attachment->description() . "\n"; + print STDERR " Creation Date " . $attachment->creation_ts(). "\n"; + print STDERR " Filename " . $attachment->filename() . "\n"; + print STDERR " Mime Type " . $attachment->mime_type(). "\n"; + print STDERR " Submitter " . $author_login . "\n"; + } +} + +sub add_tag() +{ + my ($self,$tag) = @_; + + push @{$self->tags}, $tag; +} + +sub store() +{ + my ($self, $userid, @testplans) = @_; + + # + # Following code pulled from Bugzilla::Testopia::TestCase->get_category_list(). + # Cannot call Bugzilla::Testopia::TestCase->get_category_list() until we create a + # TestCase but cannot create a TestCase without a category. + # + my @categories; + foreach my $testplan (@testplans) + { + push @categories, @{$testplan->categories}; + } + my $categoryid = -1; + foreach my $category (@categories) + { + my %temphash = %{$category}; + if ( $self->category eq $temphash{"name"} ) + { + $categoryid = $temphash{"category_id"}; + last; + } + } + return "Cannot save test case '" . $self->testcase->summary . "', Category '" . $self->category . "' is not valid." if ( $categoryid == -1 ); + $self->testcase->{'category_id'} = $categoryid; + + my $case_id = $self->testcase->store(); + $self->testcase->{'case_id'} = $case_id; + foreach my $asciitag ( @{$self->tags} ) + { + my $classtag = Bugzilla::Testopia::TestTag->new({'tag_name' => $asciitag}); + my $tagid = $classtag->store; + $self->testcase->add_tag($tagid); + } + foreach my $testplan ( @testplans ) + { + $self->testcase->link_plan($testplan->id(),$case_id) + } + $self->testcase->store_text($case_id,$userid,$self->action,$self->expectedresults); + + return ""; +} + +1; diff --git a/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl b/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl index 408eae8d3cf..292186dde15 100644 --- a/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/hook/global/useful-links.html.tmpl/end/tr.html.tmpl @@ -21,41 +21,33 @@ New Run |  Current Runs |  Environments |  - - - - -
-
- Test Case # - - -
- 		-
- Test Run # - - -
- 		-
- Test Plan # - - -
- 		-
- Tag - - -
-
+ Test Case # +
+ + +
 |  + Test Run # +
+ + +
 |  + Test Plan # +
+ + +

Search |  [% IF user.login %] My Plans |  My Cases |  My Runs |  [% END %] - Help |  + Help |  + Tag +
+ + +

+ diff --git a/mozilla/webtools/testopia/template/en/default/hook/index.html.tmpl/links/tr.html.tmpl b/mozilla/webtools/testopia/template/en/default/hook/index.html.tmpl/links/tr.html.tmpl index 3ce8dde62bb..b0e956eaa4c 100644 --- a/mozilla/webtools/testopia/template/en/default/hook/index.html.tmpl/links/tr.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/hook/index.html.tmpl/links/tr.html.tmpl @@ -6,21 +6,16 @@

Testopia

- -

Testopia 1.0-beta choices:

-

Do - some testing
- Manage - test plans
- Search - existing test cases
- Manage run - environments

+ +

Testopia choices:

+

Do some testing
+ Manage test plans
+ Search existing test cases
+ Manage run environments

diff --git a/mozilla/webtools/testopia/template/en/default/testopia/tag/table.html.tmpl b/mozilla/webtools/testopia/template/en/default/testopia/tag/table.html.tmpl index dbc9731a0c9..b103dc92dd5 100644 --- a/mozilla/webtools/testopia/template/en/default/testopia/tag/table.html.tmpl +++ b/mozilla/webtools/testopia/template/en/default/testopia/tag/table.html.tmpl @@ -23,7 +23,7 @@ #%]
-
+
diff --git a/mozilla/webtools/testopia/testopia/dojo-ajax/dojo.js.uncompressed.js b/mozilla/webtools/testopia/testopia/dojo-ajax/dojo.js.uncompressed.js index 4b96189de0f..fce06fd30da 100644 --- a/mozilla/webtools/testopia/testopia/dojo-ajax/dojo.js.uncompressed.js +++ b/mozilla/webtools/testopia/testopia/dojo-ajax/dojo.js.uncompressed.js @@ -6,7 +6,7 @@ * @author Copyright 2004 Mark D. Anderson (mda@discerning.com) * @author Licensed under the Academic Free License 2.1 http://www.opensource.org/licenses/afl-2.1.php * -* $Id: dojo.js.uncompressed.js,v 1.2 2006-07-18 17:37:33 ghendricks%novell.com Exp $ +* $Id: dojo.js.uncompressed.js,v 1.3 2006-07-28 22:32:36 ghendricks%novell.com Exp $ */ /** diff --git a/mozilla/webtools/testopia/testopia/dojo-ajax/src/bootstrap1.js b/mozilla/webtools/testopia/testopia/dojo-ajax/src/bootstrap1.js index 609ea9ff549..f8c63ed883a 100644 --- a/mozilla/webtools/testopia/testopia/dojo-ajax/src/bootstrap1.js +++ b/mozilla/webtools/testopia/testopia/dojo-ajax/src/bootstrap1.js @@ -6,7 +6,7 @@ * @author Copyright 2004 Mark D. Anderson (mda@discerning.com) * @author Licensed under the Academic Free License 2.1 http://www.opensource.org/licenses/afl-2.1.php * -* $Id: bootstrap1.js,v 1.1.1.1 2006-06-13 15:09:50 ghendricks Exp $ +* $Id: bootstrap1.js,v 1.2 2006-07-28 22:32:35 ghendricks%novell.com Exp $ */ /** diff --git a/mozilla/webtools/testopia/testopia/environment.dtd b/mozilla/webtools/testopia/testopia/environment.dtd index e69de29bb2d..6df22bb1b03 100644 --- a/mozilla/webtools/testopia/testopia/environment.dtd +++ b/mozilla/webtools/testopia/testopia/environment.dtd @@ -0,0 +1,49 @@ + + +machine name id + software + os + application name + version + product + version + component + build + option name type + package name + version + driver + module + + hardware + cpu + arch + memory + disk + video + audio + peripheral + network + IP + Netmask + MAC + option name type + + +externals name type + +Platform (CPU, OS) +Product (3rd Party and Internal) +Build (ability to select multiple builds) +Version (Ability to select multiple versions) +Packages +Browsers +Drivers +Kernel Modules +Architecture (64, 32, amd, Intel, SMP) +Components + - Hardware (Video, Audio, Memory, Disk, USB, Peripherals, Network cards, ...) + - Software +Applications (perhaps this is accounted for in others in the list) +Network IP +Machine \ No newline at end of file diff --git a/mozilla/webtools/testopia/testopia/patch-2.22 b/mozilla/webtools/testopia/testopia/patch-2.22 new file mode 100644 index 00000000000..5811a10298c --- /dev/null +++ b/mozilla/webtools/testopia/testopia/patch-2.22 @@ -0,0 +1,55 @@ +diff -u -r workspace/bmo2-20-2-tp10/enter_bug.cgi temp/bbmo-2.20.2-clean/enter_bug.cgi +--- workspace/bmo2-20-2-tp10/enter_bug.cgi 2005-10-23 15:50:34.000000000 -0600 ++++ temp/bbmo-2.20.2-clean/enter_bug.cgi 2006-06-01 16:54:24.000000000 -0600 +@@ -587,6 +587,8 @@ + + $vars->{'default'} = \%default; + ++$vars->{'caserun_id'} = $cgi->param('caserun_id'); ++ + my $format = + GetFormat("bug/create/create", scalar $cgi->param('format'), + scalar $cgi->param('ctype')); +diff -u -r workspace/bmo2-20-2-tp10/post_bug.cgi temp/bbmo-2.20.2-clean/post_bug.cgi +--- workspace/bmo2-20-2-tp10/post_bug.cgi 2006-01-08 12:54:34.000000000 -0700 ++++ temp/bbmo-2.20.2-clean/post_bug.cgi 2006-06-01 16:54:24.000000000 -0600 +@@ -34,6 +34,9 @@ + + use Bugzilla::User; + ++use Bugzilla::Testopia::TestCaseRun; ++use Bugzilla::Testopia::Util; ++ + # Shut up misguided -w warnings about "used only once". For some reason, + # "use vars" chokes on me when I try it here. + sub sillyness { +@@ -476,6 +479,17 @@ + } + $vars->{'bug_list'} = \@bug_list; + ++if ($cgi->param('caserun_id')) { ++ my $tcid = $cgi->param('caserun_id'); ++ detaint_natural($tcid); ++ validate_test_id($tcid, 'case_run'); ++ my $caserun = Bugzilla::Testopia::TestCaseRun->new($tcid); ++ ++ $caserun->attach_bug($id); ++ ++ $vars->{'caserun'} = $caserun; ++} ++ + print $cgi->header(); + $template->process("bug/create/created.html.tmpl", $vars) + || ThrowTemplateError($template->error()); +diff -u -r workspace/bmo2-20-2-tp10/template/en/default/bug/create/created.html.tmpl temp/bbmo-2.20.2-clean/template/en/default/bug/create/created.html.tmpl +--- workspace/bmo2-20-2-tp10/template/en/default/bug/create/created.html.tmpl 2005-07-27 14:56:09.000000000 -0600 ++++ temp/bbmo-2.20.2-clean/template/en/default/bug/create/created.html.tmpl 2006-06-01 16:55:06.000000000 -0600 +@@ -51,7 +51,7 @@ + [% END %] + +
+- ++[% Hook.process("message") %] +
+ + [% PROCESS bug/edit.html.tmpl %] diff --git a/mozilla/webtools/testopia/tr_case_dependencies.cgi b/mozilla/webtools/testopia/tr_case_dependencies.cgi new file mode 100755 index 00000000000..8254759a8fa --- /dev/null +++ b/mozilla/webtools/testopia/tr_case_dependencies.cgi @@ -0,0 +1,43 @@ +#!/usr/bin/perl -wT +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Test Runner System. +# +# The Initial Developer of the Original Code is Maciej Maczynski. +# Portions created by Maciej Maczynski are Copyright (C) 2001 +# Maciej Maczynski. All Rights Reserved. +# +# Contributor(s): Greg Hendricks + +use strict; +use lib "."; + +use Bugzilla; +use Bugzilla::Util; +use Bugzilla::Error; +use Bugzilla::Config; +use Bugzilla::Testopia::TestCase; +use Bugzilla::Testopia::Util; + +Bugzilla->login(); + +my $cgi = Bugzilla->cgi; + +print $cgi->header; +use vars qw($vars $template); +my $template = Bugzilla->template; + +push @{$::vars->{'style_urls'}}, 'testopia/css/default.css'; + +my $case = Bugzilla::Testopia::TestCase->new(1); +print join(",", @{$case->get_dep_tree}); diff --git a/mozilla/webtools/testopia/tr_importxml.pl b/mozilla/webtools/testopia/tr_importxml.pl new file mode 100644 index 00000000000..84b312e1d20 --- /dev/null +++ b/mozilla/webtools/testopia/tr_importxml.pl @@ -0,0 +1,194 @@ +#!/usr/bin/perl -w +# -*- Mode: perl; indent-tabs-mode: nil -*- +# +# The contents of this file are subject to the Mozilla Public +# License Version 1.1 (the "License"); you may not use this file +# except in compliance with the License. You may obtain a copy of +# the License at http://www.mozilla.org/MPL/ +# +# Software distributed under the License is distributed on an "AS +# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or +# implied. See the License for the specific language governing +# rights and limitations under the License. +# +# The Original Code is the Bugzilla Bug Tracking System. +# +# The Initial Developer of the Original Code is Netscape Communications +# Corporation. Portions created by Netscape are +# Copyright (C) 1998 Netscape Communications Corporation. All +# Rights Reserved. +# +# Contributor(s): Dawn Endico +# Gregary Hendricks +# Vance Baarda + + +# This script reads in xml bug data from standard input and inserts +# a new bug into bugzilla. Everything before the beginning \$debug, + "help|?" => \$help); + +pod2usage(0) if $help; + +use constant DEBUG_LEVEL => 2; +use constant ERR_LEVEL => 1; + + +GetVersionTable(); +our $log; +our @attachments; +our $bugtotal; +our @recipients; +my $xml; + +# This can go away as soon as data/versioncache is removed. Since we still +# have to use GetVersionTable() though, it stays for now. + +sub Debug { + return unless ($debug); + my ($message, $level) = (@_); + print STDERR "ERR: ". $message ."\n" if ($level == ERR_LEVEL); + print STDERR "$message\n" if (($debug == $level) && ($level == DEBUG_LEVEL)); +} + +sub Error { + my ($reason,$errtype) = @_; + my $subject = "Bug import error: $reason"; + my $message = "Cannot import these bugs because $reason "; + $message .= "\n\nPlease re-open the original bug.\n" if ($errtype); + $message .= "For more info, contact ". Param("maintainer") . ".\n"; + my @to = (Param("maintainer")); + Debug($message, ERR_LEVEL); + exit(1); +} + +Debug("Reading xml", DEBUG_LEVEL); +# Read STDIN in slurp mode. VERY dangerous, but we live on the wild side ;-) +local($/); +$xml = <>; + +Debug("Parsing tree", DEBUG_LEVEL); + +my $testopiaXml = Bugzilla::Testopia::Xml->new(); +$testopiaXml->parse($xml); + +exit 0; + +__END__ + +=head1 NAME + +importxml - Import bugzilla bug data from xml. + +=head1 SYNOPSIS + + importxml.pl [options] [file ...] + + Options: + -? --help Brief help message. + -v --verbose Print error and debug information. + Multiple -v options increase verbosity. + +=head1 OPTIONS + +=over 8 + +=item B<-?> + + Print a brief help message and exits. + +=item B<-v> + + Print error and debug information. Mulltiple -v increases verbosity + +=item B<-m> + + Send mail to exporter with a log of bugs imported and any errors. + +=back + +=head1 DESCRIPTION + + This script is used import bugs from another installation of bugzilla. + It can be used in two ways. + First using the move function of bugzilla + on another system will send mail to an alias provided by + the administrator of the target installation (you). Set up an alias + similar to the one given below so this mail will be automatically + run by this script and imported into your database. Run 'newaliases' + after adding this alias to your aliases file. Make sure your sendmail + installation is configured to allow mail aliases to execute code. + + bugzilla-import: "|/usr/bin/perl /opt/bugzilla/importxml.pl --mail" + + Second it can be run from the command line with any xml file from + STDIN that conforms to the bugzilla DTD. In this case you can pass + an argument to set whether you want to send the + mail that will be sent to the exporter and maintainer normally. + + importxml.pl [options] < bugsfile.xml + +=cut diff --git a/mozilla/webtools/testopia/tr_install.pl b/mozilla/webtools/testopia/tr_install.pl index 26f37ad19a6..33a1368ce7c 100644 --- a/mozilla/webtools/testopia/tr_install.pl +++ b/mozilla/webtools/testopia/tr_install.pl @@ -191,6 +191,9 @@ sub doPatch { } elsif ($Bugzilla::Config::VERSION =~ /^2\.20.*/) { # version 2.20.* detected $fPatch = "patch-2.20"; + } elsif ($Bugzilla::Config::VERSION =~ /^2\.22.*/) { + # version 2.20.* detected + $fPatch = "patch-2.22"; } else { # no suitable version available DieWithStyle("No suitable patch detected for your Bugzilla. Patch cannot continue.\n". diff --git a/mozilla/webtools/testopia/tr_list_caseruns.cgi b/mozilla/webtools/testopia/tr_list_caseruns.cgi index 4f9ea508fb5..26d2a5b0afb 100755 --- a/mozilla/webtools/testopia/tr_list_caseruns.cgi +++ b/mozilla/webtools/testopia/tr_list_caseruns.cgi @@ -23,6 +23,7 @@ use strict; use lib "."; use Bugzilla; +use Bugzilla::Bug; use Bugzilla::Util; use Bugzilla::Error; use Bugzilla::Constants; @@ -33,7 +34,7 @@ use Bugzilla::Testopia::Table; use vars qw($vars $template); require "globals.pl"; -require "CGI.pl"; + my $dbh = Bugzilla->dbh; my $cgi = Bugzilla->cgi; my $template = Bugzilla->template; diff --git a/mozilla/webtools/testopia/tr_list_cases.cgi b/mozilla/webtools/testopia/tr_list_cases.cgi index acec40778f3..617860f3e23 100755 --- a/mozilla/webtools/testopia/tr_list_cases.cgi +++ b/mozilla/webtools/testopia/tr_list_cases.cgi @@ -36,7 +36,7 @@ use Bugzilla::Testopia::Table; use vars qw($vars $template); require "globals.pl"; -require "CGI.pl"; + my $dbh = Bugzilla->dbh; my $cgi = Bugzilla->cgi; my $template = Bugzilla->template; diff --git a/mozilla/webtools/testopia/tr_new_case.cgi b/mozilla/webtools/testopia/tr_new_case.cgi index 6dc679270c0..a6f9acc73e1 100755 --- a/mozilla/webtools/testopia/tr_new_case.cgi +++ b/mozilla/webtools/testopia/tr_new_case.cgi @@ -33,6 +33,7 @@ use Bugzilla::Testopia::TestCase; require "globals.pl"; use vars qw($template $vars); +my $template = Bugzilla->template; Bugzilla->login(LOGIN_REQUIRED); ThrowUserError("testopia-create-denied", {'object' => 'Test Case'}) unless UserInGroup('edittestcases'); diff --git a/mozilla/webtools/testopia/tr_new_plan.cgi b/mozilla/webtools/testopia/tr_new_plan.cgi index e747ec4b94b..6fd5521eaab 100755 --- a/mozilla/webtools/testopia/tr_new_plan.cgi +++ b/mozilla/webtools/testopia/tr_new_plan.cgi @@ -33,6 +33,7 @@ use Bugzilla::Testopia::TestPlan; require "globals.pl"; use vars qw($template $vars); +my $template = Bugzilla->template; Bugzilla->login(LOGIN_REQUIRED); ThrowUserError("testopia-create-denied", {'object' => 'Test Plan'}) unless UserInGroup('managetestplans'); diff --git a/mozilla/webtools/testopia/tr_new_run.cgi b/mozilla/webtools/testopia/tr_new_run.cgi index ab7d9e0b02d..b2b791b6c21 100755 --- a/mozilla/webtools/testopia/tr_new_run.cgi +++ b/mozilla/webtools/testopia/tr_new_run.cgi @@ -35,6 +35,7 @@ use Bugzilla::Testopia::Table; require "globals.pl"; use vars qw($template $vars); +my $template = Bugzilla->template; Bugzilla->login(LOGIN_REQUIRED); ThrowUserError("testopia-create-denied", {'object' => 'Test Run'}) unless UserInGroup('edittestcases'); diff --git a/mozilla/webtools/testopia/tr_plan_reports.cgi b/mozilla/webtools/testopia/tr_plan_reports.cgi index 89153096b0a..45226dae241 100755 --- a/mozilla/webtools/testopia/tr_plan_reports.cgi +++ b/mozilla/webtools/testopia/tr_plan_reports.cgi @@ -31,6 +31,7 @@ use Bugzilla::Util; use Bugzilla::Testopia::Util; use vars qw($template $vars); +my $template = Bugzilla->template; Bugzilla->login(); print Bugzilla->cgi->header(); diff --git a/mozilla/webtools/testopia/tr_show_case.cgi b/mozilla/webtools/testopia/tr_show_case.cgi index 0fb19bde9a1..51182f1ef93 100755 --- a/mozilla/webtools/testopia/tr_show_case.cgi +++ b/mozilla/webtools/testopia/tr_show_case.cgi @@ -34,6 +34,7 @@ use Bugzilla::Testopia::Search; use Bugzilla::Testopia::Table; use vars qw($template $vars); +my $template = Bugzilla->template; require "globals.pl"; diff --git a/mozilla/webtools/testopia/tr_show_caserun.cgi b/mozilla/webtools/testopia/tr_show_caserun.cgi index 37f99808de0..c296430b87e 100755 --- a/mozilla/webtools/testopia/tr_show_caserun.cgi +++ b/mozilla/webtools/testopia/tr_show_caserun.cgi @@ -23,6 +23,7 @@ use strict; use lib "."; use Bugzilla; +use Bugzilla::Bug; use Bugzilla::Constants; use Bugzilla::Error; use Bugzilla::Util; @@ -33,10 +34,10 @@ use Bugzilla::Testopia::TestCase; use Bugzilla::Testopia::TestCaseRun; use vars qw($template $vars); +my $template = Bugzilla->template; # These are going away after 2.22 require "globals.pl"; -require "CGI.pl"; Bugzilla->login(); print Bugzilla->cgi->header(); @@ -96,7 +97,6 @@ if ($action eq 'Commit'){ last; } } -# $notes =~ s/"/\\"/g; $vars->{'existing'} = $existing; $vars->{'assignee'} = $cgi->param('assignee'); $vars->{'status_name'} = $status; diff --git a/mozilla/webtools/testopia/tr_show_plan.cgi b/mozilla/webtools/testopia/tr_show_plan.cgi index dc278585ad3..da03b5b32a8 100755 --- a/mozilla/webtools/testopia/tr_show_plan.cgi +++ b/mozilla/webtools/testopia/tr_show_plan.cgi @@ -40,6 +40,7 @@ use Bugzilla::Testopia::Table; require "globals.pl"; use vars qw($template $vars); +my $template = Bugzilla->template; Bugzilla->login(); print Bugzilla->cgi->header(); diff --git a/mozilla/webtools/testopia/tr_show_run.cgi b/mozilla/webtools/testopia/tr_show_run.cgi index e4eb9d5a0b5..082b8dac2e2 100755 --- a/mozilla/webtools/testopia/tr_show_run.cgi +++ b/mozilla/webtools/testopia/tr_show_run.cgi @@ -34,6 +34,7 @@ use Bugzilla::Testopia::Search; use Bugzilla::Testopia::Table; use vars qw($template $vars); +my $template = Bugzilla->template; require "globals.pl";