[Http-webtest-commits] HTTP-WebTest/lib/HTTP/WebTest/Plugin TextMatchTest.pm,1.6,1.7 StatusTest.pm,1.7,1.8 SetRequest.pm,1.18,1.19 ResponseTimeTest.pm,1.5,1.6 HarnessReport.pm,1.7,1.8 DefaultReport.pm,1.8,1.9 ContentSizeTest.pm,1.7,1.8 Click.pm,1.14,1.15

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

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

Modified Files:
	TextMatchTest.pm StatusTest.pm SetRequest.pm 
	ResponseTimeTest.pm HarnessReport.pm DefaultReport.pm 
	ContentSizeTest.pm Click.pm 
Log Message:
Renamed all last_xxx methods to current_xxx since the latest naming
schema makes more sense for them.


Index: TextMatchTest.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/TextMatchTest.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TextMatchTest.pm	21 Jun 2002 06:48:16 -0000	1.6
--- TextMatchTest.pm	12 Dec 2002 23:22:10 -0000	1.7
***************
*** 87,91 ****
  
      # response content
!     my $content = $self->webtest->last_response->content;
  
      $self->validate_params(qw(ignore_case
--- 87,91 ----
  
      # response content
!     my $content = $self->webtest->current_response->content;
  
      $self->validate_params(qw(ignore_case

Index: StatusTest.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/StatusTest.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** StatusTest.pm	17 Aug 2002 12:40:17 -0000	1.7
--- StatusTest.pm	12 Dec 2002 23:22:11 -0000	1.8
***************
*** 46,51 ****
      $self->validate_params(qw(status_code));
  
!     my $code = $self->webtest->last_response->code;
!     my $status_line = $self->webtest->last_response->status_line;
  
      my $expected_code = $self->test_param('status_code', RC_OK);
--- 46,51 ----
      $self->validate_params(qw(status_code));
  
!     my $code = $self->webtest->current_response->code;
!     my $status_line = $self->webtest->current_response->status_line;
  
      my $expected_code = $self->test_param('status_code', RC_OK);

Index: SetRequest.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/SetRequest.pm,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** SetRequest.pm	18 Nov 2002 08:40:27 -0000	1.18
--- SetRequest.pm	12 Dec 2002 23:22:11 -0000	1.19
***************
*** 214,218 ****
  
      # get request object
!     my $request = $self->webtest->last_request;
  
      $self->validate_params(qw(url relative_urls method params
--- 214,218 ----
  
      # get request object
!     my $request = $self->webtest->current_request;
  
      $self->validate_params(qw(url relative_urls method params
***************
*** 240,247 ****
      if(defined $url) {
  	if($relative_urls) {
! 	    my $last_test_num = $self->webtest->last_test_num;
  
! 	    my $prev_url = $last_test_num > 0 ?
! 		           $self->webtest->tests->[$last_test_num - 1]->request->uri :
  			   'http://localhost/';
  
--- 240,247 ----
      if(defined $url) {
  	if($relative_urls) {
! 	    my $current_test_num = $self->webtest->current_test_num;
  
! 	    my $prev_url = $current_test_num > 0 ?
! 		           $self->webtest->tests->[$current_test_num - 1]->request->uri :
  			   'http://localhost/';
  

Index: ResponseTimeTest.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/ResponseTimeTest.pm,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ResponseTimeTest.pm	21 Jun 2002 06:48:16 -0000	1.5
--- ResponseTimeTest.pm	12 Dec 2002 23:22:12 -0000	1.6
***************
*** 53,57 ****
  
      # response time
!     my $rtime = $self->webtest->last_response_time;
  
      $self->validate_params(qw(min_rtime max_rtime));
--- 53,57 ----
  
      # response time
!     my $rtime = $self->webtest->current_response_time;
  
      $self->validate_params(qw(min_rtime max_rtime));

Index: HarnessReport.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/HarnessReport.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** HarnessReport.pm	21 Jun 2002 06:48:16 -0000	1.7
--- HarnessReport.pm	12 Dec 2002 23:22:13 -0000	1.8
***************
*** 53,57 ****
      my $self = shift;
  
!     my @results = @{$self->webtest->last_test->results};
  
      $self->validate_params(qw(test_name));
--- 53,57 ----
      my $self = shift;
  
!     my @results = @{$self->webtest->current_test->results};
  
      $self->validate_params(qw(test_name));
***************
*** 59,64 ****
      my $test_name = $self->test_param('test_name');
      my $url = 'N/A';
!     if($self->webtest->last_request) {
! 	$url = $self->webtest->last_request->uri;
      }
  
--- 59,64 ----
      my $test_name = $self->test_param('test_name');
      my $url = 'N/A';
!     if($self->webtest->current_request) {
! 	$url = $self->webtest->current_request->uri;
      }
  
***************
*** 69,73 ****
      my $all_ok = 1;
  
!     for my $result (@{$self->webtest->last_results}) {
  	# test results
  	my $group_comment = $$result[0];
--- 69,73 ----
      my $all_ok = 1;
  
!     for my $result (@{$self->webtest->current_results}) {
  	# test results
  	my $group_comment = $$result[0];

Index: DefaultReport.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/DefaultReport.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** DefaultReport.pm	31 Jul 2002 09:07:12 -0000	1.8
--- DefaultReport.pm	12 Dec 2002 23:22:14 -0000	1.9
***************
*** 156,161 ****
  
      my $url = 'N/A';
!     if($self->webtest->last_request) {
! 	$url = $self->webtest->last_request->uri;
      }
  
--- 156,161 ----
  
      my $url = 'N/A';
!     if($self->webtest->current_request) {
! 	$url = $self->webtest->current_request->uri;
      }
  
***************
*** 171,175 ****
      my $not_ok_num = 0;
  
!     for my $result (@{$self->webtest->last_results}) {
  	# test results
  	my $group_comment = $$result[0];
--- 171,175 ----
      my $not_ok_num = 0;
  
!     for my $result (@{$self->webtest->current_results}) {
  	# test results
  	my $group_comment = $$result[0];
***************
*** 203,208 ****
      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) {
--- 203,208 ----
      my $show_xxx = $terse eq 'failed_only' ? $not_ok_num > 0 : 1;
  
!     my $response = $self->webtest->current_response;
!     my $request = $self->webtest->current_request;
  
      if($show_headers and $show_xxx) {

Index: ContentSizeTest.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/ContentSizeTest.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** ContentSizeTest.pm	21 Jun 2002 06:48:16 -0000	1.7
--- ContentSizeTest.pm	12 Dec 2002 23:22:14 -0000	1.8
***************
*** 53,57 ****
  
      # response content length
!     my $nbytes = length $self->webtest->last_response->content;
  
      $self->validate_params(qw(min_bytes max_bytes));
--- 53,57 ----
  
      # response content length
!     my $nbytes = length $self->webtest->current_response->content;
  
      $self->validate_params(qw(min_bytes max_bytes));

Index: Click.pm
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/lib/HTTP/WebTest/Plugin/Click.pm,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Click.pm	20 Aug 2002 20:58:36 -0000	1.14
--- Click.pm	12 Dec 2002 23:22:14 -0000	1.15
***************
*** 80,87 ****
  
      # get current request object
!     my $request = $self->webtest->last_request;
  
      # get number of previous test if any
!     my $prev_test_num = $self->webtest->last_test_num - 1;
      return if $prev_test_num < 0;
  
--- 80,87 ----
  
      # get current request object
!     my $request = $self->webtest->current_request;
  
      # get number of previous test if any
!     my $prev_test_num = $self->webtest->current_test_num - 1;
      return if $prev_test_num < 0;