From: =?utf-8?q?David_Pr=C3=A9vot?= <taffit@debian.org>
Date: Fri, 27 Dec 2024 22:50:36 +0100
Subject: Rename AbstractMatcherTest as AbstractMatcherTestCase

Bug-Debian: https://bugs.debian.org/1070553
---
 tests/Hamcrest/AbstractMatcherTest.php             | 68 ----------------------
 tests/Hamcrest/AbstractMatcherTestCase.php         | 68 ++++++++++++++++++++++
 .../Array/IsArrayContainingInAnyOrderTest.php      |  4 +-
 .../Array/IsArrayContainingInOrderTest.php         |  4 +-
 tests/Hamcrest/Array/IsArrayContainingKeyTest.php  |  4 +-
 .../Array/IsArrayContainingKeyValuePairTest.php    |  4 +-
 tests/Hamcrest/Array/IsArrayContainingTest.php     |  4 +-
 tests/Hamcrest/Array/IsArrayTest.php               |  4 +-
 tests/Hamcrest/Array/IsArrayWithSizeTest.php       |  4 +-
 .../Hamcrest/Collection/IsEmptyTraversableTest.php |  4 +-
 .../Collection/IsTraversableWithSizeTest.php       |  2 +-
 tests/Hamcrest/Core/AllOfTest.php                  |  2 +-
 tests/Hamcrest/Core/AnyOfTest.php                  |  2 +-
 tests/Hamcrest/Core/CombinableMatcherTest.php      |  2 +-
 tests/Hamcrest/Core/DescribedAsTest.php            |  2 +-
 tests/Hamcrest/Core/EveryTest.php                  |  2 +-
 tests/Hamcrest/Core/HasToStringTest.php            |  2 +-
 tests/Hamcrest/Core/IsAnythingTest.php             |  2 +-
 tests/Hamcrest/Core/IsCollectionContainingTest.php |  2 +-
 tests/Hamcrest/Core/IsEqualTest.php                |  2 +-
 tests/Hamcrest/Core/IsIdenticalTest.php            |  2 +-
 tests/Hamcrest/Core/IsInstanceOfTest.php           |  2 +-
 tests/Hamcrest/Core/IsNotTest.php                  |  2 +-
 tests/Hamcrest/Core/IsNullTest.php                 |  2 +-
 tests/Hamcrest/Core/IsSameTest.php                 |  2 +-
 tests/Hamcrest/Core/IsTest.php                     |  2 +-
 tests/Hamcrest/Core/IsTypeOfTest.php               |  2 +-
 tests/Hamcrest/Core/SetTest.php                    |  2 +-
 tests/Hamcrest/FeatureMatcherTest.php              |  2 +-
 tests/Hamcrest/Number/IsCloseToTest.php            |  2 +-
 tests/Hamcrest/Number/OrderingComparisonTest.php   |  2 +-
 tests/Hamcrest/Text/IsEmptyStringTest.php          |  2 +-
 tests/Hamcrest/Text/IsEqualIgnoringCaseTest.php    |  2 +-
 .../Text/IsEqualIgnoringWhiteSpaceTest.php         |  2 +-
 tests/Hamcrest/Text/MatchesPatternTest.php         |  2 +-
 .../Text/StringContainsIgnoringCaseTest.php        |  2 +-
 tests/Hamcrest/Text/StringContainsInOrderTest.php  |  2 +-
 tests/Hamcrest/Text/StringContainsTest.php         |  2 +-
 tests/Hamcrest/Text/StringEndsWithTest.php         |  2 +-
 tests/Hamcrest/Text/StringStartsWithTest.php       |  2 +-
 tests/Hamcrest/Type/IsArrayTest.php                |  2 +-
 tests/Hamcrest/Type/IsBooleanTest.php              |  2 +-
 tests/Hamcrest/Type/IsCallableTest.php             |  2 +-
 tests/Hamcrest/Type/IsDoubleTest.php               |  2 +-
 tests/Hamcrest/Type/IsIntegerTest.php              |  2 +-
 tests/Hamcrest/Type/IsNumericTest.php              |  2 +-
 tests/Hamcrest/Type/IsObjectTest.php               |  2 +-
 tests/Hamcrest/Type/IsResourceTest.php             |  2 +-
 tests/Hamcrest/Type/IsScalarTest.php               |  2 +-
 tests/Hamcrest/Type/IsStringTest.php               |  2 +-
 tests/Hamcrest/Xml/HasXPathTest.php                |  2 +-
 51 files changed, 125 insertions(+), 125 deletions(-)
 delete mode 100644 tests/Hamcrest/AbstractMatcherTest.php
 create mode 100644 tests/Hamcrest/AbstractMatcherTestCase.php

