wikimedia/mediawiki-extensions-AbuseFilter
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/AbuseFilter.git synced 2024-11-24 06:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add tests for various data type casts

Browse source 
These are the ones which other tests don't cover, mostly because no
filter syntax can trigger those cases. This patch should bring coverage
for AFPData to 100%.

Bug: T201193
Change-Id: I997576141943959d4602a9f839311108928ec766
This commit is contained in:
Daimona Eaytoy 2019-04-14 14:08:57 +02:00
parent 909eec6716
commit ec110c657b
2 changed files with 130 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/parser/AFPData.php
View file

@ -88,10 +88,8 @@ class AFPData {
return $orig->dup();
}
if ( $target === self::DNULL ) {
// Should never happen. Actually, why is this here?
// @codeCoverageIgnoreStart
// We don't expose any method to cast to null. And, actually, should we?
return new AFPData();
// @codeCoverageIgnoreEnd
}
if ( $orig->type === self::DARRAY ) {
@ -119,12 +117,11 @@ class AFPData {
return new AFPData( self::DINT, intval( $orig->data ) );
} elseif ( $target === self::DSTRING ) {
return new AFPData( self::DSTRING, strval( $orig->data ) );
// We don't expose any cast-to-array method...
// @codeCoverageIgnoreStart
} elseif ( $target === self::DARRAY ) {
// We don't expose any method to cast to array
return new AFPData( self::DARRAY, [ $orig ] );
}
// @codeCoverageIgnoreEnd
throw new AFPException( 'Cannot cast ' . $orig->type . " to $target." );
}
/**

127
tests/phpunit/AFPDataTest.php
View file

@ -121,4 +121,131 @@ class AFPDataTest extends MediaWikiTestCase {
[ '1/0.0', 'mulRel' ],
];
}
/**
* @param mixed $raw
* @param AFPData|null $expected If null, we expect an exception due to unsupported data type
* @covers AFPData::newFromPHPVar
* @dataProvider providePHPVars
*/
public function testNewFromPHPVar( $raw, $expected ) {
if ( $expected === null ) {
$this->setExpectedException( AFPException::class );
}
$this->assertEquals( $expected, AFPData::newFromPHPVar( $raw ) );
}
/**
* Data provider for testNewFromPHPVar
*
* @return array
*/
public function providePHPVars() {
return [
[ 15, new AFPData( AFPData::DINT, 15 ) ],
[ '42', new AFPData( AFPData::DSTRING, '42' ) ],
[ 0.123, new AFPData( AFPData::DFLOAT, 0.123 ) ],
[ false, new AFPData( AFPData::DBOOL, false ) ],
[ true, new AFPData( AFPData::DBOOL, true ) ],
[ null, new AFPData() ],
[
[ 1, 'foo', [], [ null ], false ],
new AFPData( AFPData::DARRAY, [
new AFPData( AFPData::DINT, 1 ),
new AFPData( AFPData::DSTRING, 'foo' ),
new AFPData( AFPData::DARRAY, [] ),
new AFPData( AFPData::DARRAY, [ new AFPData() ] ),
new AFPData( AFPData::DBOOL, false )
] )
],
// Invalid data types
[ new stdClass, null ],
[ new AFPData, null ]
];
}
/**
* Test casts to null and to arrays, for which we don't expose any method for use in actual
* filters. Other casts are already covered in parserTests.
*
* @param AFPData $orig
* @param string $newType One of the AFPData::D* constants
* @param AFPData|null $expected If null, we expect an exception due to unsupported data type
* @covers AFPData::castTypes
* @dataProvider provideMissingCastTypes
*/
public function testMissingCastTypes( $orig, $newType, $expected ) {
if ( $expected === null ) {
$this->setExpectedException( AFPException::class );
}
$this->assertEquals( $expected, AFPData::castTypes( $orig, $newType ) );
}
/**
* Data provider for testMissingCastTypes
*
* @return array
*/
public function provideMissingCastTypes() {
return [
[ new AFPData( AFPData::DINT, 1 ), AFPData::DNULL, new AFPData() ],
[ new AFPData( AFPData::DBOOL, false ), AFPData::DNULL, new AFPData() ],
[ new AFPData( AFPData::DSTRING, 'foo' ), AFPData::DNULL, new AFPData() ],
[ new AFPData( AFPData::DFLOAT, 3.14 ), AFPData::DNULL, new AFPData() ],
[
new AFPData( AFPData::DARRAY, [ new AFPData( AFPData::DSTRING, 'foo' ), new AFPData() ] ),
AFPData::DNULL,
new AFPData()
],
[
new AFPData( AFPData::DINT, 1 ),
AFPData::DARRAY,
new AFPData( AFPData::DARRAY, [ new AFPData( AFPData::DINT, 1 ) ] )
],
[
new AFPData( AFPData::DBOOL, false ),
AFPData::DARRAY,
new AFPData( AFPData::DARRAY, [ new AFPData( AFPData::DBOOL, false ) ] )
],
[
new AFPData( AFPData::DSTRING, 'foo' ),
AFPData::DARRAY,
new AFPData( AFPData::DARRAY, [ new AFPData( AFPData::DSTRING, 'foo' ) ] )
],
[
new AFPData( AFPData::DFLOAT, 3.14 ),
AFPData::DARRAY,
new AFPData( AFPData::DARRAY, [ new AFPData( AFPData::DFLOAT, 3.14 ) ] )
],
[ new AFPData(), AFPData::DARRAY, new AFPData( AFPData::DARRAY, [ new AFPData() ] ) ],
[ new AFPData( AFPData::DSTRING, 'foo' ), 'foobaz', null ],
[ new AFPData(), null, null ]
];
}
/**
* Test a couple of toNative cases which aren't already covered in other tests.
*
* @param AFPData $orig
* @param mixed $expected
* @covers AFPData::toNative
* @dataProvider provideMissingToNative
*/
public function testMissingToNative( $orig, $expected ) {
$this->assertEquals( $expected, $orig->toNative() );
}
/**
* Data provider for testMissingToNative
*
* @return array
*/
public function provideMissingToNative() {
return [
[ new AFPData( AFPData::DFLOAT, 1.2345 ), 1.2345 ],
[ new AFPData( AFPData::DFLOAT, 0.1 ), 0.1 ],
[ new AFPData(), null ],
[ new AFPData( AFPData::DNULL, null ), null ],
];
}
}