Merge pull request #380 from davedevelopment/mockery-test-case

Mockery test case
mockery · Oct 7, 2014 · a0a8d0e · a0a8d0e
2 parents aab7d1c + 3a60e44
commit a0a8d0e
Show file tree

Hide file tree

Showing 14 changed files with 65 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,8 @@
 ## 0.9.3 (XXXX-XX-XX)
 
 * Added a basic spy implementation
+* Added `Mockery\Adapter\Phpunit\MockeryTestCase` for more reliable PHPUnit
+  integration
 
 ## 0.9.2 (2014-09-03)
 

diff --git a/library/Mockery/Adapter/Phpunit/MockeryTestCase.php b/library/Mockery/Adapter/Phpunit/MockeryTestCase.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace Mockery\Adapter\Phpunit;
+
+use Mockery;
+
+class MockeryTestCase extends \PHPUnit_Framework_TestCase
+{
+    protected function assertPostConditions()
+    {
+        $this->addMockeryExpectationsToAssertionCount();
+        $this->closeMockery();
+
+        parent::assertPostConditions();
+    } 
+
+    protected function addMockeryExpectationsToAssertionCount()
+    {
+        $container = Mockery::getContainer();
+        if ($container != null) {
+            $count = $container->mockery_getExpectationCount();
+            $this->addToAssertionCount($count);
+        }
+    }
+
+    protected function closeMockery()
+    {
+        Mockery::close();
+    }
+}
diff --git a/tests/Mockery/AdhocTest.php b/tests/Mockery/AdhocTest.php
@@ -19,10 +19,12 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
 /**
  * Ad-hoc unit tests for various scenarios reported by users
  */
-class Mockery_AdhocTest extends PHPUnit_Framework_TestCase
+class Mockery_AdhocTest extends MockeryTestCase
 {
 
     public function setup()

diff --git a/tests/Mockery/ContainerTest.php b/tests/Mockery/ContainerTest.php
@@ -20,8 +20,9 @@
  */
 
 use Mockery\Generator\MockConfigurationBuilder;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class ContainerTest extends PHPUnit_Framework_TestCase
+class ContainerTest extends MockeryTestCase
 {
 
     /** @var  Mockery\Container */

diff --git a/tests/Mockery/DemeterChainTest.php b/tests/Mockery/DemeterChainTest.php
@@ -19,8 +19,9 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class DemeterChainTest extends \PHPUnit_Framework_TestCase
+class DemeterChainTest extends MockeryTestCase
 {
     /** @var  Mockery\Mock $this->mock */
     private $mock;

diff --git a/tests/Mockery/ExpectationTest.php b/tests/Mockery/ExpectationTest.php
@@ -19,7 +19,9 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
-class ExpectationTest extends PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class ExpectationTest extends MockeryTestCase
 {
 
     public function setup()

diff --git a/tests/Mockery/HamcrestExpectationTest.php b/tests/Mockery/HamcrestExpectationTest.php
@@ -19,7 +19,9 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
-class HamcrestExpectationTest extends PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class HamcrestExpectationTest extends MockeryTestCase
 {
 
     public function setUp()

diff --git a/tests/Mockery/MockClassWithFinalWakeupTest.php b/tests/Mockery/MockClassWithFinalWakeupTest.php
@@ -21,9 +21,9 @@
 
 namespace test\Mockery;
 
-use \PHPUnit_Framework_TestCase as TestCase;
+use Mockery\Adapter\Phpunit\MockeryTestCase;
 
-class MockClassWithFinalWakeupTest extends TestCase
+class MockClassWithFinalWakeupTest extends MockeryTestCase
 {
 
     protected function setUp()

diff --git a/tests/Mockery/MockClassWithUnknownTypeHintTest.php b/tests/Mockery/MockClassWithUnknownTypeHintTest.php
@@ -16,7 +16,9 @@
 
 namespace test\Mockery;
 
-class MockClassWithUnknownTypeHintTest extends \PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class MockClassWithUnknownTypeHintTest extends MockeryTestCase
 {
     protected function setUp()
     {

diff --git a/tests/Mockery/MockTest.php b/tests/Mockery/MockTest.php
@@ -19,9 +19,9 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
-/**
- */
-class Mockery_MockTest extends PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class Mockery_MockTest extends MockeryTestCase
 {
 
     public function setup()

diff --git a/tests/Mockery/MockeryCanMockMultipleInterfacesWhichOverlapTest.php b/tests/Mockery/MockeryCanMockMultipleInterfacesWhichOverlapTest.php
@@ -22,7 +22,9 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
-class GeneratorTest extends \PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class GeneratorTest extends MockeryTestCase
 {
     /** @test */
     public function shouldNotDuplicateDoublyInheritedMethods()

diff --git a/tests/Mockery/MockingProtectedMethodsTest.php b/tests/Mockery/MockingProtectedMethodsTest.php
@@ -21,7 +21,9 @@
 
 namespace test\Mockery;
 
-class MockingProtectedMethodsTest extends \PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class MockingProtectedMethodsTest extends MockeryTestCase
 {
 
     public function setup()

diff --git a/tests/Mockery/NamedMockTest.php b/tests/Mockery/NamedMockTest.php
@@ -19,7 +19,9 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
-class NamedMockTest extends PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class NamedMockTest extends MockeryTestCase
 {
     /** @test */
     public function itCreatesANamedMock()

diff --git a/tests/Mockery/RecorderTest.php b/tests/Mockery/RecorderTest.php
@@ -19,7 +19,9 @@
  * @license    http://github.com/padraic/mockery/blob/master/LICENSE New BSD License
  */
 
-class RecorderTest extends PHPUnit_Framework_TestCase
+use Mockery\Adapter\Phpunit\MockeryTestCase;
+
+class RecorderTest extends MockeryTestCase
 {
 
     public function setup()