unit tests for specific image type output added

2 files changed, 28 insertions, 3 deletions

diff --git a/lib/private/image.php b/lib/private/image.php
index dd041442ed6..c987ce92c3c 100644
--- a/lib/private/image.php
+++ b/lib/private/image.php
@@ -239,7 +239,12 @@ class OC_Image {
 				$retVal = imagepng($this->resource, $filePath);
 				break;
 			case IMAGETYPE_XBM:
-				$retVal = imagexbm($this->resource, $filePath);
+				if (function_exists('imagexbm')) {
+					$retVal = imagexbm($this->resource, $filePath);
+				} else {
+					throw new Exception('\OC_Image::_output(): imagexbm() is not supported.');
+				}
+
 				break;
 			case IMAGETYPE_WBMP:
 				$retVal = imagewbmp($this->resource, $filePath);
diff --git a/tests/lib/image.php b/tests/lib/image.php
index 4aba1b0bc61..131a9d86f3e 100644
--- a/tests/lib/image.php
+++ b/tests/lib/image.php
@@ -8,8 +8,8 @@
 
 class Test_Image extends PHPUnit_Framework_TestCase {
 	public static function tearDownAfterClass() {
-		unlink(OC::$SERVERROOT.'/tests/data/testimage2.png');
-		unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
+		@unlink(OC::$SERVERROOT.'/tests/data/testimage2.png');
+		@unlink(OC::$SERVERROOT.'/tests/data/testimage2.jpg');
 	}
 
 	public function testGetMimeTypeForFile() {
@@ -236,4 +236,24 @@ class Test_Image extends PHPUnit_Framework_TestCase {
 		$this->assertEquals(200, $img->width());
 		$this->assertEquals(200, $img->height());
 	}
+
+	function convertDataProvider() {
+		return array(
+			array( 'image/gif'),
+			array( 'image/jpeg'),
+			array( 'image/png'),
+		);
+	}
+
+	/**
+	 * @dataProvider convertDataProvider
+	 */
+	public function testConvert($mimeType) {
+		$img = new \OC_Image(OC::$SERVERROOT.'/tests/data/testimage.png');
+		$tempFile = tempnam(sys_get_temp_dir(), 'img-test');
+
+		$img->save($tempFile, $mimeType);
+		$actualMimeType = \OC_Image::getMimeTypeForFile($tempFile);
+		$this->assertEquals($mimeType, $actualMimeType);
+	}
 }