From 0fa136e3694202d73bdaef7a2e7fdc27fe3f83a4 Mon Sep 17 00:00:00 2001
From: beberlei <beberlei@625475ce-881a-0410-a577-b389adb331d8>
Date: Sat, 6 Feb 2010 21:26:56 +0000
Subject: [PATCH] [2.0] Fixed two annoyances in
 OrmFunctionalTestCase::onNotSuccesfulTest overwrite.

---
 tests/Doctrine/Tests/OrmFunctionalTestCase.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Doctrine/Tests/OrmFunctionalTestCase.php b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
index 65a8036ae..9760f8bd6 100644
--- a/tests/Doctrine/Tests/OrmFunctionalTestCase.php
+++ b/tests/Doctrine/Tests/OrmFunctionalTestCase.php
@@ -214,13 +214,13 @@ abstract class OrmFunctionalTestCase extends OrmTestCase
 
     protected function onNotSuccessfulTest(\Exception $e)
     {
-        if ($e instanceof \PHPUnit_Framework_ExpectationFailedException) {
+        if ($e instanceof \PHPUnit_Framework_AssertionFailedError) {
             throw $e;
         }
 
         if(isset($this->_sqlLoggerStack->queries) && count($this->_sqlLoggerStack->queries)) {
             $queries = "";
-            for($i = 0; $i < count($this->_sqlLoggerStack->queries); $i++) {
+            for($i = count($this->_sqlLoggerStack->queries)-1; $i > max(count($this->_sqlLoggerStack->queries)-25, 0); $i--) {
                 $query = $this->_sqlLoggerStack->queries[$i];
                 $params = array_map(function($p) { return "'".$p."'"; }, $query['params'] ?: array());
                 $queries .= ($i+1).". SQL: '".$query['sql']."' Params: ".implode(", ", $params).PHP_EOL;