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, 84 insertions, 0 deletions

diff --git a/tests/phpunit/includes/CdbTest.php b/tests/phpunit/includes/CdbTest.php
new file mode 100644
index 00000000..6c3e6664
--- /dev/null
+++ b/tests/phpunit/includes/CdbTest.php
@@ -0,0 +1,84 @@
+<?php
+
+/**
+ * Test the CDB reader/writer
+ */
+
+class CdbTest extends MediaWikiTestCase {
+
+	public function setUp() {
+		if ( !CdbReader::haveExtension() ) {
+			$this->markTestIncomplete( 'This test requires native CDB support to be present.' );
+		}
+	}
+
+	public function testCdb() {
+		$dir = wfTempDir();
+		if ( !is_writable( $dir ) ) {
+			$this->markTestSkipped( "Temp dir isn't writable" );
+		}
+
+		$w1 = new CdbWriter_PHP( "$dir/php.cdb" );
+		$w2 = new CdbWriter_DBA( "$dir/dba.cdb" );
+
+		$data = array();
+		for ( $i = 0; $i < 1000; $i++ ) {
+			$key = $this->randomString();
+			$value = $this->randomString();
+			$w1->set( $key, $value );
+			$w2->set( $key, $value );
+
+			if ( !isset( $data[$key] ) ) {
+				$data[$key] = $value;
+			}
+		}
+
+		$w1->close();
+		$w2->close();
+
+		$this->assertEquals(
+			md5_file( "$dir/dba.cdb" ),
+			md5_file( "$dir/php.cdb" ),
+			'same hash'
+		);
+
+		$r1 = new CdbReader_PHP( "$dir/php.cdb" );
+		$r2 = new CdbReader_DBA( "$dir/dba.cdb" );
+
+		foreach ( $data as $key => $value ) {
+			if ( $key === '' ) {
+				// Known bug
+				continue;
+			}
+			$v1 = $r1->get( $key );
+			$v2 = $r2->get( $key );
+
+			$v1 = $v1 === false ? '(not found)' : $v1;
+			$v2 = $v2 === false ? '(not found)' : $v2;
+
+			# cdbAssert( 'Mismatch', $key, $v1, $v2 );
+			$this->cdbAssert( "PHP error", $key, $v1, $value );
+			$this->cdbAssert( "DBA error", $key, $v2, $value );
+		}
+
+		unlink( "$dir/dba.cdb" );
+		unlink( "$dir/php.cdb" );
+	}
+
+	private function randomString() {
+		$len = mt_rand( 0, 10 );
+		$s = '';
+		for ( $j = 0; $j < $len; $j++ ) {
+			$s .= chr( mt_rand( 0, 255 ) );
+		}
+		return $s;
+	}
+
+	private function cdbAssert( $msg, $key, $v1, $v2 ) {
+		$this->assertEquals(
+			$v2,
+			$v1,
+			$msg . ', k=' . bin2hex( $key )
+		);
+	}
+}