tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

test all generate methods and formatted image deletetions

Browse Source
This commit is contained in:
Devlin 2014-07-17 11:54:23 +02:00
parent 8bd867ef4e
commit 4178f7beb0
2 changed files with 63 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
model/Image.php
View File

@ -582,7 +582,7 @@ class Image extends File {
} }
// All generate functions may appear any number of times in the image cache name. // All generate functions may appear any number of times in the image cache name.
$generateFuncs = implode('|', $generateFuncs); $generateFuncs = implode('|', $generateFuncs);
$pattern = "/^(({$generateFuncs})\d+\-)+" . preg_quote($this->Name) . "$/i"; $pattern = "/^(({$generateFuncs}).*\-)+" . preg_quote($this->Name) . "$/i";
foreach($cachedFiles as $cfile) { foreach($cachedFiles as $cfile) {
if(preg_match($pattern, $cfile)) { if(preg_match($pattern, $cfile)) {

62
tests/model/ImageTest.php
View File

@ -268,4 +268,66 @@ class ImageTest extends SapphireTest {
$secondImagePath = $secondImage->getRelativePath(); $secondImagePath = $secondImage->getRelativePath();
$this->assertEquals($secondImagePath, $secondImage->Filename); $this->assertEquals($secondImagePath, $secondImage->Filename);
} }
/**
* Test all generate methods
*/
public function testGenerateMethods() {
$image = $this->objFromFixture('Image', 'imageWithoutTitle');
$generateMethods = $this->getGenerateMethods();
// test each generate method
foreach ($generateMethods as $method) {
$generatedImage = $image->$method(333, 333, 'FFFFFF');
$this->assertFileExists(
$generatedImage->getFullPath(),
'Formatted ' . $method . ' image exists'
);
}
}
/**
* Test deleteFormattedImages() against all generate methods
*/
public function testDeleteFormattedImages() {
$image = $this->objFromFixture('Image', 'imageWithoutTitle');
$generateMethods = $this->getGenerateMethods();
// get paths for each generate method
$paths = array();
foreach ($generateMethods as $method) {
$generatedImage = $image->$method(333, 333, 'FFFFFF');
$paths[$method] = $generatedImage->getFullPath();
}
// delete formatted images
$image->deleteFormattedImages();
// test that all formatted images are deleted
foreach ($paths as $method => $path) {
$this->assertFalse(
file_exists($path),
'Formatted ' . $method . ' image does not exist'
);
}
}
/**
* @param bool $custom include methods added dynamically at runtime
* @return array
*/
protected function getGenerateMethods($custom = true) {
$generateMethods = array();
$methodNames = Image::create()->allMethodNames($custom);
foreach ($methodNames as $methodName) {
if (substr($methodName, 0, 8) == 'generate' && $methodName != 'generateformattedimage') {
$format = substr($methodName, 8);
$generateMethods[] = $format;
}
}
return $generateMethods;
}
} }