From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sun, 6 Mar 2011 17:36:42 +0000 (+0000)
Subject: PHPUnit coverage comment must not have parentheses
X-Git-Tag: 1.31.0-rc.0~31606
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=16c6730b84531fd24009be0e5dbddecefe11a5f8;p=lhc%2Fweb%2Fwiklou.git

PHPUnit coverage comment must not have parentheses

Those comments have the format:
 @covers Class::Method

In PHPUnit 3.5.12, the comment is split by :: and method_exist called on
the resulting string. When one use  Class::Method(), the result is a call
to method_exist( 'Method()' ) which is always false and raise an exception

Removing parentheses from r79118 solve the issue. This also kind of
revert r79164.
---

diff --git a/tests/phpunit/includes/IPTest.php b/tests/phpunit/includes/IPTest.php
index b54222de2a..5c8cca7d1e 100644
--- a/tests/phpunit/includes/IPTest.php
+++ b/tests/phpunit/includes/IPTest.php
@@ -6,6 +6,7 @@
 class IPTest extends MediaWikiTestCase {
 	/**
 	 *  not sure it should be tested with boolean false. hashar 20100924
+	 * @covers IP::isIPAddress
 	 */
 	public function testisIPAddress() {
 		$this->assertFalse( IP::isIPAddress( false ), 'Boolean false is not an IP' );
@@ -34,6 +35,9 @@ class IPTest extends MediaWikiTestCase {
 		}
 	}
 
+	/**
+	 * @covers IP::isIPv6
+	 */
 	public function testisIPv6() {
 		$this->assertFalse( IP::isIPv6( ':fc:100::' ), 'IPv6 starting with lone ":"' );
 		$this->assertFalse( IP::isIPv6( 'fc:100:::' ), 'IPv6 ending with a ":::"' );
@@ -86,6 +90,9 @@ class IPTest extends MediaWikiTestCase {
 		$this->assertTrue( IP::isIPv6( 'fc:100:a:d:1:e:ac:0' ) );
 	}
 
+	/**
+	 * @covers IP::isIPv4
+	 */
 	public function testisIPv4() {
 		$this->assertFalse( IP::isIPv4( false ), 'Boolean false is not an IP' );
 		$this->assertFalse( IP::isIPv4( true  ), 'Boolean true is not an IP' );
@@ -101,6 +108,9 @@ class IPTest extends MediaWikiTestCase {
 		$this->assertTrue( IP::isIPv4( '74.24.52.13/20', 'IPv4 range' ) );
 	}
 
+	/**
+	 * @covers IP::isValid
+	 */
 	public function testValidIPs() {
 		foreach ( range( 0, 255 ) as $i ) {
 			$a = sprintf( "%03d", $i );
@@ -142,6 +152,9 @@ class IPTest extends MediaWikiTestCase {
 		$this->assertFalse( IP::isValid( 'fc:100:a:d:1:e:ac:0:1::' ), 'IPv6 with 9 words ending with "::"' );
 	}
 
+	/**
+	 * @covers IP::isValid
+	 */
 	public function testInvalidIPs() {
 		// Out of range...
 		foreach ( range( 256, 999 ) as $i ) {
@@ -189,6 +202,9 @@ class IPTest extends MediaWikiTestCase {
 		}
 	}
 
+	/**
+	 * @covers IP::isValidBlock
+	 */
 	public function testValidBlocks() {
 		$valid = array(
 			'116.17.184.5/32',
@@ -209,6 +225,9 @@ class IPTest extends MediaWikiTestCase {
 		}
 	}
 
+	/**
+	 * @covers IP::isValidBlock
+	 */
 	public function testInvalidBlocks() {
 		$invalid = array(
 			'116.17.184.5/33',
@@ -240,6 +259,7 @@ class IPTest extends MediaWikiTestCase {
 
 	/**
 	 * test wrapper around ip2long which might return -1 or false depending on PHP version
+	 * @covers IP::toUnsigned
 	 */
 	public function testip2longWrapper() {
 		// fixme : add more tests ?
@@ -248,6 +268,9 @@ class IPTest extends MediaWikiTestCase {
 		$this->assertFalse( IP::toUnSigned( $i ) );
 	}
 
+	/**
+	 * @covers IP::isPublic
+	 */
 	public function testPrivateIPs() {
 		$private = array( 'fc::3', 'fc::ff', '::1', '10.0.0.1', '172.16.0.1', '192.168.0.1' );
 		foreach ( $private as $p ) {
@@ -267,6 +290,9 @@ class IPTest extends MediaWikiTestCase {
 		$this->assertEquals( $expected, long2ip( $parse[0] ), "network shifting $CIDR" );
 	}
 
+	/**
+	 * @covers IP::hexToQuad
+	 */
 	public function testHexToQuad() {
 		$this->assertEquals( '0.0.0.1'        , IP::hexToQuad( '00000001' ) );
 		$this->assertEquals( '255.0.0.0'      , IP::hexToQuad( 'FF000000' ) );
@@ -279,6 +305,9 @@ class IPTest extends MediaWikiTestCase {
 		$this->assertEquals( '0.0.255.0'   , IP::hexToQuad( 'FF00' ) );
 	}
 
+	/**
+	 * @covers IP::hexToOctet
+	 */
 	public function testHexToOctet() {
 		$this->assertEquals( '0:0:0:0:0:0:0:1',
 			IP::hexToOctet( '00000000000000000000000000000001' ) );
@@ -302,6 +331,7 @@ class IPTest extends MediaWikiTestCase {
 	/*
 	 * IP::parseCIDR() returns an array containing a signed IP address
 	 * representing the network mask and the bit mask.
+	 * @covers IP::parseCIDR
 	 */
 	function testCIDRParsing() {
 		$this->assertFalseCIDR( '192.0.2.0' , "missing mask"    );