http-webtest-commits

[Ilya M. <m_...@us...>]

Update of /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin
In directory usw-pr-cvs1:/tmp/cvs-serv32730/lib/HTTP/WebTest/Plugin

Modified Files:
	DefaultReport.pm 
Log Message:
Respect terse parameter by show_*** parameters


Index: DefaultReport.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/DefaultReport.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** DefaultReport.pm	21 Jun 2002 06:48:16 -0000	1.7
--- DefaultReport.pm	31 Jul 2002 09:07:12 -0000	1.8
***************
*** 149,157 ****
  
      # get test params we handle
!     my $test_name    = $self->test_param('test_name');
      my $show_html    = $self->yesno_test_param('show_html');
      my $show_cookies = $self->yesno_test_param('show_cookies');
      my $show_headers = $self->yesno_test_param('show_headers');
!     my $terse        = lc $self->test_param('terse');
  
      my $url = 'N/A';
--- 149,157 ----
  
      # get test params we handle
!     my $test_name    = $self->test_param('test_name', 'N/A');
      my $show_html    = $self->yesno_test_param('show_html');
      my $show_cookies = $self->yesno_test_param('show_cookies');
      my $show_headers = $self->yesno_test_param('show_headers');
!     my $terse        = lc $self->test_param('terse', 'no');
  
      my $url = 'N/A';
***************
*** 160,172 ****
      }
  
!     return if defined $terse and $terse eq 'summary';
  
      my $out = '';
  
      # test header
!     $out .= "Test Name: $test_name\n"
! 	if defined $test_name;
      $out .= "URL: $url\n\n";
  
      for my $result (@{$self->webtest->last_results}) {
  	# test results
--- 160,174 ----
      }
  
!     return if $terse eq 'summary';
  
+     # output buffer
      my $out = '';
  
      # test header
!     $out .= "Test Name: $test_name\n";
      $out .= "URL: $url\n\n";
  
+     my $not_ok_num = 0;
+ 
      for my $result (@{$self->webtest->last_results}) {
  	# test results
***************
*** 174,180 ****
  
  	my @results = @$result[1 .. @$result - 1];
  
! 	if(defined($terse) and $terse eq 'failed_only') {
! 	    @results = grep +(not $_->ok), @results;
  	}
  
--- 176,185 ----
  
  	my @results = @$result[1 .. @$result - 1];
+ 	my @not_ok_results = grep +(not $_->ok), @results;
+ 	$not_ok_num += @not_ok_results;
  
! 	if($terse eq 'failed_only') {
! 	    # skip all positive results in output
! 	    @results = @not_ok_results;
  	}
  
***************
*** 195,202 ****
      }
  
      my $response = $self->webtest->last_response;
      my $request = $self->webtest->last_request;
  
!     if($show_headers) {
  	# show all headers
  
--- 200,210 ----
      }
  
+     # true if show_*** parameters should take effect
+     my $show_xxx = $terse eq 'failed_only' ? $not_ok_num > 0 : 1;
+ 
      my $response = $self->webtest->last_response;
      my $request = $self->webtest->last_request;
  
!     if($show_headers and $show_xxx) {
  	# show all headers
  
***************
*** 211,215 ****
      }
  
!     if($show_cookies) {
  	# show sent and recieved cookies
  
--- 219,223 ----
      }
  
!     if($show_cookies and $show_xxx) {
  	# show sent and recieved cookies
  
***************
*** 236,240 ****
      }
  
!     if($show_html) {
  	# content in response
  
--- 244,248 ----
      }
  
!     if($show_html and $show_xxx) {
  	# content in response
  
***************
*** 305,309 ****
  }
  
! # print line using some format specification
  sub fprint {
      my $self = shift;
--- 313,317 ----
  }
  
! # print line using format specification
  sub fprint {
      my $self = shift;