Changeset 2958

Timestamp:

09/29/08 09:46:32 (7 weeks ago)

Author:

felix

Message:

- implemented some more assertions
- adds some comments and better messages

Files:

• branches/felix-testing-implementation/src/testing/AgaviViewTestCase.class.php (modified) (6 diffs)

branches/felix-testing-implementation/src/testing/AgaviViewTestCase.class.php

@@ -36 +36 @@
   protected $viewName;
   
-  
+  /**
+   * @var        mixed the result of the view execution
+   */
   protected $viewResult;
   
+  /**
+   *  creates the view instance for this testcase
+   * 
+   * @return     AgaviView
+   * 
+   * @author     Felix Gilcher <felix.gilcher@bitextender.com>
+   * @since      1.0.0
+   */
   protected function createViewInstance()
   {
@@ -48 +58 @@
   }
   
+  /**
+   *  runs the view instance for this testcase
+   * 
+   * @param      string the name of the output type to run the view for
+   *                    null for the default output type
+   * 
+   * @author     Felix Gilcher <felix.gilcher@bitextender.com>
+   * @since      1.0.0
+   */
   protected function runView($otName = null)
   {
@@ -92 +111 @@
   }
   
-  protected function assertResponseHasRedirect($expected, $message = '')
-  {
-    
-  }
-  
-  protected function assertResponseHasHeader($expected, $expectedValue = null, $message = '')
-  {
-    
-  }
-  
-  protected function assertResponseHasHTTPStatus($expected, $message = 'Failed asserting that the respons status is %1$s')
+  protected function assertResponseHasRedirect($message = 'Failed asserting that the view redirects')
+  {
+    $response = $this->container->getResponse();
+    try {
+      $this->assertTrue($response->hasRedirect(), $message);
+    } catch (AgaviException $e) {
+      $this->fail($message);
+    }
+  }
+  
+  protected function assertResponseHasNoRedirect($message = 'Failed asserting that the view does not redirect')
+  {
+    $response = $this->container->getResponse();
+    try {
+      $this->assertFalse($response->hasRedirect(), $message);
+    } catch (AgaviException $e) {
+      $this->fail($message);
+    }
+  }
+  
+  protected function assertResponseRedirectsTo($expected, $message = 'Failed asserting that the view redirects to the given target.')
+  {
+    $response = $this->container->getResponse();
+    try {
+      $this->assertEquals($expected, $response->getRedirect(), $message);
+    } catch (AgaviException $e) {
+      $this->fail($message);
+    }
+  }
+  
+  protected function assertResponseHasContentType($expected, $message = 'Failed asserting that the response content type is %1$s.')
   {
     $response = $this->container->getResponse();
@@ -109 +148 @@
       $this->fail(sprintf($message . ' (response is not an AgaviWebResponse)', $expected));
     }
+    $this->assertEquals($expected, $response->getContentType(), sprintf($message, $expected));
+  }
+  
+  protected function assertResponseHasHeader($expected, $expectedValue = null, $message = 'Failed asserting that the response has a header named <%1$s> with the value <%2$s>')
+  {
+    $response = $this->container->getResponse();
+    
+    if(!($response instanceof AgaviWebResponse)) {
+      $this->fail(sprintf($message . ' (response is not an AgaviWebResponse)', $expected));
+    }
+    $this->assertEquals($expected, $response->getHeader($expected), sprintf($message, $expected, $expectedValue));
+  }
+  
+  protected function assertResponseHasHTTPStatus($expected, $message = 'Failed asserting that the respons status is %1$s.')
+  {
+    $response = $this->container->getResponse();
+    
+    if(!($response instanceof AgaviWebResponse)) {
+      $this->fail(sprintf($message . ' (response is not an AgaviWebResponse)', $expected));
+    }
     $this->assertEquals($expected, $response->getHttpStatusCode(), sprintf($message, $expected));
   }
   
-  protected function assertResponseHasContent($expected, $message = 'Failed asserting that the response has content <%1$s>')
+  protected function assertResponseHasContent($expected, $message = 'Failed asserting that the response has content <%1$s>.')
   {
     $response = $this->container->getResponse();
     $this->assertEquals($expected, $response->getContent(), sprintf($message, $expected));
+  }
+  
+  protected function assertViewResultEquals($expected, $message = 'Failed asserting the expected view result.')
+  {
+    $this->assertEquals($expected, $this->viewResult, sprintf($message, $expected));
   }
   
@@ -122 +186 @@
     if (!($this->viewResult instanceof AgaviExecutionContainer))
     {
-      $this->fail('Failed asserting that the view result is a forward');
+      $this->fail('Failed asserting that the view result is a forward.');
     }
   }
@@ -133 +197 @@
     if (null == $layer)
     {
-      $this->fail('Failed asserting that the view contains the layer');
+      $this->fail('Failed asserting that the view contains the layer.');
     }
   }