Author: caefer
Date: 2010-03-22 14:02:08 +0100 (Mon, 22 Mar 2010)
New Revision: 28670
Modified:
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
plugins/sfImageTransformExtraPlugin/trunk/test/bootstrap/TestRecord.php
plugins/sfImageTransformExtraPlugin/trunk/test/unit/lib/source/sfImageSourceDoctrineTest.php
Log:
Unit Tests for sfImageSourceDoctrine are green again
Modified:
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
===================================================================
---
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
2010-03-22 12:39:40 UTC (rev 28669)
+++
plugins/sfImageTransformExtraPlugin/trunk/lib/source/sfImageSourceDoctrine.class.php
2010-03-22 13:02:08 UTC (rev 28670)
@@ -164,7 +164,11 @@
throw new sfError404Exception('Could not find "'.$url['host'].'"
#'.$url['fragment'].'!');
}
$attribute = ltrim($url['path'], '/');
- $files =
sfFinder::type('file')->name($obj->$attribute.'*')->in(sfConfig::get('sf_upload_dir'));
+ $attribute = $obj->$attribute;
+ $pos = strrpos($attribute, '/');
+ $path = substr($attribute, 0, $pos);
+ $file = substr($attribute, $pos+1);
+ $files =
sfFinder::type('file')->name($file.'*')->in(sfConfig::get('sf_upload_dir').$path);
return $files[0];
}
}
Modified:
plugins/sfImageTransformExtraPlugin/trunk/test/bootstrap/TestRecord.php
===================================================================
--- plugins/sfImageTransformExtraPlugin/trunk/test/bootstrap/TestRecord.php
2010-03-22 12:39:40 UTC (rev 28669)
+++ plugins/sfImageTransformExtraPlugin/trunk/test/bootstrap/TestRecord.php
2010-03-22 13:02:08 UTC (rev 28670)
@@ -25,9 +25,9 @@
return 'test-me';
}
- public function retrieveFilenameForAttribute($attribute)
+ public function getFile()
{
- return 'daphne.jpg';
+ return '/testrecord/daphne.jpg';
}
}
Modified:
plugins/sfImageTransformExtraPlugin/trunk/test/unit/lib/source/sfImageSourceDoctrineTest.php
===================================================================
---
plugins/sfImageTransformExtraPlugin/trunk/test/unit/lib/source/sfImageSourceDoctrineTest.php
2010-03-22 12:39:40 UTC (rev 28669)
+++
plugins/sfImageTransformExtraPlugin/trunk/test/unit/lib/source/sfImageSourceDoctrineTest.php
2010-03-22 13:02:08 UTC (rev 28670)
@@ -27,9 +27,16 @@
*/
class sfImageSourceDoctrineTest extends PHPUnit_Framework_TestCase
{
+ private $testSourceUri = null;
+ private $testParameters = array(
+ 'type' => 'TestRecord',
+ 'attribute' => 'file',
+ 'id' => '1'
+ );
+
public function testStream_close()
{
- $fh = fopen('sfImageSource://TestRecord/file#1', 'r');
+ $fh = fopen($this->testSourceUri, 'r');
$this->assertTrue(is_resource($fh));
fclose($fh);
$this->assertFalse(is_resource($fh));
@@ -37,7 +44,7 @@
public function testStream_eof()
{
- $fh = fopen('sfImageSource://TestRecord/file#1', 'r');
+ $fh = fopen($this->testSourceUri, 'r');
$this->assertFalse(feof($fh));
while(!feof($fh))
{
@@ -49,37 +56,42 @@
public function testStream_flush()
{
- $fh = fopen('sfImageSource://TestRecord/file#1', 'r');
+ $fh = fopen($this->testSourceUri, 'r');
$this->assertTrue(fflush($fh));
fclose($fh);
}
public function testStream_open()
{
- $fh = fopen('sfImageSource://TestRecord/file#1', 'r');
+ $fh = fopen($this->testSourceUri, 'r');
$this->assertTrue(is_resource($fh));
fclose($fh);
}
public function testStream_read()
{
- $fh = fopen('sfImageSource://TestRecord/file#1', 'r');
+ $fh = fopen($this->testSourceUri, 'r');
$this->assertEquals(10, strlen(fread($fh, 10)));
fclose($fh);
}
public function testStream_stat()
{
- $fh = fopen('sfImageSource://TestRecord/file#1', 'r');
+ $fh = fopen($this->testSourceUri, 'r');
$this->assertTrue(is_array(fstat($fh)));
fclose($fh);
}
public function testUrl_stat()
{
- $this->assertTrue(is_array(stat('sfImageSource://TestRecord/file#1')));
+ $this->assertTrue(is_array(stat($this->testSourceUri)));
}
+ public function testBuildURIfromParameters()
+ {
+ $this->assertEquals('sfImageSource://TestRecord/file#1',
sfImageSourceDoctrine::buildURIfromParameters($this->testParameters));
+ }
+
protected function setUp()
{
$this->dbh = new Doctrine_Adapter_Mock('mysql');
@@ -90,5 +102,7 @@
stream_wrapper_unregister('sfImageSource');
}
stream_wrapper_register('sfImageSource', 'sfImageSourceDoctrine') or
die('Failed to register protocol..');
+
+ $this->testSourceUri =
sfImageSourceDoctrine::buildURIfromParameters($this->testParameters);
}
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
