Merge "[LockManager] Cleaned up DBLockManager and reduced code duplication."

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

diff --git a/tests/phpunit/includes/XmlTest.php b/tests/phpunit/includes/XmlTest.php
index 9d75616..93ed3dc 100644 (file)
--- a/tests/phpunit/includes/XmlTest.php
+++ b/tests/phpunit/includes/XmlTest.php
@@ -13,8 +13,8 @@ class XmlTest extends MediaWikiTestCase {
                // Hardcode namespaces during test runs,
                // so that html output based on existing namespaces
                // can be properly evaluated.
-               self::$oldNamespaces = $wgContLang->namespaceNames;
-               $wgContLang->namespaceNames = array(
+               self::$oldNamespaces = $wgContLang->getNamespaces();
+               $wgContLang->setNamespaces( array(
                        -2 => 'Media',
                        -1 => 'Special',
                        0  => '',
@@ -31,13 +31,14 @@ class XmlTest extends MediaWikiTestCase {
                        11  => 'Template_talk',
                        100  => 'Custom',
                        101  => 'Custom_talk',
-               );
+               ) );
        }
 
        public function tearDown() {
                global $wgLang, $wgContLang;
                $wgLang = self::$oldLang;
-               $wgContLang->namespaceNames = self::$oldNamespaces;
+               
+               $wgContLang->setNamespaces( self::$oldNamespaces );
        }
 
        public function testExpandAttributes() {
@@ -192,51 +193,6 @@ class XmlTest extends MediaWikiTestCase {
                );
        }
 
-       function testNamespaceSelector() {
-               $this->assertEquals(
-                       '<select class="namespaceselector" id="namespace" name="namespace">
-<option value="0">(Main)</option>
-<option value="1">Talk</option>
-<option value="2">User</option>
-<option value="3">User talk</option>
-<option value="4">MyWiki</option>
-<option value="5">MyWiki Talk</option>
-<option value="6">File</option>
-<option value="7">File talk</option>
-<option value="8">MediaWiki</option>
-<option value="9">MediaWiki talk</option>
-<option value="10">Template</option>
-<option value="11">Template talk</option>
-<option value="100">Custom</option>
-<option value="101">Custom talk</option>
-</select>',
-                       Xml::namespaceSelector(),
-                       'Basic namespace selector without custom options'
-               );
-               $this->assertEquals(
-                       '<label for="myname">Select a namespace:</label>&#160;<select class="namespaceselector" id="namespace" name="myname">
-<option value="all">all</option>
-<option value="0">(Main)</option>
-<option value="1">Talk</option>
-<option value="2" selected="">User</option>
-<option value="3">User talk</option>
-<option value="4">MyWiki</option>
-<option value="5">MyWiki Talk</option>
-<option value="6">File</option>
-<option value="7">File talk</option>
-<option value="8">MediaWiki</option>
-<option value="9">MediaWiki talk</option>
-<option value="10">Template</option>
-<option value="11">Template talk</option>
-<option value="100">Custom</option>
-<option value="101">Custom talk</option>
-</select>',
-                       Xml::namespaceSelector( $selected = '2', $all = 'all', $element_name = 'myname', $label = 'Select a namespace:' ),
-                       'Basic namespace selector with custom values'
-               );
-       }
-
-
        #
        # textarea
        #
@@ -295,6 +251,15 @@ class XmlTest extends MediaWikiTestCase {
                );
        }
 
+       function testLanguageSelector() {
+               $select = Xml::languageSelector( 'en', true, null,
+                       array( 'id' => 'testlang' ), wfMessage( 'yourlanguage' ) );
+               $this->assertEquals(
+                       '<label for="testlang">Language:</label>',
+                       $select[0]
+               );
+       }
+
        #
        # JS
        #
@@ -324,12 +289,12 @@ class XmlTest extends MediaWikiTestCase {
 
        function testEncodeJsVarArray() {
                $this->assertEquals(
-                       '["a", 1]',
+                       '["a",1]',
                        Xml::encodeJsVar( array( 'a', 1 ) ),
                        'encodeJsVar() with array'
                );
                $this->assertEquals(
-                       '{"a": "a", "b": 1}',
+                       '{"a":"a","b":1}',
                        Xml::encodeJsVar( array( 'a' => 'a', 'b' => 1 ) ),
                        'encodeJsVar() with associative array'
                );
@@ -337,7 +302,7 @@ class XmlTest extends MediaWikiTestCase {
 
        function testEncodeJsVarObject() {
                $this->assertEquals(
-                       '{"a": "a", "b": 1}',
+                       '{"a":"a","b":1}',
                        Xml::encodeJsVar( (object)array( 'a' => 'a', 'b' => 1 ) ),
                        'encodeJsVar() with object'
                );