httpd-test-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject cvs commit: httpd-test/perl-framework/Apache-Test/lib/Apache Test.pm
Date Mon, 07 Apr 2003 04:41:31 GMT
stas        2003/04/06 21:41:31

  Modified:    perl-framework/Apache-Test/lib/Apache Test.pm
  Log:
  have() now can handle scalars in addition to code refs in hash refs
  
  Revision  Changes    Path
  1.53      +18 -21    httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm
  
  Index: Test.pm
  ===================================================================
  RCS file: /home/cvs/httpd-test/perl-framework/Apache-Test/lib/Apache/Test.pm,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- Test.pm	24 Mar 2003 07:12:16 -0000	1.52
  +++ Test.pm	7 Apr 2003 04:41:31 -0000	1.53
  @@ -148,14 +148,11 @@
       my $have_all = 1;
       for my $cond (@_) {
           if (ref $cond eq 'HASH') {
  -            while (my($reason, $code) = each %$cond) {
  -                if (ref $code eq 'CODE' && $code->()) {
  -                    next;
  -                }
  -                else {
  -                    push @SkipReasons, $reason;
  -                    $have_all = 0;
  -                }
  +            while (my($reason, $value) = each %$cond) {
  +                $value = $value->() if ref $value eq 'CODE';
  +                next if $value;
  +                push @SkipReasons, $reason;
  +                $have_all = 0;
               }
           }
           else {
  @@ -512,30 +509,30 @@
   
     plan tests => 5,
         have 'LWP',
  -           { "perl >= 5.7.3 is required" => sub { $] >= 5.007003   } },
  -           { "not Win32"                 => sub { $^O eq 'MSWin32' } },
  +           { "perl >= 5.8.0 is required" => ($] >= 5.008)          },
  +           { "not Win32"                 => sub { $^O eq 'MSWin32' },
  +             "foo is disabled"           => \&is_foo_enabled,
  +           },
              'cgid';
   
   have() is more generic function which can impose multiple requirements
   at once. All requirements must be satisfied.
   
   have()'s argument is a list of things to test. The list can include
  -scalars, which are passed to have_module(), and hash references. The
  -hash references have a condition code reference as a value and a
  -reason for failure as a key. The condition code is run and if it fails
  -the provided reason is used to tell user why the test was skipped.
  +scalars, which are passed to have_module(), and hash references. If
  +hash references are used, the keys, are strings, containing a reason
  +for a failure to satisfy this particular entry, the valuees are the
  +condition, which are satisfaction if they return true. If the value is
  +a scalar it's used as is. If the value is a code reference, it gets
  +executed at the time of check and its return value is used to check
  +the condition. If the condition check fails, the provided (in a key)
  +reason is used to tell user why the test was skipped.
   
   In the presented example, we require the presense of the C<LWP> Perl
   module, C<mod_cgid>, that we run under perl E<gt>= 5.7.3 on Win32.
   
   It's possible to put more than one requirement into a single hash
  -reference, but be careful that the keys will be different:
  -
  -      have 'LWP',
  -           { "perl >= 5.7.3 is required" => sub { $] >= 5.007003   },
  -             "not Win32"                 => sub { $^O eq 'MSWin32' },
  -           },
  -           'cgid';
  +reference, but be careful that the keys will be different.
   
   Also see plan().
   
  
  
  

Mime
View raw message