Skip to content

Commit

Permalink
Item12952: Fix dependency on Dependency
Browse files Browse the repository at this point in the history 
The Department of Redundancy Department renamed Dependency::check() to
Dependency::checkDependency()

Unit tests run, 7 failures remain due to the Configure changes.
  • Loading branch information
@gac410
gac410 committed Aug 21, 2014
1 parent 159e2bd commit 7c920d8
Show file tree
Hide file tree
Showing 9 changed files with 27 additions and 27 deletions.
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/AccessControlTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sub new {
module => "Foswiki",
version => ">=1.2"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$post11 = $ok;

return $self;
Expand Down
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/AdminOnlyAccessControlTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sub new {
module => "Foswiki",
version => ">=1.2"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$post11 = $ok;

return $self;
Expand Down
36 changes: 18 additions & 18 deletions UnitTestContrib/test/unit/DependencyTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ sub test_check_dep_not_perl {
module => "libpcap",
version => "1.0.0"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 0, $ok );
$this->assert_matches( qr/cannot be automatically checked/, $message );
}
Expand All @@ -41,7 +41,7 @@ sub test_check_dep_last_resort1 {
type => "perl",
module => "Foswiki::Contrib::UnitTestContrib::LastResortWontLoad",
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok );
$this->assert_matches(
qr/Foswiki::Contrib::UnitTestContrib::LastResortWontLoad version v1.2.3_100 installed/,
Expand All @@ -58,7 +58,7 @@ sub test_check_dep_not_module {
type => "perl",
module => "Non::Existing::Module"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 0, $ok );
$this->assert_matches(
qr/Non::Existing::Module version >=0 required\s*--\s*perl module is not installed/,
Expand All @@ -75,7 +75,7 @@ sub test_check_foswiki_rev {
module => 'Foswiki',
version => '1.1.3'
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok );
$this->assert_matches( qr/^Foswiki version Foswiki-(.*) installed$/,
$message );
Expand All @@ -89,7 +89,7 @@ sub test_check_dep_carp {
# 1, Carp v1.03 installed
my $dep =
new Foswiki::Configure::Dependency( type => "cpan", module => "Carp" );
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok );
$this->assert_matches( qr/Carp version .* installed/, $message );

Expand All @@ -105,7 +105,7 @@ sub test_check_dep_carp_with_version {
module => "Carp",
version => 0.1
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok );
$this->assert_matches( qr/Carp version .* installed/, $message );

Expand All @@ -121,7 +121,7 @@ sub test_check_dep_version_too_high {
module => "HTML::Parser",
version => "21.1"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 0, $ok );
$this->assert_matches(
qr/HTML::Parser version >= 21.1 required\s*--\s*installed version is [\d.]+/,
Expand All @@ -140,7 +140,7 @@ sub test_check_dep_version_with_superior {
module => "HTML::Parser",
version => ">=0.9"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok );
$this->assert_matches( qr/HTML::Parser version \d+\.\d+ installed/,
$message );
Expand All @@ -157,7 +157,7 @@ sub test_check_dep_version_with_inferior {
module => "HTML::Parser",
version => "<21.1"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok, $HTML::Parser::VERSION );
$this->assert_matches( qr/HTML::Parser version \d+\.\d+ installed/,
$message );
Expand All @@ -174,7 +174,7 @@ sub test_check_dep_version_with_inferior_failed {
module => "HTML::Parser",
version => "<1"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 0, $ok );
$this->assert_matches(
qr/HTML::Parser version < 1 required\s*--\s*installed version is [\d.]+/,
Expand All @@ -193,7 +193,7 @@ sub test_check_dep_version_with_rev {
module => "Foswiki::Contrib::UnitTestContrib::DateBasedRelease",
version => ">=20 Sep 2009"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok, $message );
$this->assert_matches(
qr/Foswiki::Contrib::UnitTestContrib::DateBasedRelease .* installed/,
Expand All @@ -213,7 +213,7 @@ sub test_check_dep_version_with_implied_svn {
module => "Foswiki::Contrib::UnitTestContrib::MultiDottedVersion",
version => ">1000"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok, $message );
$this->assert_matches(
qr/Foswiki::Contrib::UnitTestContrib::MultiDottedVersion .* installed/,
Expand All @@ -234,7 +234,7 @@ sub test_check_dep_version_with_explicit_svn {
module => "Foswiki::Contrib::UnitTestContrib::MultiDottedVersion",
version => ">r1000"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok, $message );
$this->assert_matches(
qr/Foswiki::Contrib::UnitTestContrib::MultiDottedVersion .* installed/,
Expand All @@ -255,7 +255,7 @@ sub test_check_dep_version_with_unsatisfied_explicit_svn {
module => "Foswiki::Contrib::UnitTestContrib::MultiDottedVersion",
version => "<r23"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 0, $ok, $message );
$this->assert_matches(
qr/Foswiki::Contrib::UnitTestContrib::MultiDottedVersion version < r23 required/,
Expand All @@ -276,7 +276,7 @@ sub test_check_dep_version_with_unsatisfied_svn {
module => "Foswiki::Contrib::UnitTestContrib::MultiDottedVersion",
version => ">2000"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 0, $ok, $message );
$this->assert_matches(
qr/Foswiki::Contrib::UnitTestContrib::MultiDottedVersion version > 2000 required/,
Expand All @@ -297,7 +297,7 @@ sub test_check_dep_version_with_multi_part_number {
module => "Foswiki::Contrib::UnitTestContrib::MultiDottedVersion",
version => ">=1.5.6"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok, $message );
$this->assert_matches(
qr/Foswiki::Contrib::UnitTestContrib::MultiDottedVersion version 1\.23\.4 installed/,
Expand All @@ -315,7 +315,7 @@ sub test_check_dep_with_missing_dependency {
module => "Foswiki::Contrib::UnitTestContrib::MissingDependency",
version => ">=1.23.4"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok, $message );
$this->assert_equals(
'1.23.4',
Expand All @@ -339,7 +339,7 @@ sub test_check_dep_version_with_underscore {
module => "Algorithm::Diff",
version => ">=1.18_45"
);
my ( $ok, $message ) = $dep->check();
my ( $ok, $message ) = $dep->checkDependency();
$this->assert_equals( 1, $ok );
$this->assert_matches(
qr/Algorithm::Diff version \d+\.\d+(?:_\d+)? installed/, $message );
Expand Down
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/Fn_FORMAT.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ sub new {
module => "Foswiki",
version => ">=1.2"
);
( $post11, my $message ) = $dep->check();
( $post11, my $message ) = $dep->checkDependency();

return $self;
}
Expand Down
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/Fn_IF.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ sub new {
module => "Foswiki",
version => ">=1.2"
);
( $post11, my $message ) = $dep->check();
( $post11, my $message ) = $dep->checkDependency();

return $class->SUPER::new( 'IF', @args );
}
Expand Down
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/Fn_QUERY.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ sub new {
module => "Foswiki",
version => ">=1.2"
);
( $post11, my $depmsg ) = $dep->check();
( $post11, my $depmsg ) = $dep->checkDependency();

return $self;
}
Expand Down
4 changes: 2 additions & 2 deletions UnitTestContrib/test/unit/FoswikiTestCase.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -314,7 +314,7 @@ sub _check_using {
Checks to see if a given dependency is present, optionally of a specified version
This is a wrapper to =Foswiki::Configure::Dependency->check()=
This is a wrapper to =Foswiki::Configure::Dependency->checkDependency()=
* =$what= - a string (or arrayref of strings) specifying module(s) to check
for, optionally of specific version(s). The string(s) should be compatible
Expand Down Expand Up @@ -381,7 +381,7 @@ sub _check_dependency {
module => $module
);

($result) = $dep->check();
($result) = $dep->checkDependency();
}
else {
$this->assert( 0, "Don't know how to check for module '$what'" );
Expand Down
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/FuncUsersTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ sub new {
module => "Foswiki",
version => ">=1.2"
);
( $post11, my $message ) = $dep->check();
( $post11, my $message ) = $dep->checkDependency();

return $self;
}
Expand Down
2 changes: 1 addition & 1 deletion UnitTestContrib/test/unit/TemplatesTests.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ sub test_directLookupInUsertopic {
module => "Foswiki",
version => ">=1.2"
);
my ( $post11, $depmsg ) = $dep->check();
my ( $post11, $depmsg ) = $dep->checkDependency();

# To verify a use case raised by Michael Daum: $web.$script looks up
# template topic $script in $web, no further searching is done
Expand Down

0 comments on commit 7c920d8

Please sign in to comment.