Merge "Make tableNamesWithUseIndexOrJOIN() and makeUpdateOptions() protected"

[lhc/web/wiklou.git] / tests / phpunit / includes / FormOptionsTest.php

diff --git a/tests/phpunit/includes/FormOptionsTest.php b/tests/phpunit/includes/FormOptionsTest.php
index bdc5f12..665fa39 100644 (file)
--- a/tests/phpunit/includes/FormOptionsTest.php
+++ b/tests/phpunit/includes/FormOptionsTest.php
@@ -34,6 +34,7 @@ class FormOptionsTest extends MediaWikiTestCase {
                $this->object->add( 'string1', 'string one' );
                $this->object->add( 'string2', 'string two' );
                $this->object->add( 'integer', 0 );
+               $this->object->add( 'float', 0.0 );
                $this->object->add( 'intnull', 0, FormOptions::INTNULL );
        }
 
@@ -45,6 +46,9 @@ class FormOptionsTest extends MediaWikiTestCase {
        private function assertGuessInt( $data ) {
                $this->guess( FormOptions::INT, $data );
        }
+       private function assertGuessFloat( $data ) {
+               $this->guess( FormOptions::FLOAT, $data );
+       }
        private function assertGuessString( $data ) {
                $this->guess( FormOptions::STRING, $data );
        }
@@ -60,32 +64,40 @@ class FormOptionsTest extends MediaWikiTestCase {
 
        /**
         * Reuse helpers above assertGuessBoolean assertGuessInt assertGuessString
+        * @covers FormOptions::guessType
         */
        public function testGuessTypeDetection() {
-               $this->assertGuessBoolean( true  );
+               $this->assertGuessBoolean( true );
                $this->assertGuessBoolean( false );
 
-               $this->assertGuessInt(    0 );
-               $this->assertGuessInt(   -5 );
-               $this->assertGuessInt(    5 );
+               $this->assertGuessInt( 0 );
+               $this->assertGuessInt( -5 );
+               $this->assertGuessInt( 5 );
                $this->assertGuessInt( 0x0F );
 
-               $this->assertGuessString( 'true'  );
-               $this->assertGuessString( 'false' ); 
-               $this->assertGuessString( '5'     ); 
-               $this->assertGuessString( '0'     ); 
+               $this->assertGuessFloat( 0.0 );
+               $this->assertGuessFloat( 1.5 );
+               $this->assertGuessFloat( 1e3 );
+
+               $this->assertGuessString( 'true' );
+               $this->assertGuessString( 'false' );
+               $this->assertGuessString( '5' );
+               $this->assertGuessString( '0' );
+               $this->assertGuessString( '1.5' );
        }
 
        /**
-        * @expectedException MWException 
+        * @expectedException MWException
+        * @covers FormOptions::guessType
         */
        public function testGuessTypeOnArrayThrowException() {
-               $this->object->guessType( array( 'foo' ) ); 
+               $this->object->guessType( array( 'foo' ) );
        }
        /**
-        * @expectedException MWException 
+        * @expectedException MWException
+        * @covers FormOptions::guessType
         */
        public function testGuessTypeOnNullThrowException() {
-               $this->object->guessType( null ); 
+               $this->object->guessType( null );
        }
 }