X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Flanguages%2FLanguageTest.php;h=d8ec2e9dd8da7de6b3bb25041f87535e10f7d75f;hb=8b08a7db916cc4e303e348fd2cb28f45bedc52cc;hp=70254490d603a4e4ce58f34ce253a3808d0d526b;hpb=a8aa44b79f9c58a559788ff39719f2b6abb88dbf;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/languages/LanguageTest.php b/tests/phpunit/languages/LanguageTest.php
index 70254490d6..d8ec2e9dd8 100644
--- a/tests/phpunit/languages/LanguageTest.php
+++ b/tests/phpunit/languages/LanguageTest.php
@@ -7,10 +7,10 @@ class LanguageTest extends MediaWikiTestCase {
 	 */
 	private $lang;
 
-	function setUp() {
+	protected function setUp() {
 		$this->lang = Language::factory( 'en' );
 	}
-	function tearDown() {
+	protected function tearDown() {
 		unset( $this->lang );
 	}
 
@@ -36,7 +36,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				9.45,
 				array(),
-				'9.5s',
+				'9.5 s',
 				'formatTimePeriod() rounding (<10s)'
 			),
 			array(
@@ -48,7 +48,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				9.95,
 				array(),
-				'10s',
+				'10 s',
 				'formatTimePeriod() rounding (<10s)'
 			),
 			array(
@@ -60,7 +60,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				59.55,
 				array(),
-				'1m 0s',
+				'1 min 0 s',
 				'formatTimePeriod() rounding (<60s)'
 			),
 			array(
@@ -72,7 +72,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				119.55,
 				array(),
-				'2m 0s',
+				'2 min 0 s',
 				'formatTimePeriod() rounding (<1h)'
 			),
 			array(
@@ -84,7 +84,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				3599.55,
 				array(),
-				'1h 0m 0s',
+				'1 h 0 min 0 s',
 				'formatTimePeriod() rounding (<1h)'
 			),
 			array(
@@ -96,7 +96,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				7199.55,
 				array(),
-				'2h 0m 0s',
+				'2 h 0 min 0 s',
 				'formatTimePeriod() rounding (>=1h)'
 			),
 			array(
@@ -108,7 +108,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				7199.55,
 				'avoidseconds',
-				'2h 0m',
+				'2 h 0 min',
 				'formatTimePeriod() rounding (>=1h), avoidseconds'
 			),
 			array(
@@ -120,7 +120,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				7199.55,
 				'avoidminutes',
-				'2h 0m',
+				'2 h 0 min',
 				'formatTimePeriod() rounding (>=1h), avoidminutes'
 			),
 			array(
@@ -132,7 +132,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				172799.55,
 				'avoidseconds',
-				'48h 0m',
+				'48 h 0 min',
 				'formatTimePeriod() rounding (=48h), avoidseconds'
 			),
 			array(
@@ -144,7 +144,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				259199.55,
 				'avoidminutes',
-				'3d 0h',
+				'3 d 0 h',
 				'formatTimePeriod() rounding (>48h), avoidminutes'
 			),
 			array(
@@ -156,7 +156,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				176399.55,
 				'avoidseconds',
-				'2d 1h 0m',
+				'2 d 1 h 0 min',
 				'formatTimePeriod() rounding (>48h), avoidseconds'
 			),
 			array(
@@ -168,7 +168,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				176399.55,
 				'avoidminutes',
-				'2d 1h',
+				'2 d 1 h',
 				'formatTimePeriod() rounding (>48h), avoidminutes'
 			),
 			array(
@@ -180,7 +180,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				259199.55,
 				'avoidseconds',
-				'3d 0h 0m',
+				'3 d 0 h 0 min',
 				'formatTimePeriod() rounding (>48h), avoidseconds'
 			),
 			array(
@@ -192,7 +192,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				172801.55,
 				'avoidseconds',
-				'2d 0h 0m',
+				'2 d 0 h 0 min',
 				'formatTimePeriod() rounding, (>48h), avoidseconds'
 			),
 			array(
@@ -204,7 +204,7 @@ class LanguageTest extends MediaWikiTestCase {
 			array(
 				176460.55,
 				array(),
-				'2d 1h 1m 1s',
+				'2 d 1 h 1 min 1 s',
 				'formatTimePeriod() rounding, recursion, (>48h)'
 			),
 			array(
@@ -1065,5 +1065,30 @@ class LanguageTest extends MediaWikiTestCase {
 			array( 10000, 'MMMMMMMMMM' ),
 		);
 	}
+
+	/**
+	 * @dataProvider providePluralData
+	 */
+	function testConvertPlural( $expected, $number, $forms ) {
+		$chosen = $this->lang->convertPlural( $number, $forms );
+		$this->assertEquals( $expected, $chosen );
+	}
+
+	function providePluralData() {
+		return array(
+			array( 'explicit zero', 0, array(
+				'0=explicit zero', 'singular', 'plural'
+			) ),
+			array( 'explicit one', 1, array(
+				'singular', 'plural', '1=explicit one',
+			) ),
+			array( 'singular', 1, array(
+				'singular', 'plural', '0=explicit zero',
+			) ),
+			array( 'plural', 3, array(
+				'0=explicit zero', '1=explicit one', 'singular', 'plural'
+			) ),
+		);
+	}
 }