[Http-webtest-commits] CVS: HTTP-WebTest/t simple.wt,1.6,1.7 06-parser.t,1.11,1.12

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

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

Modified Files:
	simple.wt 06-parser.t 
Log Message:
Update tests for new syntax rules


Index: simple.wt
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/simple.wt,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** simple.wt	12 Feb 2002 11:48:21 -0000	1.6
--- simple.wt	15 May 2002 19:26:26 -0000	1.7
***************
*** 25,34 ****
                        'test $a'
                        'test @a'
-                       "test $a"
-                       "test @a"
                        "test \$a"
                        "\$a"
!                       "\\$a"
!                       "\\\$a")
      regex_forbid =  ( More = tests
                        Some @#$%^&* chars
--- 25,33 ----
                        'test $a'
                        'test @a'
                        "test \$a"
+                       "test \@a"
                        "\$a"
!                       "\\\$a"
!                       "$test1")
      regex_forbid =  ( More = tests
                        Some @#$%^&* chars

Index: 06-parser.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest/t/06-parser.t,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** 06-parser.t	12 Feb 2002 13:17:13 -0000	1.11
--- 06-parser.t	15 May 2002 19:26:26 -0000	1.12
***************
*** 18,21 ****
--- 18,28 ----
  # supported syntax)
  {
+     {
+ 	package HTTP::WebTest::PlayGround;
+ 	use vars qw($test1);
+ 
+ 	$test1 = 'AAA';
+     }
+ 
      my $filename = shift;
  
***************
*** 28,32 ****
      ok($tests->[0]{auth}[0] eq 'name');
      ok($tests->[0]{auth}[1] eq 'value');
!     ok(@{$tests->[0]{regex_require}} == 12);
      ok($tests->[0]{regex_require}[0] eq 'Quoted text " test');
      ok($tests->[0]{regex_require}[1] eq 'We can => quote \'');
--- 35,39 ----
      ok($tests->[0]{auth}[0] eq 'name');
      ok($tests->[0]{auth}[1] eq 'value');
!     ok(@{$tests->[0]{regex_require}} == 11);
      ok($tests->[0]{regex_require}[0] eq 'Quoted text " test');
      ok($tests->[0]{regex_require}[1] eq 'We can => quote \'');
***************
*** 35,44 ****
      ok($tests->[0]{regex_require}[4] eq 'test $a');
      ok($tests->[0]{regex_require}[5] eq 'test @a');
!     ok($tests->[0]{regex_require}[6] eq 'test $a');
!     ok($tests->[0]{regex_require}[7] eq 'test @a');
!     ok($tests->[0]{regex_require}[8] eq 'test \\$a');
!     ok($tests->[0]{regex_require}[9] eq '\\$a');
!     ok($tests->[0]{regex_require}[10] eq '\\$a');
!     ok($tests->[0]{regex_require}[11] eq '\\\\$a');
      ok($tests->[0]{url} eq 'www.dot.com');
      ok(@{$tests->[0]{regex_forbid}} == 6);
--- 42,50 ----
      ok($tests->[0]{regex_require}[4] eq 'test $a');
      ok($tests->[0]{regex_require}[5] eq 'test @a');
!     ok($tests->[0]{regex_require}[6]() eq 'test $a');
!     ok($tests->[0]{regex_require}[7]() eq 'test @a');
!     ok($tests->[0]{regex_require}[8]() eq '$a');
!     ok($tests->[0]{regex_require}[9]() eq '\\$a');
!     ok($tests->[0]{regex_require}[10]() eq 'AAA');
      ok($tests->[0]{url} eq 'www.dot.com');
      ok(@{$tests->[0]{regex_forbid}} == 6);
***************
*** 61,74 ****
      ok($tests->[1]{cookie}[0][2] eq 'This is the cookie value');
      ok($tests->[1]{cookie}[1][1] eq 'webtest1');
!     my $sub = $tests->[2]{test_name};
!     ok($sub->() eq 'Some evals are here');
!     $sub = $tests->[2]{file};
!     ok($sub->() eq '6.ext');
!     $sub = $tests->[2]{params}[0];
!     ok($sub->() eq 'name');
!     $sub = $tests->[2]{params}[3];
!     ok($sub->() eq 'bla');
!     $sub = $tests->[2]{auth};
!     my $aref = $sub->();
      ok($aref->[0] eq 'http');
      ok($aref->[1] eq 'http://some.proxy.com/');
--- 67,76 ----
      ok($tests->[1]{cookie}[0][2] eq 'This is the cookie value');
      ok($tests->[1]{cookie}[1][1] eq 'webtest1');
!     ok($tests->[2]{test_name}() eq 'Some evals are here');
!     ok($tests->[2]{file}() eq '6.ext');
!     ok($tests->[2]{params}[0]() eq 'name');
!     ok($tests->[2]{params}[3]() eq 'bla');
!     my $aref = $tests->[2]{auth}();
!     ok(@$aref == 2);
      ok($aref->[0] eq 'http');
      ok($aref->[1] eq 'http://some.proxy.com/');
***************
*** 99,103 ****
  if($] >= 5.006) {
      my $out_filter = sub {
! 	$_[0] =~ s/\(eval \d+\)/(eval NN)/;
      };
      parse_error_check(wtscript   => 't/borked7.wt',
--- 101,105 ----
  if($] >= 5.006) {
      my $out_filter = sub {
! 	$_[0] =~ s/\(eval \d+\) line \d+/(eval NN) line N/;
      };
      parse_error_check(wtscript   => 't/borked7.wt',