Refactored tests

Makefile.in

@@ -34,9 +34,8 @@ install: install-modules-yes
 
 #   cleanup
 clean:
-	-rm -f mod_psgi.o mod_psgi.lo mod_psgi.slo mod_psgi.la 
+	rm -f mod_psgi.o mod_psgi.lo mod_psgi.slo mod_psgi.la
 	rm -f ppport.h
-	$(MAKE) -C t clean
 
 realclean: clean
 	rm -f Makefile
@@ -52,7 +51,7 @@ ppport.h:
 testconf:
 	$(MAKE) -C t conf
 
-test: reload
+test:
 	$(MAKE) -C t test
 
 #   install and activate shared object by reloading Apache to

t/00_output.t

@@ -23,7 +23,7 @@ BEGIN {
 
 return eval_response_app if running_in_mod_psgi;
 
-run_eval_request;
+run_server_tests;
 
 __END__
 

t/01_lint.t

@@ -4,7 +4,7 @@ use t::TestModPSGI;
 
 return eval_body_app if running_in_mod_psgi;
 
-run_eval_request;
+run_server_tests;
 
 __END__
 

t/02_input.t

@@ -4,7 +4,7 @@ use t::TestModPSGI;
 
 return eval_body_app if running_in_mod_psgi;
 
-run_eval_request;
+run_server_tests;
 
 __END__
 

t/03_errors.t

@@ -4,7 +4,7 @@ use t::TestModPSGI;
 
 return eval_body_app if running_in_mod_psgi;
 
-run_eval_request;
+run_server_tests;
 
 __END__
 

t/04_die.t

@@ -4,7 +4,7 @@ use t::TestModPSGI;
 
 return eval_body_app if running_in_mod_psgi;
 
-run_eval_request;
+run_server_tests;
 
 __END__
 

t/Makefile.in

@@ -1,13 +1,6 @@
 APXS=@APXS@
-AP_SBINDIR=$(shell $(APXS) -q sbindir)
-AP_PROGNAME=$(shell $(APXS) -q progname)
-HTTPD=$(AP_SBINDIR)/$(AP_PROGNAME)
-all: conf
-test: test.conf
-	prove -I.. .
-conf: test.conf
-test.conf: test.conf.tt *.t mkconf.pl
-	./mkconf.pl --input $< --output $@
-clean:
-	rm -f test.conf
-.PHONY: conf clean test
+TESTS=.
+all: test
+test:
+	APXS=$(APXS) prove -I.. $(TESTS)
+.PHONY: test

t/TestModPSGI.pm

@@ -6,15 +6,14 @@ use Test::Base -Base;
 use File::Basename;
 use URI::Escape;
 use List::Util qw(sum);
+use Test::TCP;
+use File::Temp;
 
 our @EXPORT = qw(
     running_in_mod_psgi eval_body_app eval_response_app
-    run_eval_request
+    run_server_tests
 );
 
-our $Host = '127.0.0.1';
-our $Path = '/psgi/t';
-
 BEGIN {
     no warnings 'redefine';
     *Test::Base::run_compare = sub {}; # XXX
@@ -49,13 +48,12 @@ sub ua() {
 }
 
 sub eval_request($$$;@) {
-    my ($file, $method, $code, @args) = @_;
+    my ($port, $method, $code, @args) = @_;
     if (ref $code eq 'CODE') {
         no warnings 'prototype';
-        return eval_request($file, $method, $code->(), @args);
+        return eval_request($port, $method, $code->(), @args);
     }
-    my $uri = sprintf 'http://%s%s/%s?%s', $Host, $Path,
-            basename($file), uri_escape($code);
+    my $uri = sprintf 'http://localhost:%d/?%s', $port, uri_escape($code);
     $method = lc $method;
     ua->$method($uri, @args);
 }
@@ -100,19 +98,55 @@ sub compare($$$;@) {
     }
 }
 
-sub run_eval_request() {
+our $TestFile;
+
+sub run_httpd($) {
+    my $port = shift;
+    my $tmpdir = $ENV{APACHE2_TMP_DIR} || File::Temp::tempdir(CLEANUP => 1);
+    chomp(my $libexecdir = `$ENV{APXS} -q libexecdir`);
+    chomp(my $sbindir = `$ENV{APXS} -q sbindir`);
+    chomp(my $progname = `$ENV{APXS} -q progname`);
+    my $httpd = "$sbindir/$progname";
+    my $conf = <<"END_CONF";
+LoadModule psgi_module $libexecdir/mod_psgi.so
+PidFile  $tmpdir/httpd.pid
+LockFile $tmpdir/httpd.lock
+ErrorLog $tmpdir/error_log
+Listen $port
+<Location />
+  SetHandler psgi
+  PSGIApp $TestFile
+</Location>
+END_CONF
+    open my $fh, '>', "$tmpdir/httpd.conf" or die $!;
+    print $fh $conf;
+    close $fh;
+    exec "$httpd -X -D FOREGROUND -f $tmpdir/httpd.conf";
+}
+
+sub run_server_tests() {
     my ($pkg, $file) = caller;
-    setup_tests;
-    run {
-        my $block = shift;
-        my $req = $block->request;
-        my $res = eval_request($file, $req->{method}, $req->{code},
-                @{$req->{args}});
-        my $response = $block->response;
-        while (my ($input, $expected) = each %$response) {
-            compare($res, $input, $expected);
-        }
-    };
+    $TestFile = $file;
+    test_tcp(
+        client => sub {
+            my $port = shift;
+            setup_tests;
+            run {
+                my $block = shift;
+                my $req = $block->request;
+                my $res = eval_request($port, $req->{method}, $req->{code}, @{$req->{args}});
+                my $response = $block->response;
+                #local $Test::Builder::Level = $Test::Builder::Level + 3;
+                while (my ($input, $expected) = each %$response) {
+                    compare($res, $input, $expected);
+                }
+            };
+        },
+        server => sub {
+            my $port = shift;
+            run_httpd($port);
+        },
+    );
 }
 
 1;

t/suite.t

@@ -1,52 +1,14 @@
 use strict;
 use warnings;
 use Test::More;
-use File::Temp;
 use Plack::Test::Suite;
+require t::TestModPSGI;
 
-warn $ENV{HTTPD};
-Plack::Test::Suite->run_server_tests(\&run_httpd);
-done_testing();
-
-sub run_httpd {
-    my $port = shift;
-
-    my $tmpdir = $ENV{APACHE2_TMP_DIR} || File::Temp::tempdir( CLEANUP => 1 );
-
-    write_file("$tmpdir/app.psgi", _render_psgi());
-    write_file("$tmpdir/httpd.conf", _render_conf($tmpdir, $port, "$tmpdir/app.psgi"));
-
-    exec "httpd -X -D FOREGROUND -f $tmpdir/httpd.conf";
-}
-
-sub write_file {
-    my($path, $content) = @_;
-
-    open my $out, ">", $path or die "$path: $!";
-    print $out $content;
+BEGIN {
+    no warnings 'once';
+    $t::TestModPSGI::TestFile = __FILE__;
 }
 
-sub _render_psgi {
-    return <<'EOF';
-use lib "lib";
-use Plack::Test::Suite;
-
-Plack::Test::Suite->test_app_handler;
-EOF
-}
-
-sub _render_conf {
-    my ($tmpdir, $port, $psgi_path) = @_;
-    <<"END";
-LoadModule psgi_module modules/mod_psgi.so
-PidFile $tmpdir/httpd.pid
-LockFile $tmpdir/httpd.lock
-ErrorLog $tmpdir/error_log
-Listen $port
-
-<Location />
-SetHandler psgi
-PSGIApp $tmpdir/app.psgi
-</Location>
-END
-}
+return Plack::Test::Suite->test_app_handler if t::TestModPSGI::running_in_mod_psgi();
+Plack::Test::Suite->run_server_tests(\&t::TestModPSGI::run_httpd);
+done_testing();