diff --git a/tests/Hamcrest/AbstractMatcherTest.php b/tests/Hamcrest/AbstractMatcherTest.php
deleted file mode 100644
index 8a1fb2a..0000000
--- a/tests/Hamcrest/AbstractMatcherTest.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-namespace Hamcrest;
-
-use PHPUnit\Framework\TestCase;
-
-class UnknownType {
-}
-
-abstract class AbstractMatcherTest extends TestCase
-{
-
-    const ARGUMENT_IGNORED = "ignored";
-    const ANY_NON_NULL_ARGUMENT = "notnull";
-
-    abstract protected function createMatcher();
-
-    public function assertMatches(\Hamcrest\Matcher $matcher, $arg, $message)
-    {
-        $this->assertTrue($matcher->matches($arg), $message);
-    }
-
-    public function assertDoesNotMatch(\Hamcrest\Matcher $matcher, $arg, $message)
-    {
-        $this->assertFalse($matcher->matches($arg), $message);
-    }
-
-    public function assertDescription($expected, \Hamcrest\Matcher $matcher)
-    {
-        $description = new \Hamcrest\StringDescription();
-        $description->appendDescriptionOf($matcher);
-        $this->assertEquals($expected, (string) $description, 'Expected description');
-    }
-
-    public function assertMismatchDescription($expected, \Hamcrest\Matcher $matcher, $arg)
-    {
-        $description = new \Hamcrest\StringDescription();
-        $this->assertFalse(
-            $matcher->matches($arg),
-            'Precondtion: Matcher should not match item'
-        );
-        $matcher->describeMismatch($arg, $description);
-        $this->assertEquals(
-            $expected,
-            (string) $description,
-            'Expected mismatch description'
-        );
-    }
-
-    public function testIsNullSafe()
-    {
-        //Should not generate any notices
-        $this->createMatcher()->matches(null);
-        $this->createMatcher()->describeMismatch(
-            null,
-            new \Hamcrest\NullDescription()
-        );
-    }
-
-    public function testCopesWithUnknownTypes()
-    {
-        //Should not generate any notices
-        $this->createMatcher()->matches(new UnknownType());
-        $this->createMatcher()->describeMismatch(
-            new UnknownType(),
-            new NullDescription()
-        );
-    }
-}
diff --git a/tests/Hamcrest/AbstractMatcherTestCase.php b/tests/Hamcrest/AbstractMatcherTestCase.php
new file mode 100644
index 0000000..17eff5f
--- /dev/null
+++ b/tests/Hamcrest/AbstractMatcherTestCase.php
@@ -0,0 +1,68 @@
+<?php
+namespace Hamcrest;
+
+use PHPUnit\Framework\TestCase;
+
+class UnknownType {
+}
+
+abstract class AbstractMatcherTestCase extends TestCase
+{
+
+    const ARGUMENT_IGNORED = "ignored";
+    const ANY_NON_NULL_ARGUMENT = "notnull";
+
+    abstract protected function createMatcher();
+
+    public function assertMatches(\Hamcrest\Matcher $matcher, $arg, $message)
+    {
+        $this->assertTrue($matcher->matches($arg), $message);
+    }
+
+    public function assertDoesNotMatch(\Hamcrest\Matcher $matcher, $arg, $message)
+    {
+        $this->assertFalse($matcher->matches($arg), $message);
+    }
+
+    public function assertDescription($expected, \Hamcrest\Matcher $matcher)
+    {
+        $description = new \Hamcrest\StringDescription();
+        $description->appendDescriptionOf($matcher);
+        $this->assertEquals($expected, (string) $description, 'Expected description');
+    }
+
+    public function assertMismatchDescription($expected, \Hamcrest\Matcher $matcher, $arg)
+    {
+        $description = new \Hamcrest\StringDescription();
+        $this->assertFalse(
+            $matcher->matches($arg),
+            'Precondtion: Matcher should not match item'
+        );
+        $matcher->describeMismatch($arg, $description);
+        $this->assertEquals(
+            $expected,
+            (string) $description,
+            'Expected mismatch description'
+        );
+    }
+
+    public function testIsNullSafe()
+    {
+        //Should not generate any notices
+        $this->createMatcher()->matches(null);
+        $this->createMatcher()->describeMismatch(
+            null,
+            new \Hamcrest\NullDescription()
+        );
+    }
+
+    public function testCopesWithUnknownTypes()
+    {
+        //Should not generate any notices
+        $this->createMatcher()->matches(new UnknownType());
+        $this->createMatcher()->describeMismatch(
+            new UnknownType(),
+            new NullDescription()
+        );
+    }
+}
diff --git a/tests/Hamcrest/Array/IsArrayContainingInAnyOrderTest.php b/tests/Hamcrest/Array/IsArrayContainingInAnyOrderTest.php
index 45d9f13..61b915b 100644
--- a/tests/Hamcrest/Array/IsArrayContainingInAnyOrderTest.php
+++ b/tests/Hamcrest/Array/IsArrayContainingInAnyOrderTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Arrays;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsArrayContainingInAnyOrderTest extends AbstractMatcherTest
+class IsArrayContainingInAnyOrderTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Array/IsArrayContainingInOrderTest.php b/tests/Hamcrest/Array/IsArrayContainingInOrderTest.php
index a9e4e5b..657132b 100644
--- a/tests/Hamcrest/Array/IsArrayContainingInOrderTest.php
+++ b/tests/Hamcrest/Array/IsArrayContainingInOrderTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Arrays;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsArrayContainingInOrderTest extends AbstractMatcherTest
+class IsArrayContainingInOrderTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Array/IsArrayContainingKeyTest.php b/tests/Hamcrest/Array/IsArrayContainingKeyTest.php
index 31770d8..76b9dfd 100644
--- a/tests/Hamcrest/Array/IsArrayContainingKeyTest.php
+++ b/tests/Hamcrest/Array/IsArrayContainingKeyTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Arrays;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsArrayContainingKeyTest extends AbstractMatcherTest
+class IsArrayContainingKeyTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Array/IsArrayContainingKeyValuePairTest.php b/tests/Hamcrest/Array/IsArrayContainingKeyValuePairTest.php
index a415f9f..c5590f6 100644
--- a/tests/Hamcrest/Array/IsArrayContainingKeyValuePairTest.php
+++ b/tests/Hamcrest/Array/IsArrayContainingKeyValuePairTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Arrays;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsArrayContainingKeyValuePairTest extends AbstractMatcherTest
+class IsArrayContainingKeyValuePairTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Array/IsArrayContainingTest.php b/tests/Hamcrest/Array/IsArrayContainingTest.php
index 8d5bd81..aa52e38 100644
--- a/tests/Hamcrest/Array/IsArrayContainingTest.php
+++ b/tests/Hamcrest/Array/IsArrayContainingTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Arrays;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsArrayContainingTest extends AbstractMatcherTest
+class IsArrayContainingTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Array/IsArrayTest.php b/tests/Hamcrest/Array/IsArrayTest.php
index e4db53e..d1d834c 100644
--- a/tests/Hamcrest/Array/IsArrayTest.php
+++ b/tests/Hamcrest/Array/IsArrayTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Arrays;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsArrayTest extends AbstractMatcherTest
+class IsArrayTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Array/IsArrayWithSizeTest.php b/tests/Hamcrest/Array/IsArrayWithSizeTest.php
index 8413c89..e5385be 100644
--- a/tests/Hamcrest/Array/IsArrayWithSizeTest.php
+++ b/tests/Hamcrest/Array/IsArrayWithSizeTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Arrays;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsArrayWithSizeTest extends AbstractMatcherTest
+class IsArrayWithSizeTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Collection/IsEmptyTraversableTest.php b/tests/Hamcrest/Collection/IsEmptyTraversableTest.php
index 2f15fb4..c288f36 100644
--- a/tests/Hamcrest/Collection/IsEmptyTraversableTest.php
+++ b/tests/Hamcrest/Collection/IsEmptyTraversableTest.php
@@ -1,9 +1,9 @@
 <?php
 namespace Hamcrest\Collection;
 
