Testing code cleanup

Author: Mitch

test/Test.php

@@ -16,12 +16,10 @@ class ImageResizeTest extends PHPUnit_Framework_TestCase
     private $unsupported_image = 'Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAA/38AAAAA';
     private $image_string = 'R0lGODlhAQABAIAAAAQCBP///yH5BAEAAAEALAAAAAABAAEAAAICRAEAOw==';
 
-    public function testLoadString() {
-        $resize = ImageResize::createFromString(base64_decode($this->image_string));
 
-        $this->assertEquals(IMAGETYPE_GIF, $resize->source_type);
-        $this->assertInstanceOf('\Eventviva\ImageResize', $resize);
-    }
+    /**
+     * Loading tests
+     */
 
     public function testLoadGif() {
         $image = $this->createImage(1, 1, 'gif');
@@ -47,13 +45,17 @@ public function testLoadPng() {
         $this->assertInstanceOf('\Eventviva\ImageResize', $resize);
     }
 
+    public function testLoadString() {
+        $resize = ImageResize::createFromString(base64_decode($this->image_string));
+
+        $this->assertEquals(IMAGETYPE_GIF, $resize->source_type);
+        $this->assertInstanceOf('\Eventviva\ImageResize', $resize);
+    }
+
+
     /**
-     * @expectedException Exception
-     * @expectedExceptionMessage Unsupported image type
+     * Bad load tests
      */
-    public function testInvalidString() {
-        ImageResize::createFromString(base64_decode($this->unsupported_image));
-    }
 
     /**
      * @expectedException Exception
@@ -93,6 +95,19 @@ public function testLoadUnsupportedImage() {
         new ImageResize($filename);
     }
 
+    /**
+     * @expectedException Exception
+     * @expectedExceptionMessage Unsupported image type
+     */
+    public function testInvalidString() {
+        ImageResize::createFromString(base64_decode($this->unsupported_image));
+    }
+
+
+    /**
+     * Resize tests
+     */
+
     public function testResizeToHeight() {
         $image = $this->createImage(200, 100, 'png');
         $resize = new ImageResize($image);
@@ -143,6 +158,11 @@ public function testResizeLargerNotAllowed() {
         $this->assertEquals(100, $resize->getDestHeight());
     }
 
+
+    /**
+     * Crop tests
+     */
+
     public function testCrop() {
         $image = $this->createImage(200, 100, 'png');
         $resize = new ImageResize($image);
@@ -176,6 +196,11 @@ public function testCropLargerNotAllowed() {
         $this->assertEquals(100, $resize->getDestHeight());
     }
 
+
+    /**
+     * Save tests
+     */
+
     public function testSaveGif() {
         $image = $this->createImage(200, 100, 'gif');
 
@@ -224,6 +249,11 @@ public function testSaveChmod() {
         $this->assertEquals(600, substr(decoct(fileperms($filename)), 3));
     }
 
+
+    /**
+     * String test
+     */
+
     public function testGetImageAsString() {
         $resize = ImageResize::createFromString(base64_decode($this->image_string));
         $image = $resize->getImageAsString();
@@ -236,6 +266,11 @@ public function testToString() {
         $this->assertEquals(43, strlen($image));
     }
 
+
+    /**
+     * Output tests
+     */
+
     public function testOutputGif() {
         $image = $this->createImage(200, 100, 'gif');
 
@@ -293,6 +328,11 @@ public function testOutputPng() {
         $this->assertEquals('image/png', $type);
     }
 
+
+    /**
+     * Helpers
+     */
+
     private function createImage($width, $height, $type) {
         if (!in_array($type, $this->image_types)) {
             throw new \Exception('Unsupported image type');