X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2Flibs%2FIPTest.php;h=e47c4ba12aea25988e10a47802ca4262956a928a;hp=307652d938ffc501e1fc43766da053d66075bb69;hb=a23183010ed4fe4bfb3e47e29174d59cbe1ec98e;hpb=0f13fff1604778397c4ca3072ab80ef113c936ff diff --git a/tests/phpunit/includes/libs/IPTest.php b/tests/phpunit/includes/libs/IPTest.php index 307652d938..e47c4ba12a 100644 --- a/tests/phpunit/includes/libs/IPTest.php +++ b/tests/phpunit/includes/libs/IPTest.php @@ -237,7 +237,7 @@ class IPTest extends PHPUnit_Framework_TestCase { ]; 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 = [ @@ -254,9 +254,9 @@ class IPTest extends PHPUnit_Framework_TestCase { } /** - * Provide some valid IP blocks + * Provide some valid IP ranges */ - public function provideValidBlocks() { + public function provideValidRanges() { return [ [ '116.17.184.5/32' ], [ '0.17.184.5/30' ], @@ -274,22 +274,22 @@ class IPTest extends PHPUnit_Framework_TestCase { } /** - * @covers IP::isValidBlock - * @dataProvider provideValidBlocks + * @covers IP::isValidRange + * @dataProvider provideValidRanges */ - public function testValidBlocks( $block ) { - $this->assertTrue( IP::isValidBlock( $block ), "$block is a valid IP block" ); + public function testValidRanges( $range ) { + $this->assertTrue( IP::isValidRange( $range ), "$range is a valid IP range" ); } /** - * @covers IP::isValidBlock - * @dataProvider provideInvalidBlocks + * @covers IP::isValidRange + * @dataProvider provideInvalidRanges */ - public function testInvalidBlocks( $invalid ) { - $this->assertFalse( IP::isValidBlock( $invalid ), "$invalid is not a valid IP block" ); + public function testInvalidRanges( $invalid ) { + $this->assertFalse( IP::isValidRange( $invalid ), "$invalid is not a valid IP range" ); } - public function provideInvalidBlocks() { + public function provideInvalidRanges() { return [ [ '116.17.184.5/33' ], [ '0.17.184.5/130' ],