-use Hamcrest\AbstractMatcherTest;
+use Hamcrest\AbstractMatcherTestCase;
 
-class IsEmptyTraversableTest extends AbstractMatcherTest
+class IsEmptyTraversableTest extends AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Collection/IsTraversableWithSizeTest.php b/tests/Hamcrest/Collection/IsTraversableWithSizeTest.php
index c1c67a7..0eedf8e 100644
--- a/tests/Hamcrest/Collection/IsTraversableWithSizeTest.php
+++ b/tests/Hamcrest/Collection/IsTraversableWithSizeTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Collection;
 
-class IsTraversableWithSizeTest extends \Hamcrest\AbstractMatcherTest
+class IsTraversableWithSizeTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/AllOfTest.php b/tests/Hamcrest/Core/AllOfTest.php
index 86b8c27..7363ba3 100644
--- a/tests/Hamcrest/Core/AllOfTest.php
+++ b/tests/Hamcrest/Core/AllOfTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class AllOfTest extends \Hamcrest\AbstractMatcherTest
+class AllOfTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/AnyOfTest.php b/tests/Hamcrest/Core/AnyOfTest.php
index 3d62b93..121ee6f 100644
--- a/tests/Hamcrest/Core/AnyOfTest.php
+++ b/tests/Hamcrest/Core/AnyOfTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class AnyOfTest extends \Hamcrest\AbstractMatcherTest
+class AnyOfTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/CombinableMatcherTest.php b/tests/Hamcrest/Core/CombinableMatcherTest.php
index ef94186..96622ad 100644
--- a/tests/Hamcrest/Core/CombinableMatcherTest.php
+++ b/tests/Hamcrest/Core/CombinableMatcherTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class CombinableMatcherTest extends \Hamcrest\AbstractMatcherTest
+class CombinableMatcherTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     private $_either_3_or_4;
diff --git a/tests/Hamcrest/Core/DescribedAsTest.php b/tests/Hamcrest/Core/DescribedAsTest.php
index 673ab41..ec20e28 100644
--- a/tests/Hamcrest/Core/DescribedAsTest.php
+++ b/tests/Hamcrest/Core/DescribedAsTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class DescribedAsTest extends \Hamcrest\AbstractMatcherTest
+class DescribedAsTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/EveryTest.php b/tests/Hamcrest/Core/EveryTest.php
index 5eb153c..9e7b2b9 100644
--- a/tests/Hamcrest/Core/EveryTest.php
+++ b/tests/Hamcrest/Core/EveryTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class EveryTest extends \Hamcrest\AbstractMatcherTest
+class EveryTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/HasToStringTest.php b/tests/Hamcrest/Core/HasToStringTest.php
index e2e136d..bb874a4 100644
--- a/tests/Hamcrest/Core/HasToStringTest.php
+++ b/tests/Hamcrest/Core/HasToStringTest.php
@@ -30,7 +30,7 @@ class BothForms
     }
 }
 
