1 files changed, 71 insertions, 48 deletions

diff --git a/tests/phpunit/languages/LanguageSrTest.php b/tests/phpunit/languages/LanguageSrTest.php
index d44ecf8e..d6fedb57 100644
--- a/tests/phpunit/languages/LanguageSrTest.php
+++ b/tests/phpunit/languages/LanguageSrTest.php
@@ -10,25 +10,18 @@
  * @author Antoine Musso <hashar at free dot fr>
  * @copyright Copyright © 2011, Antoine Musso <hashar at free dot fr>
  * @file
+ *
+ * @todo methods in test class should be tidied:
+ *  - Should be split into separate test methods and data providers
+ *  - Tests for LanguageConverter and Language should probably be separate..
  */
 
-require_once dirname( __DIR__ ) . '/bootstrap.php';
-
 /** Tests for MediaWiki languages/LanguageSr.php */
-class LanguageSrTest extends MediaWikiTestCase {
-	/* Language object. Initialized before each test */
-	private $lang;
-
-	function setUp() {
-		$this->lang = Language::factory( 'sr' );
-	}
-	function tearDown() {
-		unset( $this->lang );
-	}
-
-	##### TESTS #######################################################
-
-	function testEasyConversions( ) {
+class LanguageSrTest extends LanguageClassesTestCase {
+	/**
+	 * @covers LanguageConverter::convertTo
+	 */
+	public function testEasyConversions() {
 		$this->assertCyrillic(
 			'шђчћжШЂЧЋЖ',
 			'Cyrillic guessing characters'
@@ -39,7 +32,10 @@ class LanguageSrTest extends MediaWikiTestCase {
 		);
 	}
 
-	function testMixedConversions() {
+	/**
+	 * @covers LanguageConverter::convertTo
+	 */
+	public function testMixedConversions() {
 		$this->assertCyrillic(
 			'шђчћжШЂЧЋЖ - šđčćž',
 			'Mostly cyrillic characters'
@@ -50,7 +46,10 @@ class LanguageSrTest extends MediaWikiTestCase {
 		);
 	}
 
-	function testSameAmountOfLatinAndCyrillicGetConverted() {
+	/**
+	 * @covers LanguageConverter::convertTo
+	 */
+	public function testSameAmountOfLatinAndCyrillicGetConverted() {
 		$this->assertConverted(
 			'4 latin: šđčć | 4 cyrillic: шђчћ',
 			'sr-ec'
@@ -63,8 +62,9 @@ class LanguageSrTest extends MediaWikiTestCase {
 
 	/**
 	 * @author Nikola Smolenski
+	 * @covers LanguageConverter::convertTo
 	 */
-	function testConversionToCyrillic() {
+	public function testConversionToCyrillic() {
 		//A simple convertion of Latin to Cyrillic
 		$this->assertEquals( 'абвг',
 			$this->convertToCyrillic( 'abvg' )
@@ -103,7 +103,10 @@ class LanguageSrTest extends MediaWikiTestCase {
 		);
 	}
 
-	function testConversionToLatin() {
+	/**
+	 * @covers LanguageConverter::convertTo
+	 */
+	public function testConversionToLatin() {
 		//A simple convertion of Latin to Latin
 		$this->assertEquals( 'abcd',
 			$this->convertToLatin( 'abcd' )
@@ -122,38 +125,55 @@ class LanguageSrTest extends MediaWikiTestCase {
 		);
 	}
 
-	/** @dataProvider providePluralFourForms */
-	function testPluralFourForms( $result, $value ) {
-		$forms = array( 'one', 'few', 'many', 'other' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+	/**
+	 * @dataProvider providePlural
+	 * @covers Language::convertPlural
+	 */
+	public function testPlural( $result, $value ) {
+		$forms = array( 'one', 'few', 'other' );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
+	}
+
+	/**
+	 * @dataProvider providePlural
+	 * @covers Language::getPluralRuleType
+	 */
+	public function testGetPluralRuleType( $result, $value ) {
+		$this->assertEquals( $result, $this->getLang()->getPluralRuleType( $value ) );
 	}
 
-	function providePluralFourForms() {
-		return array (
+	public static function providePlural() {
+		return array(
 			array( 'one', 1 ),
-			array( 'many', 11 ),
+			array( 'other', 11 ),
 			array( 'one', 91 ),
 			array( 'one', 121 ),
 			array( 'few', 2 ),
 			array( 'few', 3 ),
 			array( 'few', 4 ),
 			array( 'few', 334 ),
-			array( 'many', 5 ),
-			array( 'many', 15 ),
-			array( 'many', 120 ),
+			array( 'other', 5 ),
+			array( 'other', 15 ),
+			array( 'other', 120 ),
 		);
 	}
-	/** @dataProvider providePluralTwoForms */
-	function testPluralTwoForms( $result, $value ) {
-		$forms = array( 'one', 'several' );
-		$this->assertEquals( $result, $this->lang->convertPlural( $value, $forms ) );
+
+	/**
+	 * @dataProvider providePluralTwoForms
+	 * @covers Language::convertPlural
+	 */
+	public function testPluralTwoForms( $result, $value ) {
+		$forms = array( 'one', 'other' );
+		$this->assertEquals( $result, $this->getLang()->convertPlural( $value, $forms ) );
 	}
-	function providePluralTwoForms() {
-		return array (
+
+	public static function providePluralTwoForms() {
+		return array(
 			array( 'one', 1 ),
-			array( 'several', 11 ),
-			array( 'several', 91 ),
-			array( 'several', 121 ),
+			array( 'other', 11 ),
+			array( 'other', 4 ),
+			array( 'one', 91 ),
+			array( 'one', 121 ),
 		);
 	}
 
@@ -164,20 +184,21 @@ class LanguageSrTest extends MediaWikiTestCase {
 	 * @param $variant string Language variant 'sr-ec' or 'sr-el'
 	 * @param $msg string Optional message
 	 */
-	function assertUnConverted( $text, $variant, $msg = '' ) {
+	protected function assertUnConverted( $text, $variant, $msg = '' ) {
 		$this->assertEquals(
 			$text,
 			$this->convertTo( $text, $variant ),
 			$msg
 		);
 	}
+
 	/**
 	 * Wrapper to verify a text is different once converted to a variant.
 	 * @param $text string Text to convert
 	 * @param $variant string Language variant 'sr-ec' or 'sr-el'
 	 * @param $msg string Optional message
 	 */
-	function assertConverted( $text, $variant, $msg = '' ) {
+	protected function assertConverted( $text, $variant, $msg = '' ) {
 		$this->assertNotEquals(
 			$text,
 			$this->convertTo( $text, $variant ),
@@ -190,34 +211,36 @@ class LanguageSrTest extends MediaWikiTestCase {
 	 * using the cyrillic variant and converted to Latin when using
 	 * the Latin variant.
 	 */
-	function assertCyrillic( $text, $msg = '' ) {
+	protected function assertCyrillic( $text, $msg = '' ) {
 		$this->assertUnConverted( $text, 'sr-ec', $msg );
 		$this->assertConverted( $text, 'sr-el', $msg );
 	}
+
 	/**
 	 * Verifiy the given Latin text is not converted when using
 	 * using the Latin variant and converted to Cyrillic when using
 	 * the Cyrillic variant.
 	 */
-	function assertLatin( $text, $msg = '' ) {
+	protected function assertLatin( $text, $msg = '' ) {
 		$this->assertUnConverted( $text, 'sr-el', $msg );
 		$this->assertConverted( $text, 'sr-ec', $msg );
 	}
 
 
 	/** Wrapper for converter::convertTo() method*/
-	function convertTo( $text, $variant ) {
-		return $this
-			->lang
+	protected function convertTo( $text, $variant ) {
+		return $this->getLang()
 			->mConverter
 			->convertTo(
 				$text, $variant
 			);
 	}
-	function convertToCyrillic( $text ) {
+
+	protected function convertToCyrillic( $text ) {
 		return $this->convertTo( $text, 'sr-ec' );
 	}
-	function convertToLatin( $text ) {
+
+	protected function convertToLatin( $text ) {
 		return $this->convertTo( $text, 'sr-el' );
 	}
 }