Changeset 8454

Timestamp:

04/14/08 19:57:31 (1 year ago)

Author:

fabien

Message:

added an error message when a request throws an unexpected exception

Files:

• branches/1.1/lib/test/sfTestBrowser.class.php (modified) (1 diff)
• branches/1.1/lib/util/sfBrowser.class.php (modified) (4 diffs)

branches/1.1/lib/test/sfTestBrowser.class.php

@@ -348 +348 @@
-      }
-    }
+
+    $this->resetCurrentException();
-
-    return $this;

branches/1.1/lib/util/sfBrowser.class.php

@@ -161 +161 @@
-  public function call($uri, $method = 'get', $parameters = array(), $changeStack = true)
-  {
+    // check that the previous call() hasn't returned an uncatched exception
+    $this->checkCurrentExceptionIsEmpty();
+
-    $uri = $this->fixUri($uri);
-
@@ -428 +431 @@
-
-  /**
-
+.
-   *
-   * @return sfException
@@ -435 +438 @@
-  {
-    return $this->currentException;
+  }
+
+  /**
+   * Resets the current exception.
+   */
+  public function resetCurrentException()
+  {
+    $this->currentException = null;
+  }
+
+  public function checkCurrentExceptionIsEmpty()
+  {
+    if (is_null($this->getCurrentException()))
+    {
+      return;
+    }
+
+    $this->test->fail(sprintf('last request threw an uncatched exception "%s: %s"', get_class($this->getCurrentException()), $this->getCurrentException()->getMessage()));
-  }
-
@@ -684 +705 @@
-  public function shutdown()
-  {
+    $this->checkCurrentExceptionIsEmpty();
+
-    // we remove all session data
-    sfToolkit::clearDirectory(sfConfig::get('sf_test_cache_dir').'/sessions');