-class HasToStringTest extends \Hamcrest\AbstractMatcherTest
+class HasToStringTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsAnythingTest.php b/tests/Hamcrest/Core/IsAnythingTest.php
index f68032e..c2ae3e6 100644
--- a/tests/Hamcrest/Core/IsAnythingTest.php
+++ b/tests/Hamcrest/Core/IsAnythingTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsAnythingTest extends \Hamcrest\AbstractMatcherTest
+class IsAnythingTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsCollectionContainingTest.php b/tests/Hamcrest/Core/IsCollectionContainingTest.php
index a3929b5..6b92212 100644
--- a/tests/Hamcrest/Core/IsCollectionContainingTest.php
+++ b/tests/Hamcrest/Core/IsCollectionContainingTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsCollectionContainingTest extends \Hamcrest\AbstractMatcherTest
+class IsCollectionContainingTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsEqualTest.php b/tests/Hamcrest/Core/IsEqualTest.php
index 73e3ff0..081275c 100644
--- a/tests/Hamcrest/Core/IsEqualTest.php
+++ b/tests/Hamcrest/Core/IsEqualTest.php
@@ -16,7 +16,7 @@ class DummyToStringClass
     }
 }
 
-class IsEqualTest extends \Hamcrest\AbstractMatcherTest
+class IsEqualTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsIdenticalTest.php b/tests/Hamcrest/Core/IsIdenticalTest.php
index 9cc2794..d8373c8 100644
--- a/tests/Hamcrest/Core/IsIdenticalTest.php
+++ b/tests/Hamcrest/Core/IsIdenticalTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsIdenticalTest extends \Hamcrest\AbstractMatcherTest
+class IsIdenticalTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsInstanceOfTest.php b/tests/Hamcrest/Core/IsInstanceOfTest.php
index b4fdd04..ed561c5 100644
--- a/tests/Hamcrest/Core/IsInstanceOfTest.php
+++ b/tests/Hamcrest/Core/IsInstanceOfTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsInstanceOfTest extends \Hamcrest\AbstractMatcherTest
+class IsInstanceOfTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     private $_baseClassInstance;
diff --git a/tests/Hamcrest/Core/IsNotTest.php b/tests/Hamcrest/Core/IsNotTest.php
index 09d4a65..18dde53 100644
--- a/tests/Hamcrest/Core/IsNotTest.php
+++ b/tests/Hamcrest/Core/IsNotTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsNotTest extends \Hamcrest\AbstractMatcherTest
+class IsNotTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsNullTest.php b/tests/Hamcrest/Core/IsNullTest.php
index bfa4255..51513ea 100644
--- a/tests/Hamcrest/Core/IsNullTest.php
+++ b/tests/Hamcrest/Core/IsNullTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsNullTest extends \Hamcrest\AbstractMatcherTest
+class IsNullTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsSameTest.php b/tests/Hamcrest/Core/IsSameTest.php
index 910bb81..2442dcf 100644
--- a/tests/Hamcrest/Core/IsSameTest.php
+++ b/tests/Hamcrest/Core/IsSameTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsSameTest extends \Hamcrest\AbstractMatcherTest
+class IsSameTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsTest.php b/tests/Hamcrest/Core/IsTest.php
index bbd848b..5d82fb4 100644
--- a/tests/Hamcrest/Core/IsTest.php
+++ b/tests/Hamcrest/Core/IsTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsTest extends \Hamcrest\AbstractMatcherTest
+class IsTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/IsTypeOfTest.php b/tests/Hamcrest/Core/IsTypeOfTest.php
index 3f48dea..7642ab9 100644
--- a/tests/Hamcrest/Core/IsTypeOfTest.php
+++ b/tests/Hamcrest/Core/IsTypeOfTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class IsTypeOfTest extends \Hamcrest\AbstractMatcherTest
+class IsTypeOfTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Core/SetTest.php b/tests/Hamcrest/Core/SetTest.php
index f00efa4..bb3c712 100644
--- a/tests/Hamcrest/Core/SetTest.php
+++ b/tests/Hamcrest/Core/SetTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Core;
 
