You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2017/10/04 16:26:17 UTC
svn commit: r1811108 - in /httpd/test/framework/trunk/t/apache: expr.t
expr_string.t
Author: ylavic
Date: Wed Oct 4 16:26:17 2017
New Revision: 1811108
URL: http://svn.apache.org/viewvc?rev=1811108&view=rev
Log:
New expr's join/split format.
Modified:
httpd/test/framework/trunk/t/apache/expr.t
httpd/test/framework/trunk/t/apache/expr_string.t
Modified: httpd/test/framework/trunk/t/apache/expr.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/expr.t?rev=1811108&r1=1811107&r2=1811108&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/expr.t (original)
+++ httpd/test/framework/trunk/t/apache/expr.t Wed Oct 4 16:26:17 2017
@@ -237,32 +237,37 @@ if (have_min_apache_version("2.4.5")) {
}
if (have_min_apache_version("2.5")) {
- my $SAN_multi = "{ 'email:<redacted1>', 'email:<redacted2>', " .
- "'IP Address:127.0.0.1', 'IP Address:0:0:0:0:0:0:0:1', " .
- "'IP Address:192.168.169.170' }";
- my $SAN_single = "{ 'email:<redacted1>, email:<redacted2>, " .
- "IP Address:127.0.0.1, IP Address:0:0:0:0:0:0:0:1, " .
- "IP Address:192.168.169.170' }";
+ my $SAN_one = "email:<redacted1>, email:<redacted2>, " .
+ "IP Address:127.0.0.1, IP Address:0:0:0:0:0:0:0:1, " .
+ "IP Address:192.168.169.170";
+ my $SAN_tuple = "'email:<redacted1>', 'email:<redacted2>', " .
+ "'IP Address:127.0.0.1', 'IP Address:0:0:0:0:0:0:0:1', " .
+ "'IP Address:192.168.169.170'";
+ my $SAN_list_one = "{ '$SAN_one' }";
+ my $SAN_list_tuple = "{ $SAN_tuple }";
+
my $SAN_split = '.*?IP Address:([^,]+)';
push(@test_cases, (
- [ "join {'a', 'b', 'c'} == 'abc'" => 1 ],
- [ "join ($SAN_multi, ', ') == " .
+ [ "join {'a', 'b', 'c'} == 'abc'" => 1 ],
+ [ "join($SAN_list_tuple, ', ') == " .
"'email:<redacted1>, email:<redacted2>, " .
"IP Address:127.0.0.1, IP Address:0:0:0:0:0:0:0:1, " .
- "IP Address:192.168.169.170'" => 1 ],
- [ "join ($SAN_multi, ', ') == join $SAN_single" => 1 ],
- [ "join ($SAN_multi =~ split/$SAN_split/\$1/, ', ') == " .
+ "IP Address:192.168.169.170'" => 1 ],
+ [ "join($SAN_list_tuple, ', ') == join $SAN_list_one" => 1 ],
+ [ "join(split(s/$SAN_split/\$1/, $SAN_list_tuple), ', ') == " .
"'email:<redacted1>, email:<redacted2>, " .
- "127.0.0.1, 0:0:0:0:0:0:0:1, 192.168.169.170'" => 1 ],
- [ "join ($SAN_single =~ split/$SAN_split/\$1/, ', ') == " .
- "'127.0.0.1, 0:0:0:0:0:0:0:1, 192.168.169.170'" => 1 ],
- [ "'IP Address:192.168.169.170' -in $SAN_multi" => 1 ],
- [ "'192.168.169.170' -in $SAN_multi =~ split/$SAN_split/\$1/" => 1 ],
- [ "'0:0:0:0:0:0:0:1' -in $SAN_single =~ split/$SAN_split/\$1/" => 1 ],
- [ "%{REMOTE_ADDR} -in $SAN_single =~ split/$SAN_split/\$1/" => 1 ],
- [ "'email:<redacted1>' -in $SAN_multi =~ split/$SAN_split/\$1/" => 1 ],
- [ "'email:<redacted2>' -in $SAN_single =~ split/$SAN_split/\$1/" => 0 ],
+ "127.0.0.1, 0:0:0:0:0:0:0:1, 192.168.169.170'" => 1 ],
+ [ "join(split(s/$SAN_split/\$1/, $SAN_list_one), ', ') == " .
+ "'127.0.0.1, 0:0:0:0:0:0:0:1, 192.168.169.170'" => 1 ],
+ [ "'IP Address:192.168.169.170' -in $SAN_list_tuple" => 1 ],
+ [ "'192.168.169.170' -in split s/$SAN_split/\$1/, $SAN_list_tuple" => 1 ],
+ [ "'0:0:0:0:0:0:0:1' -in split s/$SAN_split/\$1/, $SAN_list_one" => 1 ],
+ [ "%{REMOTE_ADDR} -in split s/$SAN_split/\$1/, $SAN_list_one" => 1 ],
+ [ "'email:<redacted1>' -in split s/$SAN_split/\$1/, $SAN_list_tuple" => 1 ],
+ [ "'email:<redacted2>' -in split s/$SAN_split/\$1/, $SAN_list_one" => 0 ],
+ [ "'IP Address:%{REMOTE_ADDR}' -in split/, /, join $SAN_list_one"
+ => 1 ],
));
}
Modified: httpd/test/framework/trunk/t/apache/expr_string.t
URL: http://svn.apache.org/viewvc/httpd/test/framework/trunk/t/apache/expr_string.t?rev=1811108&r1=1811107&r2=1811108&view=diff
==============================================================================
--- httpd/test/framework/trunk/t/apache/expr_string.t (original)
+++ httpd/test/framework/trunk/t/apache/expr_string.t Wed Oct 4 16:26:17 2017
@@ -29,8 +29,21 @@ my @test_cases = (
);
if (have_min_apache_version("2.5")) {
+ my $SAN_one = "email:<redacted1>, email:<redacted2>, " .
+ "IP Address:127.0.0.1, IP Address:0:0:0:0:0:0:0:1, " .
+ "IP Address:192.168.169.170";
+ my $SAN_tuple = "'email:<redacted1>', 'email:<redacted2>', " .
+ "'IP Address:127.0.0.1', 'IP Address:0:0:0:0:0:0:0:1', " .
+ "'IP Address:192.168.169.170'";
+ my $SAN_list_one = "{ '$SAN_one' }";
+ my $SAN_list_tuple = "{ $SAN_tuple }";
+
push(@test_cases, (
- [ '%{tolower:%{:toupper(%{REQUEST_METHOD}):}}' => 'get' ],
+ [ qq["%{tolower:%{:toupper(%{REQUEST_METHOD}):}}"] => "get" ],
+ [ qq["%{: join $SAN_list_one :}"] => "$SAN_one" ],
+ [ qq["%{: join($SAN_list_tuple, ', ') :}"] => "$SAN_one" ],
+ [ qq["%{: 'IP Address:%{REMOTE_ADDR}' -in split/, /, join $SAN_list_one :}"]
+ => "true" ],
));
}