Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WfExpandUrlTest use yield for test cases

Browse source 
Instead of needing to store them all
in $retval

Change-Id: I1d42375931cfb0b7afbbb15c79ec3fca07caf047
This commit is contained in:
DannyS712 2021-03-01 15:44:25 +00:00
parent 245bb6234f
commit fb4627b84b
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tests/phpunit/includes/GlobalFunctions/WfExpandUrlTest.php
View file

@ -42,21 +42,20 @@ class WfExpandUrlTest extends MediaWikiIntegrationTestCase {
'canonical' => PROTO_CANONICAL
];
$retval = [];
foreach ( $modes as $mode ) {
$httpsMode = $mode == 'https';
foreach ( $servers as $serverDesc => $server ) {
foreach ( $modes as $canServerMode ) {
$canServer = "$canServerMode://example2.com";
foreach ( $defaultProtos as $protoDesc => $defaultProto ) {
$retval[] = [
yield [
'http://example.com', 'http://example.com',
$defaultProto, $server, $canServer, $httpsMode, 443,
"Testing fully qualified http URLs (no need to expand) "
. "(defaultProto: $protoDesc , wgServer: $server, "
. "wgCanonicalServer: $canServer, current request protocol: $mode )"
];
$retval[] = [
yield [
'https://example.com', 'https://example.com',
$defaultProto, $server, $canServer, $httpsMode, 443,
"Testing fully qualified https URLs (no need to expand) "
@ -64,7 +63,7 @@ class WfExpandUrlTest extends MediaWikiIntegrationTestCase {
. "wgCanonicalServer: $canServer, current request protocol: $mode )"
];
# Would be nice to support this, see fixme on wfExpandUrl()
$retval[] = [
yield [
"wiki/FooBar", 'wiki/FooBar',
$defaultProto, $server, $canServer, $httpsMode, 443,
"Test non-expandable relative URLs (defaultProto: $protoDesc, "
@ -91,14 +90,14 @@ class WfExpandUrlTest extends MediaWikiIntegrationTestCase {
$srv = $server;
}
$retval[] = [
yield [
"$p//wikipedia.org", '//wikipedia.org',
$defaultProto, $server, $canServer, $httpsMode, 443,
"Test protocol-relative URL (defaultProto: $protoDesc, "
. "wgServer: $server, wgCanonicalServer: $canServer, "
. "current request protocol: $mode )"
];
$retval[] = [
yield [
"$srv/wiki/FooBar",
'/wiki/FooBar',
$defaultProto,
@ -116,7 +115,7 @@ class WfExpandUrlTest extends MediaWikiIntegrationTestCase {
}
// Don't add HTTPS port to foreign URLs
$retval[] = [
yield [
'https://foreign.example.com/foo',
'https://foreign.example.com/foo',
PROTO_HTTPS,
@ -126,7 +125,7 @@ class WfExpandUrlTest extends MediaWikiIntegrationTestCase {
111,
"Don't add HTTPS port to foreign URLs"
];
$retval[] = [
yield [
'https://foreign.example.com:222/foo',
'https://foreign.example.com:222/foo',
PROTO_HTTPS,
@ -137,7 +136,7 @@ class WfExpandUrlTest extends MediaWikiIntegrationTestCase {
"Don't overwrite HTTPS port of foreign URLs"
];
// Do add HTTPS port to local URLs
$retval[] = [
yield [
'https://wiki.example.com:111/foo',
'/foo',
PROTO_HTTPS,
@ -147,7 +146,5 @@ class WfExpandUrlTest extends MediaWikiIntegrationTestCase {
111,
"Do add HTTPS port to protocol-relative URLs"
];
return $retval;
}
}