summaryrefslogtreecommitdiff
path: root/tests/phpunit/includes/utils
diff options
context:
space:
mode:
authorPierre Schmitz <pierre@archlinux.de>2015-06-04 07:31:04 +0200
committerPierre Schmitz <pierre@archlinux.de>2015-06-04 07:58:39 +0200
commitf6d65e533c62f6deb21342d4901ece24497b433e (patch)
treef28adf0362d14bcd448f7b65a7aaf38650f923aa /tests/phpunit/includes/utils
parentc27b2e832fe25651ef2410fae85b41072aae7519 (diff)
Update to MediaWiki 1.25.1
Diffstat (limited to 'tests/phpunit/includes/utils')
-rw-r--r--tests/phpunit/includes/utils/CdbTest.php90
-rw-r--r--tests/phpunit/includes/utils/IPTest.php2
-rw-r--r--tests/phpunit/includes/utils/MWCryptHKDFTest.php6
-rw-r--r--tests/phpunit/includes/utils/MWFunctionTest.php34
-rw-r--r--tests/phpunit/includes/utils/StringUtilsTest.php149
-rw-r--r--tests/phpunit/includes/utils/UIDGeneratorTest.php6
-rw-r--r--tests/phpunit/includes/utils/ZipDirectoryReaderTest.php2
7 files changed, 45 insertions, 244 deletions
diff --git a/tests/phpunit/includes/utils/CdbTest.php b/tests/phpunit/includes/utils/CdbTest.php
deleted file mode 100644
index 487ee1fc..00000000
--- a/tests/phpunit/includes/utils/CdbTest.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
- * Test the CDB reader/writer
- * @covers CdbWriterPHP
- * @covers CdbWriterDBA
- */
-class CdbTest extends MediaWikiTestCase {
-
- protected function setUp() {
- parent::setUp();
- if ( !CdbReader::haveExtension() ) {
- $this->markTestSkipped( 'Native CDB support is not available' );
- }
- }
-
- /**
- * @group medium
- */
- public function testCdb() {
- $dir = wfTempDir();
- if ( !is_writable( $dir ) ) {
- $this->markTestSkipped( "Temp dir isn't writable" );
- }
-
- $phpcdbfile = $this->getNewTempFile();
- $dbacdbfile = $this->getNewTempFile();
-
- $w1 = new CdbWriterPHP( $phpcdbfile );
- $w2 = new CdbWriterDBA( $dbacdbfile );
-
- $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( $phpcdbfile ),
- md5_file( $dbacdbfile ),
- 'same hash'
- );
-
- $r1 = new CdbReaderPHP( $phpcdbfile );
- $r2 = new CdbReaderDBA( $dbacdbfile );
-
- 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 );
- }
- }
-
- 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 )
- );
- }
-}
diff --git a/tests/phpunit/includes/utils/IPTest.php b/tests/phpunit/includes/utils/IPTest.php
index ebe347fd..09c1587d 100644
--- a/tests/phpunit/includes/utils/IPTest.php
+++ b/tests/phpunit/includes/utils/IPTest.php
@@ -9,7 +9,7 @@
* dataprovider.
*/
-class IPTest extends MediaWikiTestCase {
+class IPTest extends PHPUnit_Framework_TestCase {
/**
* not sure it should be tested with boolean false. hashar 20100924
* @covers IP::isIPAddress
diff --git a/tests/phpunit/includes/utils/MWCryptHKDFTest.php b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
index 7e37534a..73e4c1a9 100644
--- a/tests/phpunit/includes/utils/MWCryptHKDFTest.php
+++ b/tests/phpunit/includes/utils/MWCryptHKDFTest.php
@@ -6,6 +6,12 @@
class MWCryptHKDFTest extends MediaWikiTestCase {
+ protected function setUp() {
+ parent::setUp();
+
+ $this->setMwGlobals( 'wgSecretKey', '5bf1945342e67799cb50704a7fa19ac6' );
+ }
+
/**
* Test basic usage works
*/
diff --git a/tests/phpunit/includes/utils/MWFunctionTest.php b/tests/phpunit/includes/utils/MWFunctionTest.php
new file mode 100644
index 00000000..f4d17999
--- /dev/null
+++ b/tests/phpunit/includes/utils/MWFunctionTest.php
@@ -0,0 +1,34 @@
+<?php
+
+/**
+ * @covers MWFunction
+ */
+class MWFunctionTest extends MediaWikiTestCase {
+ public function testNewObjFunction() {
+ $arg1 = 'Foo';
+ $arg2 = 'Bar';
+ $arg3 = array( 'Baz' );
+ $arg4 = new ExampleObject;
+
+ $args = array( $arg1, $arg2, $arg3, $arg4 );
+
+ $newObject = new MWBlankClass( $arg1, $arg2, $arg3, $arg4 );
+ $this->hideDeprecated( 'MWFunction::newObj' );
+ $this->assertEquals(
+ MWFunction::newObj( 'MWBlankClass', $args )->args,
+ $newObject->args
+ );
+ }
+}
+
+class MWBlankClass {
+
+ public $args = array();
+
+ function __construct( $arg1, $arg2, $arg3, $arg4 ) {
+ $this->args = array( $arg1, $arg2, $arg3, $arg4 );
+ }
+}
+
+class ExampleObject {
+}
diff --git a/tests/phpunit/includes/utils/StringUtilsTest.php b/tests/phpunit/includes/utils/StringUtilsTest.php
deleted file mode 100644
index 0fdb8e15..00000000
--- a/tests/phpunit/includes/utils/StringUtilsTest.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-
-class StringUtilsTest extends MediaWikiTestCase {
-
- /**
- * This tests StringUtils::isUtf8 whenever we have the mbstring extension
- * loaded.
- *
- * @covers StringUtils::isUtf8
- * @dataProvider provideStringsForIsUtf8Check
- */
- public function testIsUtf8WithMbstring( $expected, $string ) {
- if ( !function_exists( 'mb_check_encoding' ) ) {
- $this->markTestSkipped( 'Test requires the mbstring PHP extension' );
- }
- $this->assertEquals( $expected,
- StringUtils::isUtf8( $string ),
- 'Testing string "' . $this->escaped( $string ) . '" with mb_check_encoding'
- );
- }
-
- /**
- * This tests StringUtils::isUtf8 making sure we use the pure PHP
- * implementation used as a fallback when mb_check_encoding() is
- * not available.
- *
- * @covers StringUtils::isUtf8
- * @dataProvider provideStringsForIsUtf8Check
- */
- public function testIsUtf8WithPhpFallbackImplementation( $expected, $string ) {
- $this->assertEquals( $expected,
- StringUtils::isUtf8( $string, /** disable mbstring: */true ),
- 'Testing string "' . $this->escaped( $string ) . '" with pure PHP implementation'
- );
- }
-
- /**
- * Print high range characters as a hexadecimal
- * @param string $string
- * @return string
- */
- function escaped( $string ) {
- $escaped = '';
- $length = strlen( $string );
- for ( $i = 0; $i < $length; $i++ ) {
- $char = $string[$i];
- $val = ord( $char );
- if ( $val > 127 ) {
- $escaped .= '\x' . dechex( $val );
- } else {
- $escaped .= $char;
- }
- }
-
- return $escaped;
- }
-
- /**
- * See also "UTF-8 decoder capability and stress test" by
- * Markus Kuhn:
- * http://www.cl.cam.ac.uk/~mgk25/ucs/examples/UTF-8-test.txt
- */
- public static function provideStringsForIsUtf8Check() {
- // Expected return values for StringUtils::isUtf8()
- $PASS = true;
- $FAIL = false;
-
- return array(
- 'some ASCII' => array( $PASS, 'Some ASCII' ),
- 'euro sign' => array( $PASS, "Euro sign €" ),
-
- 'first possible sequence 1 byte' => array( $PASS, "\x00" ),
- 'first possible sequence 2 bytes' => array( $PASS, "\xc2\x80" ),
- 'first possible sequence 3 bytes' => array( $PASS, "\xe0\xa0\x80" ),
- 'first possible sequence 4 bytes' => array( $PASS, "\xf0\x90\x80\x80" ),
- 'first possible sequence 5 bytes' => array( $FAIL, "\xf8\x88\x80\x80\x80" ),
- 'first possible sequence 6 bytes' => array( $FAIL, "\xfc\x84\x80\x80\x80\x80" ),
-
- 'last possible sequence 1 byte' => array( $PASS, "\x7f" ),
- 'last possible sequence 2 bytes' => array( $PASS, "\xdf\xbf" ),
- 'last possible sequence 3 bytes' => array( $PASS, "\xef\xbf\xbf" ),
- 'last possible sequence 4 bytes (U+1FFFFF)' => array( $FAIL, "\xf7\xbf\xbf\xbf" ),
- 'last possible sequence 5 bytes' => array( $FAIL, "\xfb\xbf\xbf\xbf\xbf" ),
- 'last possible sequence 6 bytes' => array( $FAIL, "\xfd\xbf\xbf\xbf\xbf\xbf" ),
-
- 'boundary 1' => array( $PASS, "\xed\x9f\xbf" ),
- 'boundary 2' => array( $PASS, "\xee\x80\x80" ),
- 'boundary 3' => array( $PASS, "\xef\xbf\xbd" ),
- 'boundary 4' => array( $PASS, "\xf2\x80\x80\x80" ),
- 'boundary 5 (U+FFFFF)' => array( $PASS, "\xf3\xbf\xbf\xbf" ),
- 'boundary 6 (U+100000)' => array( $PASS, "\xf4\x80\x80\x80" ),
- 'boundary 7 (U+10FFFF)' => array( $PASS, "\xf4\x8f\xbf\xbf" ),
- 'boundary 8 (U+110000)' => array( $FAIL, "\xf4\x90\x80\x80" ),
-
- 'malformed 1' => array( $FAIL, "\x80" ),
- 'malformed 2' => array( $FAIL, "\xbf" ),
- 'malformed 3' => array( $FAIL, "\x80\xbf" ),
- 'malformed 4' => array( $FAIL, "\x80\xbf\x80" ),
- 'malformed 5' => array( $FAIL, "\x80\xbf\x80\xbf" ),
- 'malformed 6' => array( $FAIL, "\x80\xbf\x80\xbf\x80" ),
- 'malformed 7' => array( $FAIL, "\x80\xbf\x80\xbf\x80\xbf" ),
- 'malformed 8' => array( $FAIL, "\x80\xbf\x80\xbf\x80\xbf\x80" ),
-
- 'last byte missing 1' => array( $FAIL, "\xc0" ),
- 'last byte missing 2' => array( $FAIL, "\xe0\x80" ),
- 'last byte missing 3' => array( $FAIL, "\xf0\x80\x80" ),
- 'last byte missing 4' => array( $FAIL, "\xf8\x80\x80\x80" ),
- 'last byte missing 5' => array( $FAIL, "\xfc\x80\x80\x80\x80" ),
- 'last byte missing 6' => array( $FAIL, "\xdf" ),
- 'last byte missing 7' => array( $FAIL, "\xef\xbf" ),
- 'last byte missing 8' => array( $FAIL, "\xf7\xbf\xbf" ),
- 'last byte missing 9' => array( $FAIL, "\xfb\xbf\xbf\xbf" ),
- 'last byte missing 10' => array( $FAIL, "\xfd\xbf\xbf\xbf\xbf" ),
-
- 'extra continuation byte 1' => array( $FAIL, "e\xaf" ),
- 'extra continuation byte 2' => array( $FAIL, "\xc3\x89\xaf" ),
- 'extra continuation byte 3' => array( $FAIL, "\xef\xbc\xa5\xaf" ),
- 'extra continuation byte 4' => array( $FAIL, "\xf0\x9d\x99\xb4\xaf" ),
-
- 'impossible bytes 1' => array( $FAIL, "\xfe" ),
- 'impossible bytes 2' => array( $FAIL, "\xff" ),
- 'impossible bytes 3' => array( $FAIL, "\xfe\xfe\xff\xff" ),
-
- 'overlong sequences 1' => array( $FAIL, "\xc0\xaf" ),
- 'overlong sequences 2' => array( $FAIL, "\xc1\xaf" ),
- 'overlong sequences 3' => array( $FAIL, "\xe0\x80\xaf" ),
- 'overlong sequences 4' => array( $FAIL, "\xf0\x80\x80\xaf" ),
- 'overlong sequences 5' => array( $FAIL, "\xf8\x80\x80\x80\xaf" ),
- 'overlong sequences 6' => array( $FAIL, "\xfc\x80\x80\x80\x80\xaf" ),
-
- 'maximum overlong sequences 1' => array( $FAIL, "\xc1\xbf" ),
- 'maximum overlong sequences 2' => array( $FAIL, "\xe0\x9f\xbf" ),
- 'maximum overlong sequences 3' => array( $FAIL, "\xf0\x8f\xbf\xbf" ),
- 'maximum overlong sequences 4' => array( $FAIL, "\xf8\x87\xbf\xbf" ),
- 'maximum overlong sequences 5' => array( $FAIL, "\xfc\x83\xbf\xbf\xbf\xbf" ),
-
- 'surrogates 1 (U+D799)' => array( $PASS, "\xed\x9f\xbf" ),
- 'surrogates 2 (U+E000)' => array( $PASS, "\xee\x80\x80" ),
- 'surrogates 3 (U+D800)' => array( $FAIL, "\xed\xa0\x80" ),
- 'surrogates 4 (U+DBFF)' => array( $FAIL, "\xed\xaf\xbf" ),
- 'surrogates 5 (U+DC00)' => array( $FAIL, "\xed\xb0\x80" ),
- 'surrogates 6 (U+DFFF)' => array( $FAIL, "\xed\xbf\xbf" ),
- 'surrogates 7 (U+D800 U+DC00)' => array( $FAIL, "\xed\xa0\x80\xed\xb0\x80" ),
-
- 'noncharacters 1' => array( $PASS, "\xef\xbf\xbe" ),
- 'noncharacters 2' => array( $PASS, "\xef\xbf\xbf" ),
- );
- }
-}
diff --git a/tests/phpunit/includes/utils/UIDGeneratorTest.php b/tests/phpunit/includes/utils/UIDGeneratorTest.php
index 50fa3849..0e11ccad 100644
--- a/tests/phpunit/includes/utils/UIDGeneratorTest.php
+++ b/tests/phpunit/includes/utils/UIDGeneratorTest.php
@@ -35,14 +35,14 @@ class UIDGeneratorTest extends MediaWikiTestCase {
$lastId_bin = wfBaseConvert( $lastId, 10, 2 );
$this->assertGreaterThanOrEqual(
- substr( $id_bin, 0, $tbits ),
substr( $lastId_bin, 0, $tbits ),
+ substr( $id_bin, 0, $tbits ),
"New ID timestamp ($id_bin) >= prior one ($lastId_bin)." );
if ( $hostbits ) {
$this->assertEquals(
- substr( $id_bin, 0, -$hostbits ),
- substr( $lastId_bin, 0, -$hostbits ),
+ substr( $id_bin, -$hostbits ),
+ substr( $lastId_bin, -$hostbits ),
"Host ID of ($id_bin) is same as prior one ($lastId_bin)." );
}
diff --git a/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php b/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
index 34ffb535..05d07d45 100644
--- a/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
+++ b/tests/phpunit/includes/utils/ZipDirectoryReaderTest.php
@@ -4,7 +4,7 @@
* @covers ZipDirectoryReader
* NOTE: this test is more like an integration test than a unit test
*/
-class ZipDirectoryReaderTest extends MediaWikiTestCase {
+class ZipDirectoryReaderTest extends PHPUnit_Framework_TestCase {
protected $zipDir;
protected $entries;