Merge pull request #89 from aik099/risky-test-fix

Solve the risky test warnings in PHPUnit

Author: aik099

tests/Hamcrest/AbstractMatcherTest.php

@@ -12,6 +12,14 @@ abstract class AbstractMatcherTest extends TestCase
     const ARGUMENT_IGNORED = "ignored";
     const ANY_NON_NULL_ARGUMENT = "notnull";
 
+    /**
+     * @before
+     */
+    protected function setUpTest()
+    {
+        MatcherAssert::resetCount();
+    }
+
     abstract protected function createMatcher();
 
     public function assertMatches(\Hamcrest\Matcher $matcher, $arg, $message)
@@ -46,6 +54,9 @@ public function assertMismatchDescription($expected, \Hamcrest\Matcher $matcher,
         );
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testIsNullSafe()
     {
         //Should not generate any notices
@@ -56,6 +67,9 @@ public function testIsNullSafe()
         );
     }
 
+    /**
+     * @doesNotPerformAssertions
+     */
     public function testCopesWithUnknownTypes()
     {
         //Should not generate any notices
@@ -65,4 +79,12 @@ public function testCopesWithUnknownTypes()
             new NullDescription()
         );
     }
+
+    /**
+     * @after
+     */
+    protected function tearDownTest()
+    {
+        $this->addToAssertionCount(MatcherAssert::getCount());
+    }
 }

tests/Hamcrest/Core/CombinableMatcherTest.php

@@ -12,6 +12,8 @@ class CombinableMatcherTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_either_3_or_4 = \Hamcrest\Core\CombinableMatcher::either(equalTo(3))->orElse(equalTo(4));
         $this->_not_3_and_not_4 = \Hamcrest\Core\CombinableMatcher::both(not(equalTo(3)))->andAlso(not(equalTo(4)));
     }

tests/Hamcrest/Core/IsInstanceOfTest.php

@@ -12,6 +12,8 @@ class IsInstanceOfTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_baseClassInstance = new \Hamcrest\Core\SampleBaseClass('good');
         $this->_subClassInstance = new \Hamcrest\Core\SampleSubClass('good');
     }

tests/Hamcrest/Core/SetTest.php

@@ -12,6 +12,8 @@ class SetTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         self::$_classProperty = null;
         unset($this->_instanceProperty);
     }

tests/Hamcrest/FeatureMatcherTest.php

@@ -39,6 +39,8 @@ class FeatureMatcherTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_resultMatcher = $this->_resultMatcher();
     }
 

tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php

@@ -11,6 +11,8 @@ class IsEqualIgnoringWhiteSpaceTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_matcher = \Hamcrest\Text\IsEqualIgnoringWhiteSpace::equalToIgnoringWhiteSpace(
             "Hello World   how\n are we? "
         );

tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php

@@ -13,6 +13,8 @@ class StringContainsIgnoringCaseTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_stringContains = \Hamcrest\Text\StringContainsIgnoringCase::containsStringIgnoringCase(
             strtolower(self::EXCERPT)
         );

tests/Hamcrest/Text/StringContainsInOrderTest.php

@@ -11,6 +11,8 @@ class StringContainsInOrderTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_m = \Hamcrest\Text\StringContainsInOrder::stringContainsInOrder(array('a', 'b', 'c'));
     }
 

tests/Hamcrest/Text/StringContainsTest.php

@@ -13,6 +13,8 @@ class StringContainsTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_stringContains = \Hamcrest\Text\StringContains::containsString(self::EXCERPT);
     }
 

tests/Hamcrest/Text/StringEndsWithTest.php

@@ -13,6 +13,8 @@ class StringEndsWithTest extends \Hamcrest\AbstractMatcherTest
      */
     protected function setUpTest()
     {
+        parent::setUpTest();
+
         $this->_stringEndsWith = \Hamcrest\Text\StringEndsWith::endsWith(self::EXCERPT);
     }