X-Git-Url: https://git.cyclocoop.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FUserTest.php;h=cabbf10fc092c2326d4f7111f2b1f09af32acaa0;hb=f97233896606a6f45c7f93db714e81b64aa9c0ab;hp=e6af1264fc55b763e96ca2120941291491a2992c;hpb=2e09c356789bf7569fdfa219827f488976aa16f0;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/UserTest.php b/tests/phpunit/includes/UserTest.php
index e6af1264fc..cabbf10fc0 100644
--- a/tests/phpunit/includes/UserTest.php
+++ b/tests/phpunit/includes/UserTest.php
@@ -125,6 +125,31 @@ class UserTest extends MediaWikiTestCase {
 		);
 	}
 
+	/**
+	 * @dataProvider provideIPs
+	 * @covers User::isIP
+	 */
+	public function testIsIP( $value, $result, $message ) {
+		$this->assertEquals( $this->user->isIP( $value ), $result, $message );
+	}
+
+	public static function provideIPs() {
+		return array(
+			array( '', false, 'Empty string' ),
+			array( ' ', false, 'Blank space' ),
+			array( '10.0.0.0', true, 'IPv4 private 10/8' ),
+			array( '10.255.255.255', true, 'IPv4 private 10/8' ),
+			array( '192.168.1.1', true, 'IPv4 private 192.168/16' ),
+			array( '203.0.113.0', true, 'IPv4 example' ),
+			array( '2002:ffff:ffff:ffff:ffff:ffff:ffff:ffff', true, 'IPv6 example' ),
+			// Not valid IPs but classified as such by MediaWiki for negated asserting
+			// of whether this might be the identifier of a logged-out user or whether
+			// to allow usernames like it.
+			array( '300.300.300.300', true, 'Looks too much like an IPv4 address' ),
+			array( '203.0.113.xxx', true, 'Assigned by UseMod to cloaked logged-out users' ),
+		);
+	}
+
 	/**
 	 * @dataProvider provideUserNames
 	 * @covers User::isValidUserName
@@ -148,6 +173,9 @@ class UserTest extends MediaWikiTestCase {
 			array( 'Abcdകഖഗഘ', true, ' Mixed scripts' ),
 			array( 'ജോസ്‌തോമസ്', false, 'ZWNJ- Format control character' ),
 			array( 'Ab　cd', false, ' Ideographic space' ),
+			array( '300.300.300.300', false, 'Looks too much like an IPv4 address' ),
+			array( '302.113.311.900', false, 'Looks too much like an IPv4 address' ),
+			array( '203.0.113.xxx', false, 'Reserved for usage by UseMod for cloaked logged-out users' ),
 		);
 	}
 
@@ -157,7 +185,7 @@ class UserTest extends MediaWikiTestCase {
 	 * Extensions and core
 	 */
 	public function testAllRightsWithMessage() {
-		//Getting all user rights, for core: User::$mCoreRights, for extensions: $wgAvailableRights
+		// Getting all user rights, for core: User::$mCoreRights, for extensions: $wgAvailableRights
 		$allRights = User::getAllRights();
 		$allMessageKeys = Language::getMessageKeysFor( 'en' );
 
@@ -196,13 +224,21 @@ class UserTest extends MediaWikiTestCase {
 		}
 
 		$user->clearInstanceCache();
-		$this->assertEquals( 3, $user->getEditCount(), 'After three edits, the user edit count should be 3' );
+		$this->assertEquals(
+			3,
+			$user->getEditCount(),
+			'After three edits, the user edit count should be 3'
+		);
 
 		// increase the edit count and clear the cache
 		$user->incEditCount();
 
 		$user->clearInstanceCache();
-		$this->assertEquals( 4, $user->getEditCount(), 'After increasing the edit count manually, the user edit count should be 4' );
+		$this->assertEquals(
+			4,
+			$user->getEditCount(),
+			'After increasing the edit count manually, the user edit count should be 4'
+		);
 	}
 
 	/**
@@ -287,4 +323,35 @@ class UserTest extends MediaWikiTestCase {
 		$this->assertFalse( $user->checkPasswordValidity( 'Passpass' )->isGood() );
 		$this->assertEquals( 'password-login-forbidden', $user->getPasswordValidity( 'Passpass' ) );
 	}
+
+	/**
+	 * @covers User::getCanonicalName()
+	 * @dataProvider provideGetCanonicalName
+	 */
+	public function testGetCanonicalName( $name, $expectedArray, $msg ) {
+		foreach ( $expectedArray as $validate => $expected ) {
+			$this->assertEquals(
+				User::getCanonicalName( $name, $validate === 'false' ? false : $validate ),
+				$expected,
+				$msg . ' (' . $validate . ')'
+			);
+		}
+	}
+
+	public function provideGetCanonicalName() {
+		return array(
+			array( ' trailing space ', array( 'creatable' => 'Trailing space' ), 'Trailing spaces' ),
+			// @todo FIXME: Maybe the createable name should be 'Talk:Username' or false to reject?
+			array( 'Talk:Username', array( 'creatable' => 'Username', 'usable' => 'Username',
+				'valid' => 'Username', 'false' => 'Talk:Username' ), 'Namespace prefix' ),
+			array( ' name with # hash', array( 'creatable' => false, 'usable' => false ), 'With hash' ),
+			array( 'Multi  spaces', array( 'creatable' => 'Multi spaces',
+				'usable' => 'Multi spaces' ), 'Multi spaces' ),
+			array( 'lowercase', array( 'creatable' => 'Lowercase' ), 'Lowercase' ),
+			array( 'in[]valid', array( 'creatable' => false, 'usable' => false, 'valid' => false,
+				'false' => 'In[]valid' ), 'Invalid' ),
+			array( 'with / slash', array( 'creatable' => false, 'usable' => false, 'valid' => false,
+				'false' => 'With / slash' ), 'With slash' ),
+		);
+	}
 }