[Http-webtest-commits] HTTP-WebTest/t 12-request.t,1.5,1.6 02-generic.t,1.27,1.28

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

Update of /cvsroot/http-webtest/HTTP-WebTest/t
In directory sc8-pr-cvs1:/tmp/cvs-serv14032/t

Modified Files:
	12-request.t 02-generic.t 
Log Message:
Do not parse request uri unless we are given 'params' parameter


Index: 12-request.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/12-request.t,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** 12-request.t	26 Apr 2003 15:12:14 -0000	1.5
--- 12-request.t	14 Jul 2003 08:21:07 -0000	1.6
***************
*** 23,28 ****
      for my $uri (qw(http://test1 http://a.a.a http://www.a.b)) {
  	$REQUEST->base_uri($uri);
! 	ok($REQUEST->base_uri eq $uri);
! 	ok($REQUEST->uri eq $uri);
      }
  }
--- 23,28 ----
      for my $uri (qw(http://test1 http://a.a.a http://www.a.b)) {
  	$REQUEST->base_uri($uri);
! 	is($REQUEST->base_uri, $uri);
! 	is($REQUEST->uri, $uri);
      }
  }
***************
*** 33,37 ****
      my $uri = $REQUEST->uri;
      ok($uri->isa('URI'));
!     ok($uri->host eq 'test2');
  }
  
--- 33,37 ----
      my $uri = $REQUEST->uri;
      ok($uri->isa('URI'));
!     is($uri->host, 'test2');
  }
  
***************
*** 41,45 ****
      my $uri = $REQUEST->url;
      ok($uri->isa('URI'));
!     ok($uri->host eq 'test3');
  }
  
--- 41,45 ----
      my $uri = $REQUEST->url;
      ok($uri->isa('URI'));
!     is($uri->host, 'test3');
  }
  
***************
*** 47,57 ****
  {
      # default value
!     ok(join(' ', @{$REQUEST->params}) eq '');
  
      $REQUEST->params([a => 'b']);
!     ok(join(' ', @{$REQUEST->params}) eq 'a b');
  
      $REQUEST->params([d => 'xy', 1 => 2]);
!     ok(join(' ', @{$REQUEST->params}) eq 'd xy 1 2');
  }
  
--- 47,57 ----
  {
      # default value
!     is(join(' ', @{$REQUEST->params}), '');
  
      $REQUEST->params([a => 'b']);
!     is(join(' ', @{$REQUEST->params}), 'a b');
  
      $REQUEST->params([d => 'xy', 1 => 2]);
!     is(join(' ', @{$REQUEST->params}), 'd xy 1 2');
  }
  
***************
*** 60,68 ****
      $REQUEST->base_uri('http://a');
      $REQUEST->uri('http://b');
!     ok($REQUEST->uri eq 'http://b');
  
      $REQUEST->uri('http://c?x=y');
!     ok($REQUEST->uri eq 'http://c');
!     ok(join(' ', @{$REQUEST->params}) eq 'x y');
  }
  
--- 60,68 ----
      $REQUEST->base_uri('http://a');
      $REQUEST->uri('http://b');
!     is($REQUEST->uri, 'http://b');
  
      $REQUEST->uri('http://c?x=y');
!     is($REQUEST->uri, 'http://c?x=y');
!     is(join(' ', @{$REQUEST->params}), '');
  }
  
***************
*** 72,77 ****
      $REQUEST->base_uri('http://a');
      $REQUEST->method('GET');
!     ok($REQUEST->uri eq 'http://a?a=b');
!     ok(${$REQUEST->content_ref} eq '');
  }
  
--- 72,77 ----
      $REQUEST->base_uri('http://a');
      $REQUEST->method('GET');
!     is($REQUEST->uri, 'http://a?a=b');
!     is(${$REQUEST->content_ref}, '');
  }
  
***************
*** 81,86 ****
      $REQUEST->base_uri('http://a');
      $REQUEST->method('POST');
!     ok($REQUEST->uri eq 'http://a');
!     ok(${$REQUEST->content_ref} eq 'a=b');
  }
  
--- 81,86 ----
      $REQUEST->base_uri('http://a');
      $REQUEST->method('POST');
!     is($REQUEST->uri, 'http://a');
!     is(${$REQUEST->content_ref}, 'a=b');
  }
  
***************
*** 91,95 ****
      $REQUEST->base_uri('http://a');
      $REQUEST->method('POST');
!     ok($REQUEST->uri eq 'http://a');
      ok(${$REQUEST->content_ref} =~ 'Content-Disposition: form-data; name="a".*; filename="12-request.t');
  }
--- 91,95 ----
      $REQUEST->base_uri('http://a');
      $REQUEST->method('POST');
!     is($REQUEST->uri, 'http://a');
      ok(${$REQUEST->content_ref} =~ 'Content-Disposition: form-data; name="a".*; filename="12-request.t');
  }

Index: 02-generic.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/02-generic.t,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** 02-generic.t	3 Jul 2003 11:10:05 -0000	1.27
--- 02-generic.t	14 Jul 2003 08:21:08 -0000	1.28
***************
*** 14,18 ****
  use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
  
! use Test::More tests => 36;
  
  # init tests
--- 14,18 ----
  use HTTP::WebTest::Utils qw(start_webserver stop_webserver);
  
! use Test::More tests => 37;
  
  # init tests
***************
*** 684,687 ****
--- 684,699 ----
                    check_file => 't/test.out/cookies-in-redirect');
  }
+ 
+ # 37: test if we don't mangle urls like
+ # http://website.com?http://website2.com?var=val
+ {
+     my $tests = [ { url => abs_url($URL, '/test?test') } ];
+ 
+     check_webtest(webtest => $WEBTEST,
+ 		  server_url => $URL,
+ 		  tests => $tests,
+ 		  check_file => 't/test.out/url');
+ }
+ 
  
  # try to stop server even we have been crashed