Changeset 2980

Timestamp:

12/08/06 21:02:11 (2 years ago)

Author:

fabien

Message:

added a new throwsException() method to the test browser

Files:

• trunk/lib/controller/sfFrontWebController.class.php (modified) (1 diff)
• trunk/lib/test/sfTestBrowser.class.php (modified) (1 diff)
• trunk/lib/util/sfBrowser.class.php (modified) (3 diffs)
• trunk/test/functional/backend/browseTest.php (modified) (1 diff)
• trunk/test/functional/crudTest.php (modified) (1 diff)
• trunk/test/functional/fixtures/project/apps/frontend/modules/exception (added)
• trunk/test/functional/fixtures/project/apps/frontend/modules/exception/actions (added)
• trunk/test/functional/fixtures/project/apps/frontend/modules/exception/actions/actions.class.php (added)
• trunk/test/functional/sfTestBrowserTest.php (added)

trunk/lib/controller/sfFrontWebController.class.php

@@ -50 +50 @@
-    catch (sfException $e)
-    {
+      if (sfConfig::get('sf_test'))
+      {
+        throw $e;
+      }
+
-      $e->printStackTrace();
-    }
-    catch (Exception $e)
-    {
+      if (sfConfig::get('sf_test'))
+      {
+        throw $e;
+      }
+
-      // wrap non symfony exceptions
-      $sfException = new sfException();

trunk/lib/test/sfTestBrowser.class.php

@@ -179 +179 @@
-  }
-
+  public function throwsException($class = null, $message = null)
+  {
+    $e = $this->getCurrentException();
+
+    if (null === $e)
+    {
+      $this->test->fail('response returns an exception');
+    }
+    else
+    {
+      if (null !== $class)
+      {
+        $this->test->ok($e instanceof $class, sprintf('response returns an exception of class "%s"', $class));
+      }
+
+      if (null !== $message && preg_match('/^(!)?([^a-zA-Z0-9\\\\]).+?\\2[ims]?$/', $message, $match))
+      {
+        if ($match[1] == '!')
+        {
+          $this->test->unlike($e->getMessage(), substr($message, 1), sprintf('response exception message does not match regex "%s"', $message));
+        }
+        else
+        {
+          $this->test->like($e->getMessage(), $message, sprintf('response exception message matches regex "%s"', $message));
+        }
+      }
+      else if (null !== $message)
+      {
+        $this->test->is($e->getMessage(), $message, sprintf('response exception message matches regex "%s"', $message));
+      }
+    }
+
+    return $this;
+  }
+
-  public function isCached($boolean, $with_layout = false)
-  {

trunk/lib/util/sfBrowser.class.php

@@ -20 +20 @@
-{
-  protected
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-  public function initialize($hostname = null, $remote = null, $options = array())
@@ -129 +130 @@
-    sfConfig::set('sf_rendering_filter', array('sfFakeRenderingFilter', null));
-
+    $this->currentException = null;
+
-    // dispatch our request
-    ob_start();
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    $retval = ob_get_clean();
+
+    if ($this->currentException instanceof sfStopException)
+    {
+      $this->currentException = null;
+    }
-
-    // append retval to the response content
@@ -216 +240 @@
-  {
-    return $this->context->getRequest();
+  }
+
+  public function getCurrentException()
+  {
+    return $this->currentException;
-  }
-

trunk/test/functional/backend/browseTest.php

@@ -25 +25 @@
-  isRequestParameter('module', 'error')->
-  isRequestParameter('action', 'index')->
-
-
+
-;
-

trunk/test/functional/crudTest.php

@@ -24 +24 @@
-  isRequestParameter('module', 'error')->
-  isRequestParameter('action', 'index')->
-
-
+
-;
-