You are viewing a plain text version of this content. The canonical link for it is here.
Posted to modperl-cvs@perl.apache.org by ra...@apache.org on 2004/07/15 17:26:51 UTC

cvs commit: modperl-2.0/t/response/TestAPR date.pm

randyk      2004/07/15 08:26:51

  Modified:    t/response/TestAPR date.pm
  Added:       t/apr-ext date.t
               t/lib/TestAPRlib date.pm
  Log:
  Reviewed by:	stas
  put common date tests under t/TestAPRlib/, and call them
  from both t/apr/ and t/apr-ext/.
  
  Revision  Changes    Path
  1.1                  modperl-2.0/t/apr-ext/date.t
  
  Index: date.t
  ===================================================================
  use strict;
  use warnings FATAL => 'all';
  use Apache::Test;
  
  use TestAPRlib::date;
  
  plan tests => TestAPRlib::date::num_of_tests();
  
  TestAPRlib::date::test();
  
  
  
  1.1                  modperl-2.0/t/lib/TestAPRlib/date.pm
  
  Index: date.pm
  ===================================================================
  package TestAPRlib::date;
  
  # testing APR::Date API
  
  use strict;
  use warnings FATAL => 'all';
  
  use Apache::Test;
  use Apache::TestUtil;
  
  use APR::Date ();
  
  my @http_dates = (
      'Sun, 06 Nov 1994 08:49:37 GMT',  # RFC 822, updated by RFC 1123
      'Sunday, 06-Nov-94 08:49:37 GMT', # RFC 850, obsoleted by RFC 1036
      'Sun Nov  6 08:49:37 1994',       # ANSI C's asctime() format
  );
  
  my @rfc_dates = (
      'Sun, 06 Nov 1994 08:49:37 GMT' , # RFC 822, updated by RFC 1123
      'Sunday, 06-Nov-94 08:49:37 GMT', # RFC 850, obsoleted by RFC 1036
      'Sun Nov  6 08:49:37 1994',       # ANSI C's asctime() format
      'Sun, 6 Nov 1994 08:49:37 GMT',   # RFC 822, updated by RFC 1123
      'Sun, 06 Nov 94 08:49:37 GMT',    # RFC 822
      'Sun, 6 Nov 94 08:49:37 GMT',     # RFC 822
      'Sun, 06 Nov 94 8:49:37 GMT',     # Unknown [Elm 70.85]
      'Sun, 6 Nov 94 8:49:37 GMT',      # Unknown [Elm 70.85]
      'Sun,  6 Nov 1994 08:49:37 GMT',  # Unknown [Postfix]
  );
  
  my @bogus_dates = (
      'Sun, 06 Nov 94 08:49 GMT',       # Unknown [drtr@ast.cam.ac.uk]
      'Sun, 6 Nov 94 08:49 GMT',        # Unknown [drtr@ast.cam.ac.uk]
  );
  
  my $date_msec = 784111777;
  my $bogus_date_msec = 784111740;
  
  sub num_of_tests {
      return @http_dates + @rfc_dates + @bogus_dates;
  }
  
  sub test {
  
      # parse_http
      for my $date_str (@http_dates) {
          ok t_cmp(APR::Date::parse_http($date_str),
                   $date_msec, 
                   "parse_http: $date_str");
          #t_debug "testing : parse_http: $date_str";
      }
  
      # parse_rfc
      for my $date_str (@rfc_dates) {
          ok t_cmp(APR::Date::parse_rfc($date_str),
                   $date_msec, 
                   "parse_rfc: $date_str");
          #t_debug "testing : parse_rfc: $date_str";
      }
  
      # parse_rfc (bogus formats)
      for my $date_str (@bogus_dates) {
          ok t_cmp(APR::Date::parse_rfc($date_str),
                   $bogus_date_msec,
                   "parse_rfc: $date_str");
          #t_debug "testing : parse_rfc: $date_str";
      }
  
  }
  
  1;
  
  
  
  1.5       +4 -52     modperl-2.0/t/response/TestAPR/date.pm
  
  Index: date.pm
  ===================================================================
  RCS file: /home/cvs/modperl-2.0/t/response/TestAPR/date.pm,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- date.pm	8 Jul 2004 06:06:33 -0000	1.4
  +++ date.pm	15 Jul 2004 15:26:51 -0000	1.5
  @@ -6,66 +6,18 @@
   use warnings FATAL => 'all';
   
   use Apache::Test;
  -use Apache::TestUtil;
  -
  -use APR::Date ();
   
   use Apache::Const -compile => 'OK';
   
  -my @http_dates = (
  -    'Sun, 06 Nov 1994 08:49:37 GMT',  # RFC 822, updated by RFC 1123
  -    'Sunday, 06-Nov-94 08:49:37 GMT', # RFC 850, obsoleted by RFC 1036
  -    'Sun Nov  6 08:49:37 1994',       # ANSI C's asctime() format
  -);
  -
  -my @rfc_dates = (
  -    'Sun, 06 Nov 1994 08:49:37 GMT' , # RFC 822, updated by RFC 1123
  -    'Sunday, 06-Nov-94 08:49:37 GMT', # RFC 850, obsoleted by RFC 1036
  -    'Sun Nov  6 08:49:37 1994',       # ANSI C's asctime() format
  -    'Sun, 6 Nov 1994 08:49:37 GMT',   # RFC 822, updated by RFC 1123
  -    'Sun, 06 Nov 94 08:49:37 GMT',    # RFC 822
  -    'Sun, 6 Nov 94 08:49:37 GMT',     # RFC 822
  -    'Sun, 06 Nov 94 8:49:37 GMT',     # Unknown [Elm 70.85]
  -    'Sun, 6 Nov 94 8:49:37 GMT',      # Unknown [Elm 70.85]
  -    'Sun,  6 Nov 1994 08:49:37 GMT',  # Unknown [Postfix]
  -);
  -
  -my @bogus_dates = (
  -    'Sun, 06 Nov 94 08:49 GMT',       # Unknown [drtr@ast.cam.ac.uk]
  -    'Sun, 6 Nov 94 08:49 GMT',        # Unknown [drtr@ast.cam.ac.uk]
  -);
  -
  -my $date_msec = 784111777;
  -my $bogus_date_msec = 784111740;
  +use TestAPRlib::date;
   
   sub handler {
       my $r = shift;
   
  -    plan $r, tests => @http_dates + @rfc_dates + @bogus_dates;
  -
  -    # parse_http
  -    for my $date_str (@http_dates) {
  -        ok t_cmp(APR::Date::parse_http($date_str),
  -                 $date_msec, 
  -                 "parse_http: $date_str");
  -        #t_debug "testing : parse_http: $date_str";
  -    }
  -
  -    # parse_rfc
  -    for my $date_str (@rfc_dates) {
  -        ok t_cmp(APR::Date::parse_rfc($date_str),
  -                 $date_msec, 
  -                 "parse_rfc: $date_str");
  -        #t_debug "testing : parse_rfc: $date_str";
  -    }
  +    my $num_of_tests = TestAPRlib::date::num_of_tests();
  +    plan $r, tests => $num_of_tests;
   
  -    # parse_rfc (bogus formats)
  -    for my $date_str (@bogus_dates) {
  -        ok t_cmp(APR::Date::parse_rfc($date_str),
  -                 $bogus_date_msec,
  -                 "parse_rfc: $date_str");
  -        #t_debug "testing : parse_rfc: $date_str";
  -    }
  +    TestAPRlib::date::test();
   
       Apache::OK;
   }