[Http-webtest-commits] HTTP-WebTest-Plugin-Apache/t 01-apache.t,1.1.1.1,1.2

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

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

Modified Files:
	01-apache.t 
Log Message:
Various fixes to make test suite work again


Index: 01-apache.t
===================================================================
RCS file: /cvsroot/http-webtest/HTTP-WebTest-Plugin-Apache/t/01-apache.t,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** 01-apache.t	15 Nov 2002 21:47:01 -0000	1.1.1.1
--- 01-apache.t	12 Dec 2002 22:50:57 -0000	1.2
***************
*** 15,24 ****
  
  use HTTP::WebTest;
  use HTTP::WebTest::Utils qw(copy_dir);
  
! require 't/config.pl';
! require 't/utils.pl';
  
! use vars qw($HOSTNAME $APACHE_EXEC $PORT $URL $TEST_NUM);
  
  BEGIN { $TEST_NUM = 19; plan tests => $TEST_NUM }
--- 15,25 ----
  
  use HTTP::WebTest;
+ use HTTP::WebTest::SelfTest;
  use HTTP::WebTest::Utils qw(copy_dir);
  
! use vars qw($HOSTNAME $PORT $URL $TEST_NUM %CONFIG);
  
! require '.config';
! my $APACHE_EXEC = $CONFIG{APACHE_EXEC};
  
  BEGIN { $TEST_NUM = 19; plan tests => $TEST_NUM }
***************
*** 29,33 ****
  my $TEST = { file_path => [ 't/test1.txt', '.' ],
  	     text_require => [ 'abcde', '123' ] };
! my %OPTS = (apache_exec => $APACHE_EXEC, apache_dir => $APACHE_DIR);
  my $ERROR_LOG = 't/error_log';
  my $PID = start_webserver(port => $PORT, server_sub => \&server_sub);
--- 30,35 ----
  my $TEST = { file_path => [ 't/test1.txt', '.' ],
  	     text_require => [ 'abcde', '123' ] };
! my %OPTS = (plugins => [ '::Apache' ],
!             apache_exec => $APACHE_EXEC, apache_dir => $APACHE_DIR);
  my $ERROR_LOG = 't/error_log';
  my $PID = start_webserver(port => $PORT, server_sub => \&server_sub);
***************
*** 47,51 ****
  
      check_webtest(webtest => $WEBTEST,
! 		  opts => { error_log => $ERROR_LOG },
  		  server_url => $URL,
  		  tests => $tests,
--- 49,54 ----
  
      check_webtest(webtest => $WEBTEST,
! 		  opts => { plugins => [ '::Apache' ],
!                             error_log => $ERROR_LOG },
  		  server_url => $URL,
  		  tests => $tests,
***************
*** 62,66 ****
  
      check_webtest(webtest => $WEBTEST,
! 		  opts => { error_log => $ERROR_LOG },
  		  server_url => $URL,
  		  tests => $tests,
--- 65,70 ----
  
      check_webtest(webtest => $WEBTEST,
! 		  opts => { plugins => [ '::Apache' ],
!                             error_log => $ERROR_LOG },
  		  server_url => $URL,
  		  tests => $tests,
***************
*** 172,176 ****
  	    my $start = time;
  	    eval {
! 		$WEBTEST->run_test($TEST, $opts);
  	    };
  	    if($@) {
--- 176,180 ----
  	    my $start = time;
  	    eval {
! 		$WEBTEST->run_tests([ $TEST ], $opts);
  	    };
  	    if($@) {
***************
*** 193,207 ****
  
      my $test = { file_path => [ 't/test.shtml', '.' ],
! 		 include_file_path => [ 't/test1.txt', '/inc',
! 				        't/test2.txt', '/inc' ],
! 		 text_require => [ 'abcde', '123',
! 				   'begin', '644' ],
! 		 text_forbid => [ '#include', 'virtual', 'error' ] };
  
      check_webtest(webtest => $WEBTEST,
! 		  opts => \%OPTS,
! 		  tests => [ $test ],
! 		  server_hostname => 'localhost',
! 		  check_file => 't/test.out/apache2');
  }
  
--- 197,211 ----
  
      my $test = { file_path => [ 't/test.shtml', '.' ],
!  		 include_file_path => [ 't/test1.txt', '/inc',
!  				        't/test2.txt', '/inc' ],
!  		 text_require => [ 'abcde', '123',
!  				   'begin', '644' ],
!  		 text_forbid => [ '#include', 'virtual', 'error' ] };
  
      check_webtest(webtest => $WEBTEST,
!  		  opts => \%OPTS,
!  		  tests => [ $test ],
!  		  server_hostname => 'localhost',
!  		  check_file => 't/test.out/apache2');
  }