composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-03-06 17:44:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'speedup_jenkins' into develop

Browse Source
This commit is contained in:
odain
2019-12-03 11:09:30 +01:00
parent e1ffdea172 ed81391aff
commit 4013b76c9e
5 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
test/core/HTMLDOMSanitizerTest.php
View File

@@ -24,6 +24,7 @@ class HTMLDOMSanitizerTest extends ItopTestCase
{
$sInputHtml = $this->ReadTestFile($sFileToTest, self::INPUT_DIRECTORY);
$sOutputHtml = $this->ReadTestFile($sFileToTest, self::OUTPUT_DIRECTORY);
<<<<<<< HEAD
$oSanitizer = new HTMLDOMSanitizer();
$sRes = $oSanitizer->DoSanitize($sInputHtml);
@@ -35,6 +36,12 @@ class HTMLDOMSanitizerTest extends ItopTestCase
// So we're removing new lines on both sides :/
$sOutputHtml = $this->RemoveNewLines($sOutputHtml);
$sRes = $this->RemoveNewLines($sRes);
=======
$sOutputHtml = $this->RemoveNewLines($sOutputHtml);
$oSanitizer = new HTMLDOMSanitizer();
$sRes = $oSanitizer->DoSanitize($sInputHtml);
>>>>>>> speedup_jenkins
$this->debug($sRes);
$this->assertEquals($sOutputHtml, $sRes);
@@ -78,6 +85,7 @@ class HTMLDOMSanitizerTest extends ItopTestCase
$oSanitizer = new HTMLDOMSanitizer();
$sRes = $oSanitizer->DoSanitize($sHtmlToTest);
<<<<<<< HEAD
// Removing newlines as the parser gives different results depending on the PHP version
// Didn't manage to get it right :
// - no php.ini difference
@@ -86,6 +94,9 @@ class HTMLDOMSanitizerTest extends ItopTestCase
$sHtmlToTest = $this->RemoveNewLines($sHtmlToTest);
$sRes = $this->RemoveNewLines($sRes);
=======
$this->debug($sRes);
>>>>>>> speedup_jenkins
$this->assertEquals($sHtmlToTest, $sRes);
}