-class SetTest extends \Hamcrest\AbstractMatcherTest
+class SetTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     public static $_classProperty;
diff --git a/tests/Hamcrest/FeatureMatcherTest.php b/tests/Hamcrest/FeatureMatcherTest.php
index dfae872..4e4ad58 100644
--- a/tests/Hamcrest/FeatureMatcherTest.php
+++ b/tests/Hamcrest/FeatureMatcherTest.php
@@ -29,7 +29,7 @@ class ResultMatcher extends \Hamcrest\FeatureMatcher
     }
 }
 
-class FeatureMatcherTest extends \Hamcrest\AbstractMatcherTest
+class FeatureMatcherTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     private $_resultMatcher;
diff --git a/tests/Hamcrest/Number/IsCloseToTest.php b/tests/Hamcrest/Number/IsCloseToTest.php
index 987d552..e3f04af 100644
--- a/tests/Hamcrest/Number/IsCloseToTest.php
+++ b/tests/Hamcrest/Number/IsCloseToTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Number;
 
-class IsCloseToTest extends \Hamcrest\AbstractMatcherTest
+class IsCloseToTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Number/OrderingComparisonTest.php b/tests/Hamcrest/Number/OrderingComparisonTest.php
index a4c94d3..d69b886 100644
--- a/tests/Hamcrest/Number/OrderingComparisonTest.php
+++ b/tests/Hamcrest/Number/OrderingComparisonTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Number;
 
