tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-09-30 05:09:06 +02:00
Code Issues Projects Releases Wiki Activity

Updating code to allow unit test to use try-catch block to catch warning

Browse Source 
without stopping code execution inside try
This commit is contained in:
Igor Nadj 2014-11-26 15:27:54 +13:00
parent f823831a63
commit 657606e8c8
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
tests/view/SSViewerTest.php
View File

@ -125,14 +125,16 @@ class SSViewerTest extends SapphireTest {
// exception thrown... good
}
// secondly, make sure that requirements combine can handle this and continue safely
// secondly, make sure that requirements combine throws the correct warning, and only that warning
@unlink($combinedTestFilePath);
try{
/*
* Use @ (ignore warning) because a warning would cause php unit to throw an exception and therefore change the execution
* process and mess up the next test.
*/
@Requirements::process_combined_files();
Requirements::process_combined_files();
}catch(PHPUnit_Framework_Error_Warning $e){
if(strstr($e->getMessage(), 'Failed to minify') === false){
$this->fail('Requirements::process_combined_files raised a warning, which is good, but this is not the expected warning ("Failed to minify..."): '.$e);
Requirements::set_backend($oldBackend);
return;
}
}catch(Exception $e){
$this->fail('Requirements::process_combined_files did not catch exception caused by minifying bad js file: '.$e);
Requirements::set_backend($oldBackend);
@ -148,7 +150,6 @@ class SSViewerTest extends SapphireTest {
$combinedTestFileContents = file_get_contents($combinedTestFilePath);
$this->assertContains($jsFileContents, $combinedTestFileContents);
// reset
Requirements::set_backend($oldBackend);
}

10
view/Requirements.php
View File

@ -1129,6 +1129,7 @@ class Requirements_Backend {
if(!$refresh) continue;
$failedToMinify = false;
$combinedData = "";
foreach(array_diff($fileList, $this->blocked) as $file) {
$fileContent = file_get_contents($base . $file);
@ -1136,8 +1137,7 @@ class Requirements_Backend {
try{
$fileContent = $this->minifyFile($file, $fileContent);
}catch(Exception $e){
// failed to minify, use unminified
user_error('Failed to minify '.$file.', exception: '.$e->getMessage(), E_USER_WARNING);
$failedToMinify = true;
}
if ($this->write_header_comment) {
@ -1157,6 +1157,12 @@ class Requirements_Backend {
unset($fh);
}
if($failedToMinify){
// Failed to minify, use unminified. This warning is raised at the end to allow code execution
// to complete in case this warning is caught inside a try-catch block.
user_error('Failed to minify '.$file.', exception: '.$e->getMessage(), E_USER_WARNING);
}
// Unsuccessful write - just include the regular JS files, rather than the combined one
if(!$successfulWrite) {
user_error("Requirements_Backend::process_combined_files(): Couldn't create '$combinedFilePath'",