From 389668bca115e0fed4353664bd8c93d46a69da9e Mon Sep 17 00:00:00 2001 From: Joel Marcey Date: Mon, 3 Feb 2014 15:13:00 -0800 Subject: [PATCH] PHPUnit 3.8 Compatibility Summary: PHPUnit 3.8+ adds a new method to PHPUnit_Framework_TestListener (addRiskyTest). Stub this out in places that need it so we can use PHPUnit 3.8+ Test Plan: Reviewers: CC: Task ID: # Blame Rev: --- .../Magento/TestFramework/Event/PhpUnit.php | 13 +++++++++++++ .../TestFramework/Listener/GarbageCleanup.php | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/dev/tests/integration/framework/Magento/TestFramework/Event/PhpUnit.php b/dev/tests/integration/framework/Magento/TestFramework/Event/PhpUnit.php index af0799e1f786f..f6f95f8b5dee8 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Event/PhpUnit.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Event/PhpUnit.php @@ -187,4 +187,17 @@ public function endTest(\PHPUnit_Framework_Test $test, $time) } $this->_eventManager->fireEvent('endTest', array($test), true); } + + /** + * Risky test. + * + * @param PHPUnit_Framework_Test $test + * @param Exception $e + * @param float $time + * @since Method available since Release 3.8.0 + */ + public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) + { + // Stub out to support PHPUnit 3.8 + } } diff --git a/dev/tests/unit/framework/Magento/TestFramework/Listener/GarbageCleanup.php b/dev/tests/unit/framework/Magento/TestFramework/Listener/GarbageCleanup.php index 57ca7b524a7d5..1ac0ae68fb6fe 100644 --- a/dev/tests/unit/framework/Magento/TestFramework/Listener/GarbageCleanup.php +++ b/dev/tests/unit/framework/Magento/TestFramework/Listener/GarbageCleanup.php @@ -100,4 +100,17 @@ public function startTest(\PHPUnit_Framework_Test $test) public function endTest(\PHPUnit_Framework_Test $test, $time) { } + + /** + * Risky test. + * + * @param PHPUnit_Framework_Test $test + * @param Exception $e + * @param float $time + * @since Method available since Release 3.8.0 + */ + public function addRiskyTest(\PHPUnit_Framework_Test $test, \Exception $e, $time) + { + // Stub out to support PHPUnit 3.8 + } }