Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 85 insertions, 0 deletions

diff --git a/tests/phpunit/includes/FormOptionsInitializationTest.php b/tests/phpunit/includes/FormOptionsInitializationTest.php
new file mode 100644
index 00000000..85d76271
--- /dev/null
+++ b/tests/phpunit/includes/FormOptionsInitializationTest.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * This file host two test case classes for the MediaWiki FormOptions class:
+ *  - FormOptionsInitializationTest : tests initialization of the class.
+ *  - FormOptionsTest : tests methods an on instance
+ *
+ * The split let us take advantage of setting up a fixture for the methods
+ * tests.
+ */
+
+/**
+ * Dummy class to makes FormOptions::$options public.
+ * Used by FormOptionsInitializationTest which need to verify the $options
+ * array is correctly set through the FormOptions::add() function.
+ */
+class FormOptionsExposed extends FormOptions {
+	public function getOptions() {
+		return $this->options;
+	}
+}
+
+/**
+ * Test class for FormOptions initialization
+ * Ensure the FormOptions::add() does what we want it to do.
+ *
+ * Generated by PHPUnit on 2011-02-28 at 20:46:27.
+ *
+ * Copyright © 2011, Ashar Voultoiz
+ *
+ * @author Ashar Voultoiz
+ */
+class FormOptionsInitializationTest extends MediaWikiTestCase {
+	/**
+	 * @var FormOptions
+	 */
+	protected $object;
+
+
+	/**
+	 * A new fresh and empty FormOptions object to test initialization
+	 * with.
+	 */
+	protected function setUp() {
+		$this->object = new FormOptionsExposed();
+		
+	}
+
+	public function testAddStringOption() {
+		$this->object->add( 'foo', 'string value' ); 
+		$this->assertEquals(
+			array(
+				'foo' => array(
+					'default'  => 'string value',
+					'consumed' => false,
+					'type'	 => FormOptions::STRING,
+					'value'	=> null,
+					)
+			),
+			$this->object->getOptions()
+		);
+	}
+
+	public function testAddIntegers() {
+		$this->object->add( 'one',     1 ); 
+		$this->object->add( 'negone', -1 ); 
+		$this->assertEquals(
+			array(
+				'negone' => array(
+					'default'  => -1, 
+					'value'	=> null,
+					'consumed' => false,
+					'type'	 => FormOptions::INT,
+					),
+				'one' => array(
+					'default'  => 1,
+					'value'	=> null,
+					'consumed' => false,
+					'type'	 => FormOptions::INT,
+					)
+			),
+			$this->object->getOptions()
+		);
+	}
+
+}