Add some other ServicesJson tests.

diff --git a/tests/phpunit/includes/json/ServicesJsonTest.php b/tests/phpunit/includes/json/ServicesJsonTest.php
index 44ca606..e3c62b5 100644 (file)
--- a/tests/phpunit/includes/json/ServicesJsonTest.php
+++ b/tests/phpunit/includes/json/ServicesJsonTest.php
@@ -54,18 +54,40 @@ class ServicesJsonTest extends MediaWikiTestCase {
                $obj->property3 = 1.234;
                return array(
                        array( 1, 'basic integer' ),
+                       array( -1, 'negative integer' ),
+                       array( 1.1, 'basic float' ),
                        array( true, 'basic bool true' ),
                        array( false, 'basic bool false' ),
                        array( 'some string', 'basic string test' ),
+                       array( "some string\nwith newline", 'newline string test' ),
+                       array( '♥ü', 'unicode string test' ),
                        array( array( 'some', 'string', 'values' ), 'basic array of strings' ),
                        array( array( 'key1' => 'val1', 'key2' => 'val2' ), 'array with string keys' ),
+                        array( array( 1 => 'val1', 3 => 'val2', '2' => 'val3' ), 'out of order numbered array test' ),
+                       array( array(), 'empty array test' ),
                        array( $obj, 'basic object test' ),
+                       array( new stdClass, 'empty object test' ),
+                       array( null, 'null test' ),
                );
        }
 
        function provideValuesToDecode() {
                return array(
+                        array( '1', 'basic integer' ),
+                        array( '-1', 'negative integer' ),
+                        array( '1.1', 'basic float' ),
+                        array( '1.1e1', 'scientific float' ),
+                        array( 'true', 'basic bool true' ),
+                        array( 'false', 'basic bool false' ),
+                        array( '"some string"', 'basic string test' ),
+                        array( '"some string\nwith newline"', 'newline string test' ),
+                        array( '"♥ü"', 'unicode character string test' ),
+                        array( '"\u2665"', 'unicode \\u string test' ),
+                        array( '["some","string","values"]', 'basic array of strings' ),
+                        array( '[]', 'empty array test' ),
                        array( '{"key":"value"}', 'Basic key => value test' ),
+                       array( '{}', 'empty object test' ),
+                        array( 'null', 'null test' ),
                );
        }
 }