-class OrderingComparisonTest extends \Hamcrest\AbstractMatcherTest
+class OrderingComparisonTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Text/IsEmptyStringTest.php b/tests/Hamcrest/Text/IsEmptyStringTest.php
index 8d5c56b..a39e9ac 100644
--- a/tests/Hamcrest/Text/IsEmptyStringTest.php
+++ b/tests/Hamcrest/Text/IsEmptyStringTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class IsEmptyStringTest extends \Hamcrest\AbstractMatcherTest
+class IsEmptyStringTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Text/IsEqualIgnoringCaseTest.php b/tests/Hamcrest/Text/IsEqualIgnoringCaseTest.php
index 0539fd5..a4a70ad 100644
--- a/tests/Hamcrest/Text/IsEqualIgnoringCaseTest.php
+++ b/tests/Hamcrest/Text/IsEqualIgnoringCaseTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class IsEqualIgnoringCaseTest extends \Hamcrest\AbstractMatcherTest
+class IsEqualIgnoringCaseTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php b/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
index 4244448..4a9ce68 100644
--- a/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
+++ b/tests/Hamcrest/Text/IsEqualIgnoringWhiteSpaceTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class IsEqualIgnoringWhiteSpaceTest extends \Hamcrest\AbstractMatcherTest
+class IsEqualIgnoringWhiteSpaceTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     private $_matcher;
diff --git a/tests/Hamcrest/Text/MatchesPatternTest.php b/tests/Hamcrest/Text/MatchesPatternTest.php
index 4891598..9206f13 100644
--- a/tests/Hamcrest/Text/MatchesPatternTest.php
+++ b/tests/Hamcrest/Text/MatchesPatternTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class MatchesPatternTest extends \Hamcrest\AbstractMatcherTest
+class MatchesPatternTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php b/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
index 8b4463a..1700d5d 100644
--- a/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
+++ b/tests/Hamcrest/Text/StringContainsIgnoringCaseTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class StringContainsIgnoringCaseTest extends \Hamcrest\AbstractMatcherTest
+class StringContainsIgnoringCaseTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     const EXCERPT = 'ExcErPt';
diff --git a/tests/Hamcrest/Text/StringContainsInOrderTest.php b/tests/Hamcrest/Text/StringContainsInOrderTest.php
index adb8658..45b8315 100644
--- a/tests/Hamcrest/Text/StringContainsInOrderTest.php
+++ b/tests/Hamcrest/Text/StringContainsInOrderTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class StringContainsInOrderTest extends \Hamcrest\AbstractMatcherTest
+class StringContainsInOrderTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     private $_m;
diff --git a/tests/Hamcrest/Text/StringContainsTest.php b/tests/Hamcrest/Text/StringContainsTest.php
index 814c1ca..79d776c 100644
--- a/tests/Hamcrest/Text/StringContainsTest.php
+++ b/tests/Hamcrest/Text/StringContainsTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class StringContainsTest extends \Hamcrest\AbstractMatcherTest
+class StringContainsTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     const EXCERPT = 'EXCERPT';
diff --git a/tests/Hamcrest/Text/StringEndsWithTest.php b/tests/Hamcrest/Text/StringEndsWithTest.php
index 46177f4..7d0044f 100644
--- a/tests/Hamcrest/Text/StringEndsWithTest.php
+++ b/tests/Hamcrest/Text/StringEndsWithTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class StringEndsWithTest extends \Hamcrest\AbstractMatcherTest
+class StringEndsWithTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     const EXCERPT = 'EXCERPT';
diff --git a/tests/Hamcrest/Text/StringStartsWithTest.php b/tests/Hamcrest/Text/StringStartsWithTest.php
index f0eb14b..97581bf 100644
--- a/tests/Hamcrest/Text/StringStartsWithTest.php
+++ b/tests/Hamcrest/Text/StringStartsWithTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Text;
 
