stas 2004/09/25 11:47:10
Modified: t/response/TestModperl merge.pm
Log:
style cleanup
Revision Changes Path
1.9 +66 -65 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.8
retrieving revision 1.9
diff -u -u -r1.8 -r1.9
--- merge.pm 20 Sep 2004 18:14:48 -0000 1.8
+++ merge.pm 25 Sep 2004 18:47:10 -0000 1.9
@@ -17,71 +17,74 @@
# t/modperl/merge2.t, and t/modperl/merge3.t. see any of those
# tests and/or the below configuration for more details
-
-# result tables for the below tests (trying to make the code more simple...)
-# the hash itself represents a request
-# the keys to the main hash represent merge levels - 1 for the non-overriding
-# merge, 2 for an overriding merge, and 3 for a two-level merge
-# the rest should be self-explanatory - settings and expected values.
-our %merge1 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
- PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
- PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
- PerlAddVar => [MergeAddVar1 => ['AddVar1Val1',
- 'AddVar1Val2']],
- },
- 2 => { PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Val'],
- PerlSetVar => [MergeSetVar2 => 'SetVar2Val'],
- PerlAddVar => [MergeAddVar2 => ['AddVar2Val1',
- 'AddVar2Val2']],
- },
- 3 => { PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Val'],
- PerlSetVar => [MergeSetVar3 => 'SetVar3Val'],
- PerlAddVar => [MergeAddVar3 => ['AddVar3Val1',
- 'AddVar3Val2']],
- },
- );
-
-our %merge2 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
- PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
- PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
- PerlAddVar => [MergeAddVar1 => ['AddVar1Val1',
- 'AddVar1Val2']],
- },
- 2 => { PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
- PerlSetVar => [MergeSetVar2 => 'SetVar2Merge2Val'],
- PerlAddVar => [MergeAddVar2 => ['AddVar2Merge2Val1',
- 'AddVar2Merge2Val2']],
- },
- 3 => { PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Val'],
- PerlSetVar => [MergeSetVar3 => 'SetVar3Val'],
- PerlAddVar => [MergeAddVar3 => ['AddVar3Val1',
- 'AddVar3Val2']],
- },
- );
-
-our %merge3 = ( 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
- PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
- PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
- PerlAddVar => [MergeAddVar1 => ['AddVar1Val1',
- 'AddVar1Val2']],
- },
- 2 => { PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Merge3Val'],
- PerlSetVar => [MergeSetVar2 => 'SetVar2Merge3Val'],
- PerlAddVar => [MergeAddVar2 => ['AddVar2Merge3Val1',
- 'AddVar2Merge3Val2']],
- },
- 3 => { PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Merge3Val'],
- PerlSetVar => [MergeSetVar3 => 'SetVar3Merge3Val'],
- PerlAddVar => [MergeAddVar3 => ['AddVar3Merge3Val1',
- 'AddVar3Merge3Val2']],
- },
- );
+# result tables for the below tests (trying to make the code more
+# simple...) the hash itself represents a request
+# the keys to the main hash represent merge levels - 1 for the
+# non-overriding merge, 2 for an overriding merge, and 3 for a
+# two-level merge the rest should be self-explanatory - settings and
+# expected values.
+our %merge1 = (
+ 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
+ PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
+ PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
+ PerlAddVar => [MergeAddVar1 => ['AddVar1Val1',
+ 'AddVar1Val2']],
+ },
+ 2 => { PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Val'],
+ PerlSetVar => [MergeSetVar2 => 'SetVar2Val'],
+ PerlAddVar => [MergeAddVar2 => ['AddVar2Val1',
+ 'AddVar2Val2']],
+ },
+ 3 => { PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Val'],
+ PerlSetVar => [MergeSetVar3 => 'SetVar3Val'],
+ PerlAddVar => [MergeAddVar3 => ['AddVar3Val1',
+ 'AddVar3Val2']],
+ },
+);
+
+our %merge2 = (
+ 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
+ PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
+ PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
+ PerlAddVar => [MergeAddVar1 => ['AddVar1Val1',
+ 'AddVar1Val2']],
+ },
+ 2 => { PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Merge2Val'],
+ PerlSetVar => [MergeSetVar2 => 'SetVar2Merge2Val'],
+ PerlAddVar => [MergeAddVar2 => ['AddVar2Merge2Val1',
+ 'AddVar2Merge2Val2']],
+ },
+ 3 => { PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Val'],
+ PerlSetVar => [MergeSetVar3 => 'SetVar3Val'],
+ PerlAddVar => [MergeAddVar3 => ['AddVar3Val1',
+ 'AddVar3Val2']],
+ },
+);
+
+our %merge3 = (
+ 1 => { PerlPassEnv => [APACHE_TEST_HOSTTYPE => 'z80'],
+ PerlSetEnv => [MergeSetEnv1 => 'SetEnv1Val'],
+ PerlSetVar => [MergeSetVar1 => 'SetVar1Val'],
+ PerlAddVar => [MergeAddVar1 => ['AddVar1Val1',
+ 'AddVar1Val2']],
+ },
+ 2 => { PerlSetEnv => [MergeSetEnv2 => 'SetEnv2Merge3Val'],
+ PerlSetVar => [MergeSetVar2 => 'SetVar2Merge3Val'],
+ PerlAddVar => [MergeAddVar2 => ['AddVar2Merge3Val1',
+ 'AddVar2Merge3Val2']],
+ },
+ 3 => { PerlSetEnv => [MergeSetEnv3 => 'SetEnv3Merge3Val'],
+ PerlSetVar => [MergeSetVar3 => 'SetVar3Merge3Val'],
+ PerlAddVar => [MergeAddVar3 => ['AddVar3Merge3Val1',
+ 'AddVar3Merge3Val2']],
+ },
+);
sub handler {
my $r = shift;
- no strict qw(refs);
+ plan $r, tests => 10;
my $uri = $r->uri;
my $hash;
@@ -91,16 +94,14 @@
} elsif ($uri =~ m/(merge2)/) {
$hash = $1;
} else {
- $hash = 'merge1';
+ $hash = 'merge1';
}
- plan $r, tests => 10;
-
t_debug("testing against results in $hash");
+ no strict qw(refs);
foreach my $level (sort keys %$hash) {
- foreach my $directive (sort keys %{$hash->{$level}}) {
-
+ foreach my $directive (sort keys %{ $hash->{$level} }) {
my $key = $hash->{$level}->{$directive}->[0];
my $value = $hash->{$level}->{$directive}->[1];
