1 files changed, 8 insertions, 19 deletions
diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php
index dc96e531e4..2f3c26eb53 100644
--- a/tests/app/Census/CensusColumnBirthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthYearTest.php
@@ -20,7 +20,6 @@ namespace Fisharebest\Webtrees\Census;
 use Fisharebest\Webtrees\Date;
 use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
-use Mockery;
 
 /**
  * Test harness for the class CensusColumnAge
@@ -28,16 +27,6 @@ use Mockery;
 class CensusColumnBirthYearTest extends \Fisharebest\Webtrees\TestCase
 {
     /**
-     * Delete mock objects
-     *
-     * @return void
-     */
-    public function tearDown()
-    {
-        Mockery::close();
-    }
-
-    /**
      * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthYear
      * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      *
@@ -45,17 +34,17 @@ class CensusColumnBirthYearTest extends \Fisharebest\Webtrees\TestCase
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = Mockery::mock(GregorianDate::class);
-        $cal_date->shouldReceive('format')->andReturn('1800');
+        $cal_date = $this->createMock(GregorianDate::class);
+        $cal_date->method('format')->willReturn('1800');
 
-        $date = Mockery::mock(Date::class);
-        $date->shouldReceive('minimumDate')->andReturn($cal_date);
+        $date = $this->createMock(Date::class);
+        $date->method('minimumDate')->willReturn($cal_date);
 
-        $individual = Mockery::mock(Individual::class);
-        $individual->shouldReceive('getEstimatedBirthDate')->andReturn($date);
+        $individual = $this->createMock(Individual::class);
+        $individual->method('getEstimatedBirthDate')->willReturn($date);
 
-        $census = Mockery::mock(CensusInterface::class);
-        $census->shouldReceive('censusDate')->andReturn('30 JUN 1832');
+        $census = $this->createMock(CensusInterface::class);
+        $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthYear($census, '', '');