randyk 2004/07/09 11:53:02
Modified: t/modperl cookie.t cookie2.t exit.t getc.t print_utf8.t
print_utf8_2.t readline.t request_rec_perlio_api.t
sameinterp.t status.t
t/response/TestModperl current_callback.pm dir_config.pm
env.pm merge.pm method.pm perl_options.pm pnotes.pm
post_utf8.pm request_rec_tie_api.pm setauth.pm
setupenv.pm taint.pm
Log:
swap order of args to t_cmp in t/modperl tests to use new
($received, $expected, $comment) syntax.
Revision Changes Path
1.4 +1 -1 modperl-2.0/t/modperl/cookie.t
Index: cookie.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/cookie.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- cookie.t 12 Feb 2004 23:06:24 -0000 1.3
+++ cookie.t 9 Jul 2004 18:53:01 -0000 1.4
@@ -52,8 +52,8 @@
$skip++ unless defined $received;
skip_not_same_interp(
$skip,
- $expected,
$received,
+ $expected,
"perl-script+SetupEnv/cookie: $test"
);
}
1.3 +1 -1 modperl-2.0/t/modperl/cookie2.t
Index: cookie2.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/cookie2.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cookie2.t 22 Nov 2003 07:38:48 -0000 1.2
+++ cookie2.t 9 Jul 2004 18:53:01 -0000 1.3
@@ -41,8 +41,8 @@
$skip++ unless defined $received;
skip_not_same_interp(
$skip,
- $expected{$test},
$received,
+ $expected{$test},
"perl-script+SetupEnv/cookie: $test"
);
}
1.5 +2 -2 modperl-2.0/t/modperl/exit.t
Index: exit.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/exit.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- exit.t 3 Jul 2004 18:45:46 -0000 1.4
+++ exit.t 9 Jul 2004 18:53:01 -0000 1.5
@@ -10,8 +10,8 @@
plan tests => 3;
{
- ok t_cmp('exited',
- GET_BODY_ASSERT("$location?noneval"),
+ ok t_cmp(GET_BODY_ASSERT("$location?noneval"),
+ 'exited',
"exit in non eval context");
}
1.4 +1 -1 modperl-2.0/t/modperl/getc.t
Index: getc.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/getc.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- getc.t 18 Apr 2003 06:18:58 -0000 1.3
+++ getc.t 9 Jul 2004 18:53:01 -0000 1.4
@@ -15,5 +15,5 @@
ok $str;
-ok t_cmp($expect, $str, 'getc');
+ok t_cmp($str, $expect, 'getc');
1.3 +1 -1 modperl-2.0/t/modperl/print_utf8.t
Index: print_utf8.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/print_utf8.t,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- print_utf8.t 22 Sep 2003 23:50:10 -0000 1.2
+++ print_utf8.t 9 Jul 2004 18:53:01 -0000 1.3
@@ -21,5 +21,5 @@
# needed for debugging print out of utf8 strings
binmode(STDOUT, ':utf8');
-ok t_cmp($expected, $received, 'UTF8 response via tied/perlio STDOUT');
+ok t_cmp($received, $expected, 'UTF8 response via tied/perlio STDOUT');
1.2 +1 -1 modperl-2.0/t/modperl/print_utf8_2.t
Index: print_utf8_2.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/print_utf8_2.t,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- print_utf8_2.t 22 Sep 2003 23:53:16 -0000 1.1
+++ print_utf8_2.t 9 Jul 2004 18:53:01 -0000 1.2
@@ -24,7 +24,7 @@
# needed for debugging print out of utf8 strings
# but works only if perl is built w/ perlio
binmode(STDOUT, ':utf8');
- ok t_cmp($expected, $received, 'UTF8 response via $r->print');
+ ok t_cmp($received, $expected, 'UTF8 response via $r->print');
}
else {
ok $expected eq $received;
1.4 +1 -1 modperl-2.0/t/modperl/readline.t
Index: readline.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/readline.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- readline.t 18 Apr 2003 06:18:58 -0000 1.3
+++ readline.t 9 Jul 2004 18:53:01 -0000 1.4
@@ -15,5 +15,5 @@
ok $str;
-ok t_cmp($expect, $str, 'readline');
+ok t_cmp($str, $expect, 'readline');
1.4 +2 -2 modperl-2.0/t/modperl/request_rec_perlio_api.t
Index: request_rec_perlio_api.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/request_rec_perlio_api.t,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- request_rec_perlio_api.t 1 Mar 2004 22:18:17 -0000 1.3
+++ request_rec_perlio_api.t 9 Jul 2004 18:53:01 -0000 1.4
@@ -18,12 +18,12 @@
my $location = "$uri?STDIN";
my $expected = join "", 'a'..'j', "package", 'k'..'t';
my $received = POST_BODY_ASSERT $location, content => $content;
- ok t_cmp($expected, $received, "STDIN tests");
+ ok t_cmp($received, $expected, "STDIN tests");
}
{
my $location = "$uri?STDOUT";
my $expected = "life is hard and then you die! next you reincarnate...";
my $received = GET_BODY_ASSERT $location;
- ok t_cmp($expected, $received, "STDOUT tests");
+ ok t_cmp($received, $expected, "STDOUT tests");
}
1.8 +3 -3 modperl-2.0/t/modperl/sameinterp.t
Index: sameinterp.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/sameinterp.t,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- sameinterp.t 22 Nov 2003 07:38:48 -0000 1.7
+++ sameinterp.t 9 Jul 2004 18:53:01 -0000 1.8
@@ -26,8 +26,8 @@
$skip++ unless defined $res;
skip_not_same_interp(
$skip,
- $expected,
defined $res && $res->content,
+ $expected,
"GET over the same interp"
);
}
@@ -47,8 +47,8 @@
$skip++ unless defined $res;
skip_not_same_interp(
$skip,
- $expected,
defined $res && $res->content,
+ $expected,
"POST over the same interp"
);
}
@@ -67,8 +67,8 @@
$skip++ unless defined $res;
skip_not_same_interp(
$skip,
- $same_interp,
defined $res && $res->header(Apache::TestRequest::INTERP_KEY),
+ $same_interp,
"HEAD over the same interp"
);
}
1.5 +28 -28 modperl-2.0/t/modperl/status.t
Index: status.t
===================================================================
RCS file: /home/cvs/modperl-2.0/t/modperl/status.t,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- status.t 3 Jul 2004 18:45:46 -0000 1.4
+++ status.t 9 Jul 2004 18:53:01 -0000 1.5
@@ -19,8 +19,8 @@
my $uri = join '?', $base, Apache::OK;
my $code = GET_RC $uri;
- ok t_cmp(Apache::HTTP_OK,
- $code,
+ ok t_cmp($code,
+ Apache::HTTP_OK,
$uri);
}
@@ -29,8 +29,8 @@
my $code = GET_RC $uri;
# no Alias to map us to DocumentRoot
- ok t_cmp(Apache::NOT_FOUND,
- $code,
+ ok t_cmp($code,
+ Apache::NOT_FOUND,
$uri);
}
@@ -39,8 +39,8 @@
my $uri = join '?', $base, Apache::NOT_FOUND;
my $code = GET_RC $uri;
- ok t_cmp(Apache::NOT_FOUND,
- $code,
+ ok t_cmp($code,
+ Apache::NOT_FOUND,
$uri);
}
@@ -48,8 +48,8 @@
my $uri = join '?', $base, Apache::FORBIDDEN;
my $code = GET_RC $uri;
- ok t_cmp(Apache::FORBIDDEN,
- $code,
+ ok t_cmp($code,
+ Apache::FORBIDDEN,
$uri);
}
@@ -57,8 +57,8 @@
my $uri = join '?', $base, Apache::SERVER_ERROR;
my $code = GET_RC $uri;
- ok t_cmp(Apache::SERVER_ERROR,
- $code,
+ ok t_cmp($code,
+ Apache::SERVER_ERROR,
$uri);
}
@@ -68,8 +68,8 @@
my $uri = join '?', $base, 601;
my $code = GET_RC $uri;
- ok t_cmp(Apache::SERVER_ERROR,
- $code,
+ ok t_cmp($code,
+ Apache::SERVER_ERROR,
$uri);
}
@@ -77,8 +77,8 @@
my $uri = join '?', $base, 313;
my $code = GET_RC $uri;
- ok t_cmp(Apache::SERVER_ERROR,
- $code,
+ ok t_cmp($code,
+ Apache::SERVER_ERROR,
$uri);
}
@@ -86,8 +86,8 @@
my $uri = join '?', $base, 1;
my $code = GET_RC $uri;
- ok t_cmp(Apache::SERVER_ERROR,
- $code,
+ ok t_cmp($code,
+ Apache::SERVER_ERROR,
$uri);
}
@@ -99,8 +99,8 @@
my $uri = join '?', $base, Apache::HTTP_OK;
my $response = GET $uri;
- ok t_cmp(Apache::HTTP_OK,
- $response->code,
+ ok t_cmp($response->code,
+ Apache::HTTP_OK,
$uri);
ok t_cmp($response->content,
@@ -114,8 +114,8 @@
my $uri = join '?', $base, 'exit';
my $code = GET_RC $uri;
- ok t_cmp(Apache::HTTP_OK,
- $code,
+ ok t_cmp($code,
+ Apache::HTTP_OK,
$uri);
}
@@ -124,8 +124,8 @@
my $uri = join '?', $base, 'die';
my $code = GET_RC $uri;
- ok t_cmp(Apache::SERVER_ERROR,
- $code,
+ ok t_cmp($code,
+ Apache::SERVER_ERROR,
$uri);
}
@@ -133,8 +133,8 @@
my $uri = join '?', $base, 'foobar';
my $code = GET_RC $uri;
- ok t_cmp(Apache::HTTP_OK,
- $code,
+ ok t_cmp($code,
+ Apache::HTTP_OK,
$uri);
}
@@ -142,8 +142,8 @@
my $uri = join '?', $base, 'foo9bar';
my $code = GET_RC $uri;
- ok t_cmp(Apache::HTTP_OK,
- $code,
+ ok t_cmp($code,
+ Apache::HTTP_OK,
$uri);
}
@@ -151,8 +151,8 @@
my $uri = join '?', $base, 'undef';
my $code = GET_RC $uri;
- ok t_cmp(Apache::HTTP_OK,
- $code,
+ ok t_cmp($code,
+ Apache::HTTP_OK,
$uri);
}
1.5 +2 -2 modperl-2.0/t/response/TestModperl/current_callback.pm
Index: current_callback.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/current_callback.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- current_callback.pm 20 Oct 2003 19:37:29 -0000 1.4
+++ current_callback.pm 9 Jul 2004 18:53:01 -0000 1.5
@@ -17,8 +17,8 @@
plan $r, tests => 1;
my $callback = Apache::current_callback();
- ok t_cmp('PerlResponseHandler',
- $callback,
+ ok t_cmp($callback,
+ 'PerlResponseHandler',
'inside PerlResponseHandler');
#warn "in callback: $callback\n";
1.9 +19 -19 modperl-2.0/t/response/TestModperl/dir_config.pm
Index: dir_config.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/dir_config.pm,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- dir_config.pm 9 Jul 2004 08:01:21 -0000 1.8
+++ dir_config.pm 9 Jul 2004 18:53:01 -0000 1.9
@@ -34,15 +34,15 @@
my @received = $dir_config->get($key);
my @expected = qw(1_SetValue 2_AddValue 3_AddValue 4_AddValue);
- ok t_cmp([EMAIL PROTECTED], [EMAIL PROTECTED],
+ ok t_cmp([EMAIL PROTECTED], [EMAIL PROTECTED],
'PerlAddVar ITERATE2');
}
# sub-section inherits from super-section if it doesn't override it
{
my $key = make_key('_set_in_Base');
- ok t_cmp('BaseValue',
- $r->dir_config($key),
+ ok t_cmp($r->dir_config($key),
+ 'BaseValue',
"sub-section inherits from super-section " .
"if it doesn't override it");
}
@@ -50,7 +50,7 @@
# sub-section overrides super-section for the same key
{
my $key = 'TestModperl__server_rec_Key_set_in_Base';
- ok t_cmp('SubSecValue', $r->dir_config->get($key),
+ ok t_cmp($r->dir_config->get($key), 'SubSecValue',
"sub-section overrides super-section for the same key");
}
@@ -59,14 +59,14 @@
# object interface test in a scalar context (for a single
# PerlSetVar key)
- ok t_cmp('SetValue0',
- $dir_config->get($key),
+ ok t_cmp($dir_config->get($key),
+ 'SetValue0',
"table get() in a scalar context");
# direct fetch test in a scalar context (for a single
# PerlSetVar key)
- ok t_cmp('SetValue0',
- $r->dir_config($key),
+ ok t_cmp($r->dir_config($key),
+ 'SetValue0',
"direct value fetch in a scalar context");
}
@@ -74,8 +74,8 @@
{
my $key = 'TestModperl__request_rec_ZeroKey';
- ok t_cmp(0,
- $r->dir_config($key),
+ ok t_cmp($r->dir_config($key),
+ 0,
'table value 0 is not undef');
}
@@ -83,8 +83,8 @@
{
my $key = make_key();
- ok t_cmp(undef,
- $r->dir_config($key),
+ ok t_cmp($r->dir_config($key),
+ undef,
"non-existent key");
}
@@ -95,8 +95,8 @@
$r->dir_config($key => $val);
- ok t_cmp($val,
- $r->dir_config($key),
+ ok t_cmp($r->dir_config($key),
+ $val,
"set && get");
}
@@ -131,20 +131,20 @@
my @received = $dir_config->get($key);
my @expected = qw(1_SetValue 2_AddValue 3_AddValue);
- ok t_cmp([EMAIL PROTECTED], [EMAIL PROTECTED],
+ ok t_cmp([EMAIL PROTECTED], [EMAIL PROTECTED],
"testing PerlAddVar ITERATE2 in \$s");
}
{
# base server test
my $bs = Apache->server;
- ok t_cmp('Apache::ServerRec',
- ($bs && ref($bs)),
+ ok t_cmp(($bs && ref($bs)),
+ 'Apache::ServerRec',
"base server's object retrieval");
my $key = 'TestModperl__server_rec_Key_set_in_Base';
- ok t_cmp('1_SetValue',
- scalar ($bs->dir_config->get($key)),
+ ok t_cmp(scalar ($bs->dir_config->get($key)),
+ '1_SetValue',
"read dir_config of the base server");
}
1.4 +1 -1 modperl-2.0/t/response/TestModperl/env.pm
Index: env.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/env.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- env.pm 22 Oct 2002 02:42:03 -0000 1.3
+++ env.pm 9 Jul 2004 18:53:01 -0000 1.4
@@ -65,7 +65,7 @@
for my $key (sort keys %ENV) {
eval { delete $ENV{$key}; };
- ok t_cmp('', $@, $key);
+ ok t_cmp($@, '', $key);
}
Apache::OK;
1.7 +3 -3 modperl-2.0/t/response/TestModperl/merge.pm
Index: merge.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/merge.pm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- merge.pm 9 Jul 2004 08:01:21 -0000 1.6
+++ merge.pm 9 Jul 2004 18:53:01 -0000 1.7
@@ -113,15 +113,15 @@
if ($directive =~ m/Env/) {
my $received = $ENV{$key};
- ok t_cmp($expected[0], $received, $comment);
+ ok t_cmp($received, $expected[0], $comment);
}
elsif ($directive =~ m/Set/) {
my $received = $r->dir_config->get($key);
- ok t_cmp($expected[0], $received, $comment);
+ ok t_cmp($received, $expected[0], $comment);
}
else {
my @received = $r->dir_config->get($key);
- ok t_cmp([EMAIL PROTECTED], [EMAIL PROTECTED], $comment);
+ ok t_cmp([EMAIL PROTECTED], [EMAIL PROTECTED], $comment);
}
}
}
1.4 +3 -3 modperl-2.0/t/response/TestModperl/method.pm
Index: method.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/method.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- method.pm 18 Apr 2003 06:18:59 -0000 1.3
+++ method.pm 9 Jul 2004 18:53:01 -0000 1.4
@@ -30,7 +30,7 @@
plan $r, tests => $tests;
- ok t_cmp(2, scalar @_,
+ ok t_cmp(scalar @_, 2,
'@_ == 2');
my $class = ref($self) || $self;
@@ -39,12 +39,12 @@
'handler class');
ok t_cmp(
- '/' . Apache::TestRequest::module2path($class),
$r->uri,
+ '/' . Apache::TestRequest::module2path($class),
'$r->uri eq $location');
if ($is_obj) {
- ok t_cmp($], $self->{perl_version},
+ ok t_cmp($self->{perl_version}, $],
'object handler data');
}
1.3 +4 -4 modperl-2.0/t/response/TestModperl/perl_options.pm
Index: perl_options.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/perl_options.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- perl_options.pm 23 Jan 2004 02:36:01 -0000 1.2
+++ perl_options.pm 9 Jul 2004 18:53:01 -0000 1.3
@@ -27,16 +27,16 @@
plan $r, tests => @srv_plus + @srv_minus + @dir_plus + @dir_minus;
my $s = $r->server;
- ok t_cmp(1, $s->is_perl_option_enabled($_),
+ ok t_cmp($s->is_perl_option_enabled($_), 1,
"PerlOptions +$_") for @srv_plus;
- ok t_cmp(0, $s->is_perl_option_enabled($_),
+ ok t_cmp($s->is_perl_option_enabled($_), 0,
"PerlOptions -$_") for @srv_minus;
- ok t_cmp(1, $r->is_perl_option_enabled($_),
+ ok t_cmp($r->is_perl_option_enabled($_), 1,
"PerlOptions +$_") for @dir_plus;
- ok t_cmp(0, $r->is_perl_option_enabled($_),
+ ok t_cmp($r->is_perl_option_enabled($_), 0,
"PerlOptions -$_") for @dir_minus;
return Apache::OK;
1.4 +6 -6 modperl-2.0/t/response/TestModperl/pnotes.pm
Index: pnotes.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/pnotes.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pnotes.pm 5 Jul 2004 04:08:02 -0000 1.3
+++ pnotes.pm 9 Jul 2004 18:53:01 -0000 1.4
@@ -17,17 +17,17 @@
ok $r->pnotes;
- ok t_cmp('pnotes_bar',
- $r->pnotes('pnotes_foo', 'pnotes_bar'),
+ ok t_cmp($r->pnotes('pnotes_foo', 'pnotes_bar'),
+ 'pnotes_bar',
q{$r->pnotes(key,val)});
- ok t_cmp('pnotes_bar',
- $r->pnotes('pnotes_foo'),
+ ok t_cmp($r->pnotes('pnotes_foo'),
+ 'pnotes_bar',
q{$r->pnotes(key)});
- ok t_cmp('HASH', ref($r->pnotes), q{ref($r->pnotes)});
+ ok t_cmp(ref($r->pnotes), 'HASH', q{ref($r->pnotes)});
- ok t_cmp('pnotes_bar', $r->pnotes()->{'pnotes_foo'},
+ ok t_cmp($r->pnotes()->{'pnotes_foo'}, 'pnotes_bar',
q{$r->pnotes()->{}});
# unset the entry (but the entry remains with undef value)
1.4 +1 -1 modperl-2.0/t/response/TestModperl/post_utf8.pm
Index: post_utf8.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/post_utf8.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- post_utf8.pm 31 May 2004 23:41:09 -0000 1.3
+++ post_utf8.pm 9 Jul 2004 18:53:01 -0000 1.4
@@ -40,7 +40,7 @@
# utf8::decode() doesn't work under -T
my ($received_ascii, $received_utf8) = split /=/, $received;
- ok t_cmp($expected_ascii, $received_ascii, "ascii");
+ ok t_cmp($received_ascii, $expected_ascii, "ascii");
ok $expected_utf8 eq $received_utf8;
# if you want to see the utf8 data run with:
1.5 +1 -1 modperl-2.0/t/response/TestModperl/request_rec_tie_api.pm
Index: request_rec_tie_api.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/request_rec_tie_api.pm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- request_rec_tie_api.pm 21 Aug 2003 00:07:35 -0000 1.4
+++ request_rec_tie_api.pm 9 Jul 2004 18:53:01 -0000 1.5
@@ -43,7 +43,7 @@
# test OPEN
my $received = open STDOUT, ">", $file or die "Can't open $file: $!";
- ok t_cmp(1, $received, "OPEN");
+ ok t_cmp($received, 1, "OPEN");
# test CLOSE, which is a noop
ok $r->CLOSE;
1.3 +2 -2 modperl-2.0/t/response/TestModperl/setauth.pm
Index: setauth.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/setauth.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- setauth.pm 1 Apr 2003 04:39:30 -0000 1.2
+++ setauth.pm 9 Jul 2004 18:53:01 -0000 1.3
@@ -15,12 +15,12 @@
plan $r, tests => 2;
- ok t_cmp(undef, $r->auth_type(), 'auth_type');
+ ok t_cmp($r->auth_type(), undef, 'auth_type');
t_server_log_error_is_expected();
$r->get_basic_auth_pw();
- ok t_cmp('Basic', $r->auth_type(), 'default auth_type');
+ ok t_cmp($r->auth_type(), 'Basic', 'default auth_type');
Apache::OK;
}
1.2 +42 -42 modperl-2.0/t/response/TestModperl/setupenv.pm
Index: setupenv.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/setupenv.pm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- setupenv.pm 12 Feb 2004 23:06:24 -0000 1.1
+++ setupenv.pm 9 Jul 2004 18:53:01 -0000 1.2
@@ -32,33 +32,33 @@
(my $value) = $r->uri =~ /TestModperl__setupenv_(\w+)/;
- ok t_cmp(Apache::Test::vars('remote_addr'),
- $ENV{REMOTE_ADDR},
+ ok t_cmp($ENV{REMOTE_ADDR},
+ Apache::Test::vars('remote_addr'),
'found REMOTE_ADDR in %ENV');
- ok t_cmp('server',
- $ENV{SRV_SUBPROCESS},
+ ok t_cmp($ENV{SRV_SUBPROCESS},
+ 'server',
'found subprocess_env table entry SRV_SUBPROCESS in %ENV');
- ok t_cmp($value,
- $ENV{DIR_SUBPROCESS},
+ ok t_cmp($ENV{DIR_SUBPROCESS},
+ $value,
'found subprocess_env table entry DIR_SUBPROCESS in %ENV');
- ok t_cmp($value,
- $ENV{DIR_SETENV},
+ ok t_cmp($ENV{DIR_SETENV},
+ $value,
'found per-directory SetEnv entry in %ENV');
- ok t_cmp('server',
- $ENV{SRV_SETENV},
+ ok t_cmp($ENV{SRV_SETENV},
+ 'server',
'found per-server SetEnv entry in %ENV');
# PerlSetEnv always set
- ok t_cmp($value,
- $ENV{DIR_PERLSETENV},
+ ok t_cmp($ENV{DIR_PERLSETENV},
+ $value,
'found per-directory PerlSetEnv entry in %ENV');
- ok t_cmp('server',
- $ENV{SRV_PERLSETENV},
+ ok t_cmp($ENV{SRV_PERLSETENV},
+ 'server',
'found per-server PerlSetEnv entry in %ENV');
return Apache::OK;
@@ -72,33 +72,33 @@
(my $value) = $r->uri =~ /TestModperl__setupenv_(\w+)/;
- ok t_cmp(undef,
- $ENV{REMOTE_ADDR},
+ ok t_cmp($ENV{REMOTE_ADDR},
+ undef,
'REMOTE_ADDR not found in %ENV');
- ok t_cmp(undef,
- $ENV{SRV_SUBPROCESS},
+ ok t_cmp($ENV{SRV_SUBPROCESS},
+ undef,
'subprocess_env table entry SRV_SUBPROCESS not found in %ENV');
- ok t_cmp(undef,
- $ENV{DIR_SUBPROCESS},
+ ok t_cmp($ENV{DIR_SUBPROCESS},
+ undef,
'subprocess_env table entry DIR_SUBPROCESS not found in %ENV');
- ok t_cmp(undef,
- $ENV{DIR_SETENV},
+ ok t_cmp($ENV{DIR_SETENV},
+ undef,
'per-directory SetEnv entry not found in %ENV');
- ok t_cmp(undef,
- $ENV{SRV_SETENV},
+ ok t_cmp($ENV{SRV_SETENV},
+ undef,
'per-server SetEnv entry not found in %ENV');
# PerlSetEnv always set
- ok t_cmp($value,
- $ENV{DIR_PERLSETENV},
+ ok t_cmp($ENV{DIR_PERLSETENV},
+ $value,
'found per-directory PerlSetEnv entry in %ENV');
- ok t_cmp('server',
- $ENV{SRV_PERLSETENV},
+ ok t_cmp($ENV{SRV_PERLSETENV},
+ 'server',
'found per-server PerlSetEnv entry in %ENV');
return Apache::OK;
@@ -112,34 +112,34 @@
(my $value) = $r->uri =~ /TestModperl__setupenv_(\w+)/;
- ok t_cmp(Apache::Test::vars('remote_addr'),
- $ENV{REMOTE_ADDR},
+ ok t_cmp($ENV{REMOTE_ADDR},
+ Apache::Test::vars('remote_addr'),
'found REMOTE_ADDR in %ENV');
# set before void call
- ok t_cmp('server',
- $ENV{SRV_SUBPROCESS},
+ ok t_cmp($ENV{SRV_SUBPROCESS},
+ 'server',
'found subprocess_env table entry one in %ENV');
- ok t_cmp(undef,
- $ENV{DIR_SUBPROCESS},
+ ok t_cmp($ENV{DIR_SUBPROCESS},
+ undef,
'subprocess_env table entry DIR_SUBPROCESS not found in %ENV');
- ok t_cmp(undef,
- $ENV{DIR_SETENV},
+ ok t_cmp($ENV{DIR_SETENV},
+ undef,
'per-directory SetEnv entry not found in %ENV');
- ok t_cmp(undef,
- $ENV{SRV_SETENV},
+ ok t_cmp($ENV{SRV_SETENV},
+ undef,
'per-server SetEnv entry not found in %ENV');
# PerlSetEnv always set
- ok t_cmp($value,
- $ENV{DIR_PERLSETENV},
+ ok t_cmp($ENV{DIR_PERLSETENV},
+ $value,
'found per-directory PerlSetEnv entry in %ENV');
- ok t_cmp('server',
- $ENV{SRV_PERLSETENV},
+ ok t_cmp($ENV{SRV_PERLSETENV},
+ 'server',
'found per-server PerlSetEnv entry in %ENV');
return Apache::OK;
1.4 +2 -2 modperl-2.0/t/response/TestModperl/taint.pm
Index: taint.pm
===================================================================
RCS file: /home/cvs/modperl-2.0/t/response/TestModperl/taint.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- taint.pm 3 Jul 2004 18:45:46 -0000 1.3
+++ taint.pm 9 Jul 2004 18:53:01 -0000 1.4
@@ -21,13 +21,13 @@
plan $r, tests => $tests;
- ok t_cmp(1, ${^TAINT}, "\${^TAINT}");
+ ok t_cmp(${^TAINT}, 1, "\${^TAINT}");
eval { ${^TAINT} = 0 };
ok t_cmp($@, qr/read-only/, "\${^TAINT} is read-only");
if ($build->{MP_COMPAT_1X}) {
- ok t_cmp(1, $Apache::__T, "\$Apache::__T");
+ ok t_cmp($Apache::__T, 1, "\$Apache::__T");
eval { $Apache::__T = 0 };
ok t_cmp($@, qr/read-only/, "\$Apache::__T is read-only");
