dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Localize namespaces to inh"
[lhc/web/wiklou.git]
/
tests
/
phpunit
/
includes
/
libs
/
IPTest.php
diff --git
a/tests/phpunit/includes/libs/IPTest.php
b/tests/phpunit/includes/libs/IPTest.php
index
307652d
..
8a120ea
100644
(file)
--- a/
tests/phpunit/includes/libs/IPTest.php
+++ b/
tests/phpunit/includes/libs/IPTest.php
@@
-10,6
+10,9
@@
*/
class IPTest extends PHPUnit_Framework_TestCase {
*/
class IPTest extends PHPUnit_Framework_TestCase {
+
+ use MediaWikiCoversValidator;
+
/**
* @covers IP::isIPAddress
* @dataProvider provideInvalidIPs
/**
* @covers IP::isIPAddress
* @dataProvider provideInvalidIPs
@@
-237,7
+240,7
@@
class IPTest extends PHPUnit_Framework_TestCase {
];
foreach ( $ipCIDRs as $i ) {
$this->assertFalse( IP::isValid( $i ),
];
foreach ( $ipCIDRs as $i ) {
$this->assertFalse( IP::isValid( $i ),
- "$i is an invalid IP address because it is a
block
" );
+ "$i is an invalid IP address because it is a
range
" );
}
// Incomplete/garbage
$invalid = [
}
// Incomplete/garbage
$invalid = [
@@
-254,9
+257,9
@@
class IPTest extends PHPUnit_Framework_TestCase {
}
/**
}
/**
- * Provide some valid IP
block
s
+ * Provide some valid IP
range
s
*/
*/
- public function provideValid
Block
s() {
+ public function provideValid
Range
s() {
return [
[ '116.17.184.5/32' ],
[ '0.17.184.5/30' ],
return [
[ '116.17.184.5/32' ],
[ '0.17.184.5/30' ],
@@
-274,22
+277,22
@@
class IPTest extends PHPUnit_Framework_TestCase {
}
/**
}
/**
- * @covers IP::isValid
Block
- * @dataProvider provideValid
Block
s
+ * @covers IP::isValid
Range
+ * @dataProvider provideValid
Range
s
*/
*/
- public function testValid
Blocks( $block
) {
- $this->assertTrue( IP::isValid
Block( $block ), "$block is a valid IP block
" );
+ public function testValid
Ranges( $range
) {
+ $this->assertTrue( IP::isValid
Range( $range ), "$range is a valid IP range
" );
}
/**
}
/**
- * @covers IP::isValid
Block
- * @dataProvider provideInvalid
Block
s
+ * @covers IP::isValid
Range
+ * @dataProvider provideInvalid
Range
s
*/
*/
- public function testInvalid
Block
s( $invalid ) {
- $this->assertFalse( IP::isValid
Block( $invalid ), "$invalid is not a valid IP block
" );
+ public function testInvalid
Range
s( $invalid ) {
+ $this->assertFalse( IP::isValid
Range( $invalid ), "$invalid is not a valid IP range
" );
}
}
- public function provideInvalid
Block
s() {
+ public function provideInvalid
Range
s() {
return [
[ '116.17.184.5/33' ],
[ '0.17.184.5/130' ],
return [
[ '116.17.184.5/33' ],
[ '0.17.184.5/130' ],
@@
-561,7
+564,7
@@
class IPTest extends PHPUnit_Framework_TestCase {
}
/**
}
/**
- *
Test for IP::splitHostAndPort().
+ *
@covers IP::splitHostAndPort()
* @dataProvider provideSplitHostAndPort
*/
public function testSplitHostAndPort( $expected, $input, $description ) {
* @dataProvider provideSplitHostAndPort
*/
public function testSplitHostAndPort( $expected, $input, $description ) {
@@
-588,7
+591,7
@@
class IPTest extends PHPUnit_Framework_TestCase {
}
/**
}
/**
- *
Test for
IP::combineHostAndPort()
+ *
@covers
IP::combineHostAndPort()
* @dataProvider provideCombineHostAndPort
*/
public function testCombineHostAndPort( $expected, $input, $description ) {
* @dataProvider provideCombineHostAndPort
*/
public function testCombineHostAndPort( $expected, $input, $description ) {
@@
-612,7
+615,7
@@
class IPTest extends PHPUnit_Framework_TestCase {
}
/**
}
/**
- *
Test for
IP::sanitizeRange()
+ *
@covers
IP::sanitizeRange()
* @dataProvider provideIPCIDRs
*/
public function testSanitizeRange( $input, $expected, $description ) {
* @dataProvider provideIPCIDRs
*/
public function testSanitizeRange( $input, $expected, $description ) {
@@
-636,7
+639,7
@@
class IPTest extends PHPUnit_Framework_TestCase {
}
/**
}
/**
- *
Test for
IP::prettifyIP()
+ *
@covers
IP::prettifyIP()
* @dataProvider provideIPsToPrettify
*/
public function testPrettifyIP( $ip, $prettified ) {
* @dataProvider provideIPsToPrettify
*/
public function testPrettifyIP( $ip, $prettified ) {