-class StringStartsWithTest extends \Hamcrest\AbstractMatcherTest
+class StringStartsWithTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     const EXCERPT = 'EXCERPT';
diff --git a/tests/Hamcrest/Type/IsArrayTest.php b/tests/Hamcrest/Type/IsArrayTest.php
index d13c24d..b1d7a93 100644
--- a/tests/Hamcrest/Type/IsArrayTest.php
+++ b/tests/Hamcrest/Type/IsArrayTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsArrayTest extends \Hamcrest\AbstractMatcherTest
+class IsArrayTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsBooleanTest.php b/tests/Hamcrest/Type/IsBooleanTest.php
index 24309fc..008c333 100644
--- a/tests/Hamcrest/Type/IsBooleanTest.php
+++ b/tests/Hamcrest/Type/IsBooleanTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsBooleanTest extends \Hamcrest\AbstractMatcherTest
+class IsBooleanTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsCallableTest.php b/tests/Hamcrest/Type/IsCallableTest.php
index 5098e21..92df401 100644
--- a/tests/Hamcrest/Type/IsCallableTest.php
+++ b/tests/Hamcrest/Type/IsCallableTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsCallableTest extends \Hamcrest\AbstractMatcherTest
+class IsCallableTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     public static function callableFunction()
diff --git a/tests/Hamcrest/Type/IsDoubleTest.php b/tests/Hamcrest/Type/IsDoubleTest.php
index 85c2a96..eb3bce6 100644
--- a/tests/Hamcrest/Type/IsDoubleTest.php
+++ b/tests/Hamcrest/Type/IsDoubleTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsDoubleTest extends \Hamcrest\AbstractMatcherTest
+class IsDoubleTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsIntegerTest.php b/tests/Hamcrest/Type/IsIntegerTest.php
index ce5a51a..33c5212 100644
--- a/tests/Hamcrest/Type/IsIntegerTest.php
+++ b/tests/Hamcrest/Type/IsIntegerTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsIntegerTest extends \Hamcrest\AbstractMatcherTest
+class IsIntegerTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsNumericTest.php b/tests/Hamcrest/Type/IsNumericTest.php
index 1fd83ef..eeb12c4 100644
--- a/tests/Hamcrest/Type/IsNumericTest.php
+++ b/tests/Hamcrest/Type/IsNumericTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsNumericTest extends \Hamcrest\AbstractMatcherTest
+class IsNumericTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsObjectTest.php b/tests/Hamcrest/Type/IsObjectTest.php
index a3b617c..df14e1a 100644
--- a/tests/Hamcrest/Type/IsObjectTest.php
+++ b/tests/Hamcrest/Type/IsObjectTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsObjectTest extends \Hamcrest\AbstractMatcherTest
+class IsObjectTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsResourceTest.php b/tests/Hamcrest/Type/IsResourceTest.php
index d6ea534..a9e3047 100644
--- a/tests/Hamcrest/Type/IsResourceTest.php
+++ b/tests/Hamcrest/Type/IsResourceTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsResourceTest extends \Hamcrest\AbstractMatcherTest
+class IsResourceTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsScalarTest.php b/tests/Hamcrest/Type/IsScalarTest.php
index 72a188d..ba7cfc7 100644
--- a/tests/Hamcrest/Type/IsScalarTest.php
+++ b/tests/Hamcrest/Type/IsScalarTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsScalarTest extends \Hamcrest\AbstractMatcherTest
+class IsScalarTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Type/IsStringTest.php b/tests/Hamcrest/Type/IsStringTest.php
index 557d591..61265dc 100644
--- a/tests/Hamcrest/Type/IsStringTest.php
+++ b/tests/Hamcrest/Type/IsStringTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Type;
 
-class IsStringTest extends \Hamcrest\AbstractMatcherTest
+class IsStringTest extends \Hamcrest\AbstractMatcherTestCase
 {
 
     protected function createMatcher()
diff --git a/tests/Hamcrest/Xml/HasXPathTest.php b/tests/Hamcrest/Xml/HasXPathTest.php
index 3db5e46..eba2081 100644
--- a/tests/Hamcrest/Xml/HasXPathTest.php
+++ b/tests/Hamcrest/Xml/HasXPathTest.php
@@ -1,7 +1,7 @@
 <?php
 namespace Hamcrest\Xml;
 
-class HasXPathTest extends \Hamcrest\AbstractMatcherTest
+class HasXPathTest extends \Hamcrest\AbstractMatcherTestCase
 {
     protected static $xml;
     protected static $doc;