mirror of
https://github.com/ezyang/htmlpurifier.git
synced 2025-07-30 19:00:10 +02:00
[2.1.5] [MFH] Complete the imagecrash added protection fixes
git-svn-id: http://htmlpurifier.org/svnroot/htmlpurifier/branches/php4@1785 48356398-32a2-884e-a903-53898d9a118a
This commit is contained in:
@@ -5,12 +5,44 @@ require_once 'HTMLPurifier/UnitConverter.php';
|
||||
class HTMLPurifier_UnitConverterTest extends HTMLPurifier_Harness
|
||||
{
|
||||
|
||||
function assertConversion($input, $expect) {
|
||||
$input = HTMLPurifier_Length::make($input);
|
||||
$expect = HTMLPurifier_Length::make($expect);
|
||||
$converter = new HTMLPurifier_UnitConverter();
|
||||
$result = $converter->convert($input, $expect->unit);
|
||||
$this->assertIdentical($result, $expect);
|
||||
function assertConversion($input, $expect, $unit = null, $test_negative = true) {
|
||||
$length = HTMLPurifier_Length::make($input);
|
||||
if ($expect !== false) $expectl = HTMLPurifier_Length::make($expect);
|
||||
else $expectl = false;
|
||||
$to_unit = $unit !== null ? $unit : $expectl->getUnit();
|
||||
|
||||
$converter = new HTMLPurifier_UnitConverter(4, 10);
|
||||
$result = $converter->convert($length, $to_unit);
|
||||
if (!$result || !$expectl) $this->assertIdentical($result, $expectl);
|
||||
else $this->assertIdentical($result->toString(), $expectl->toString());
|
||||
|
||||
$converter = new HTMLPurifier_UnitConverter(4, 10, true);
|
||||
$result = $converter->convert($length, $to_unit);
|
||||
if (!$result || !$expectl) $this->assertIdentical($result, $expectl);
|
||||
else $this->assertIdentical($result->toString(), $expectl->toString(), 'BCMath substitute: %s');
|
||||
|
||||
if ($test_negative) {
|
||||
$this->assertConversion(
|
||||
"-$input",
|
||||
$expect === false ? false : "-$expect",
|
||||
$unit,
|
||||
false
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
function testFail() {
|
||||
$this->assertConversion('1in', false, 'foo');
|
||||
$this->assertConversion('1foo', false, 'in');
|
||||
}
|
||||
|
||||
function testZero() {
|
||||
$this->assertConversion('0', '0', 'in', false);
|
||||
$this->assertConversion('-0', '0', 'in', false);
|
||||
$this->assertConversion('0in', '0', 'in', false);
|
||||
$this->assertConversion('-0in', '0', 'in', false);
|
||||
$this->assertConversion('0in', '0', 'pt', false);
|
||||
$this->assertConversion('-0in', '0', 'pt', false);
|
||||
}
|
||||
|
||||
function testEnglish() {
|
||||
@@ -26,6 +58,9 @@ class HTMLPurifier_UnitConverterTest extends HTMLPurifier_Harness
|
||||
$this->assertConversion('1pt', '0.01389in');
|
||||
$this->assertConversion('1.000pt', '0.01389in');
|
||||
$this->assertConversion('100000pt', '1389in');
|
||||
|
||||
$this->assertConversion('1in', '96px');
|
||||
$this->assertConversion('96px', '1in');
|
||||
}
|
||||
|
||||
function testMetric() {
|
||||
@@ -41,4 +76,52 @@ class HTMLPurifier_UnitConverterTest extends HTMLPurifier_Harness
|
||||
$this->assertConversion('0.3937in', '1cm');
|
||||
}
|
||||
|
||||
function testRoundingMinPrecision() {
|
||||
// One sig-fig, modified to be four, conversion rounds up
|
||||
$this->assertConversion('100pt', '1.389in');
|
||||
$this->assertConversion('1000pt', '13.89in');
|
||||
$this->assertConversion('10000pt', '138.9in');
|
||||
$this->assertConversion('100000pt', '1389in');
|
||||
$this->assertConversion('1000000pt', '13890in');
|
||||
}
|
||||
|
||||
function testRoundingUserPrecision() {
|
||||
// Five sig-figs, conversion rounds down
|
||||
$this->assertConversion('11112000pt', '154330in');
|
||||
$this->assertConversion('1111200pt', '15433in');
|
||||
$this->assertConversion('111120pt', '1543.3in');
|
||||
$this->assertConversion('11112pt', '154.33in');
|
||||
$this->assertConversion('1111.2pt', '15.433in');
|
||||
$this->assertConversion('111.12pt', '1.5433in');
|
||||
$this->assertConversion('11.112pt', '0.15433in');
|
||||
}
|
||||
|
||||
function assertSigFig($n, $sigfigs) {
|
||||
$converter = new HTMLPurifier_UnitConverter();
|
||||
$result = $converter->getSigFigs($n);
|
||||
$this->assertIdentical($result, $sigfigs);
|
||||
}
|
||||
|
||||
function test_getSigFigs() {
|
||||
$this->assertSigFig('0', 0);
|
||||
$this->assertSigFig('1', 1);
|
||||
$this->assertSigFig('-1', 1);
|
||||
$this->assertSigFig('+1', 1);
|
||||
$this->assertSigFig('01', 1);
|
||||
$this->assertSigFig('001', 1);
|
||||
$this->assertSigFig('12', 2);
|
||||
$this->assertSigFig('012', 2);
|
||||
$this->assertSigFig('10', 1);
|
||||
$this->assertSigFig('10.', 2);
|
||||
$this->assertSigFig('100.', 3);
|
||||
$this->assertSigFig('103', 3);
|
||||
$this->assertSigFig('130', 2);
|
||||
$this->assertSigFig('.1', 1);
|
||||
$this->assertSigFig('0.1', 1);
|
||||
$this->assertSigFig('00.1', 1);
|
||||
$this->assertSigFig('0.01', 1);
|
||||
$this->assertSigFig('0.010', 2);
|
||||
$this->assertSigFig('0.012', 2);
|
||||
}
|
||||
|
||||
}
|
||||
|
Reference in New Issue
Block a user