Testing

15 files changed, 93 insertions, 66 deletions

diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php
index f03b7cb07f..c01d1c5b9c 100644
--- a/tests/app/Census/CensusColumnBirthDateTest.php
+++ b/tests/app/Census/CensusColumnBirthDateTest.php
@@ -20,7 +20,6 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 
@@ -37,20 +36,14 @@ class CensusColumnBirthDateTest extends TestCase
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
-        $cal_date->method('format')->willReturn('1 1 1800');
-
-        $date = self::createMock(Date::class);
-        $date->method('minimumDate')->willReturn($cal_date);
-
         $individual = self::createMock(Individual::class);
-        $individual->method('getEstimatedBirthDate')->willReturn($date);
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
         $census = self::createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDate($census, '', '');
 
-        self::assertSame('1 1 1800', $column->generate($individual, $individual));
+        self::assertSame('2 3 1800', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
index e96737278e..d4014b5f80 100644
--- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php
@@ -20,7 +20,6 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 
@@ -30,29 +29,21 @@ use Fisharebest\Webtrees\TestCase;
 class CensusColumnBirthDayDotMonthYearTest extends TestCase
 {
     /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayDotMonthYearTest
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayDotMonthYear
      * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      *
      * @return void
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
-        $cal_date->method('format')->willReturn('30. June 1832');
-
-        $date = self::createMock(Date::class);
-        $date->method('minimumJulianDay')->willReturn(2390364);
-        $date->method('maximumJulianDay')->willReturn(2390364);
-        $date->method('minimumDate')->willReturn($cal_date);
-
         $individual = self::createMock(Individual::class);
-        $individual->method('getBirthDate')->willReturn($date);
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
         $census = self::createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDayDotMonthYear($census, '', '');
 
-        self::assertSame('30. June 1832', $column->generate($individual, $individual));
+        self::assertSame('2. March 1800', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
index b4247d0b4f..e8d97b4c90 100644
--- a/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDayMonthYearTest.php
@@ -20,7 +20,6 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 
@@ -30,29 +29,21 @@ use Fisharebest\Webtrees\TestCase;
 class CensusColumnBirthDayMonthYearTest extends TestCase
 {
     /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayMonthYearTest
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayMonthYear
      * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      *
      * @return void
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
-        $cal_date->method('format')->willReturn('30 Jun 1832');
-
-        $date = self::createMock(Date::class);
-        $date->method('minimumJulianDay')->willReturn(2390364);
-        $date->method('maximumJulianDay')->willReturn(2390364);
-        $date->method('minimumDate')->willReturn($cal_date);
-
         $individual = self::createMock(Individual::class);
-        $individual->method('getBirthDate')->willReturn($date);
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
         $census = self::createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDayMonthYear($census, '', '');
 
-        self::assertSame('30 Jun 1832', $column->generate($individual, $individual));
+        self::assertSame('2 Mar 1800', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
index b58f8f226a..8fec7eb5da 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php
@@ -20,7 +20,6 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 
@@ -30,29 +29,21 @@ use Fisharebest\Webtrees\TestCase;
 class CensusColumnBirthDaySlashMonthTest extends TestCase
 {
     /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthTest
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonth
      * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      *
      * @return void
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
-        $cal_date->method('format')->willReturn('30/6');
-
-        $date = self::createMock(Date::class);
-        $date->method('minimumJulianDay')->willReturn(2390364);
-        $date->method('maximumJulianDay')->willReturn(2390364);
-        $date->method('minimumDate')->willReturn($cal_date);
-
         $individual = self::createMock(Individual::class);
-        $individual->method('getBirthDate')->willReturn($date);
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
         $census = self::createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDaySlashMonth($census, '', '');
 
-        self::assertSame('30/6', $column->generate($individual, $individual));
+        self::assertSame('2/3', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
index 34cded51f2..fca865afd1 100644
--- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
+++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php
@@ -20,7 +20,6 @@ declare(strict_types=1);
 namespace Fisharebest\Webtrees\Census;
 
 use Fisharebest\Webtrees\Date;
-use Fisharebest\Webtrees\Date\GregorianDate;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 
@@ -30,29 +29,21 @@ use Fisharebest\Webtrees\TestCase;
 class CensusColumnBirthDaySlashMonthYearTest extends TestCase
 {
     /**
-     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYearTest
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear
      * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
      *
      * @return void
      */
     public function testGenerateColumn(): void
     {
-        $cal_date = self::createMock(GregorianDate::class);
-        $cal_date->method('format')->willReturn('30/6 1832');
-
-        $date = self::createMock(Date::class);
-        $date->method('minimumJulianDay')->willReturn(2390364);
-        $date->method('maximumJulianDay')->willReturn(2390364);
-        $date->method('minimumDate')->willReturn($cal_date);
-
         $individual = self::createMock(Individual::class);
-        $individual->method('getBirthDate')->willReturn($date);
+        $individual->method('getEstimatedBirthDate')->willReturn(new Date('02 MAR 1800'));
 
         $census = self::createMock(CensusInterface::class);
         $census->method('censusDate')->willReturn('30 JUN 1832');
 
         $column = new CensusColumnBirthDaySlashMonthYear($census, '', '');
 
-        self::assertSame('30/6 1832', $column->generate($individual, $individual));
+        self::assertSame('2/3 1800', $column->generate($individual, $individual));
     }
 }
diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php
index ef1ed0cb2c..b141b824d0 100644
--- a/tests/app/Census/CensusColumnConditionUsTest.php
+++ b/tests/app/Census/CensusColumnConditionUsTest.php
@@ -371,4 +371,74 @@ class CensusColumnConditionUsTest extends TestCase
 
         self::assertSame('D', $column->generate($individual, $individual));
     }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testMarriedMale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('M');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionUs($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('M', $column->generate($individual, $individual));
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumnCondition
+     *
+     * @return void
+     */
+    public function testMarriedFemale(): void
+    {
+        $fact = self::createMock(Fact::class);
+
+        $family = self::createMock(Family::class);
+        $family->expects(self::once())->method('getMarriageDate')->willReturn(new Date(''));
+        $family
+            ->expects(self::exactly(2))
+            ->method('facts')
+            ->withConsecutive(
+                [['MARR']],
+                [['DIV']]
+            )->willReturnOnConsecutiveCalls(
+                new Collection([$fact]),
+                new Collection()
+            );
+
+        $individual = self::createMock(Individual::class);
+        $individual->method('sex')->willReturn('F');
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createMock(CensusInterface::class);
+
+        $column = new CensusColumnConditionUs($census, '', '');
+        $census->method('censusDate')->willReturn('30 JUN 1830');
+
+        self::assertSame('M', $column->generate($individual, $individual));
+    }
 }
diff --git a/tests/app/Census/CensusOfDenmarkTest.php b/tests/app/Census/CensusOfDenmarkTest.php
index 2b1b6aa2e5..d93ab62640 100644
--- a/tests/app/Census/CensusOfDenmarkTest.php
+++ b/tests/app/Census/CensusOfDenmarkTest.php
@@ -43,7 +43,7 @@ class CensusOfDenmarkTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark
      *
      * @return void
      */
diff --git a/tests/app/Census/CensusOfEnglandTest.php b/tests/app/Census/CensusOfEnglandTest.php
index 22e6638204..424010a3a0 100644
--- a/tests/app/Census/CensusOfEnglandTest.php
+++ b/tests/app/Census/CensusOfEnglandTest.php
@@ -43,7 +43,7 @@ class CensusOfEnglandTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfEngland
      *
      * @return void
      */
diff --git a/tests/app/Census/CensusOfFranceTest.php b/tests/app/Census/CensusOfFranceTest.php
index f6e6510e1d..f0c60bbe39 100644
--- a/tests/app/Census/CensusOfFranceTest.php
+++ b/tests/app/Census/CensusOfFranceTest.php
@@ -43,7 +43,7 @@ class CensusOfFranceTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfFrance
      *
      * @return void
      */
diff --git a/tests/app/Census/CensusOfScotlandTest.php b/tests/app/Census/CensusOfScotlandTest.php
index e420ec85e6..948abaa1c2 100644
--- a/tests/app/Census/CensusOfScotlandTest.php
+++ b/tests/app/Census/CensusOfScotlandTest.php
@@ -43,7 +43,7 @@ class CensusOfScotlandTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfScotland
      *
      * @return void
      */
diff --git a/tests/app/Census/CensusOfUnitedStatesTest.php b/tests/app/Census/CensusOfUnitedStatesTest.php
index 296968e49c..559bff8d15 100644
--- a/tests/app/Census/CensusOfUnitedStatesTest.php
+++ b/tests/app/Census/CensusOfUnitedStatesTest.php
@@ -43,7 +43,7 @@ class CensusOfUnitedStatesTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates
      *
      * @return void
      */
diff --git a/tests/app/Module/MapLinkBingModuleTest.php b/tests/app/Module/MapLinkBingModuleTest.php
index 51ccfe8551..0a1d8f3eb6 100644
--- a/tests/app/Module/MapLinkBingModuleTest.php
+++ b/tests/app/Module/MapLinkBingModuleTest.php
@@ -26,7 +26,7 @@ use Fisharebest\Webtrees\TestCase;
 
 /**
  * @covers \Fisharebest\Webtrees\Module\MapLinkBingModule
- * @covers \Fisharebest\Webtrees\Module\MapLinkTrait
+ * @covers \Fisharebest\Webtrees\Module\ModuleMapLinkTrait
  */
 class MapLinkBingModuleTest extends TestCase
 {
diff --git a/tests/app/Module/MapLinkGoogleModuleTest.php b/tests/app/Module/MapLinkGoogleModuleTest.php
index 8d70cec44c..641878b40a 100644
--- a/tests/app/Module/MapLinkGoogleModuleTest.php
+++ b/tests/app/Module/MapLinkGoogleModuleTest.php
@@ -26,7 +26,7 @@ use Fisharebest\Webtrees\TestCase;
 
 /**
  * @covers \Fisharebest\Webtrees\Module\MapLinkBingModule
- * @covers \Fisharebest\Webtrees\Module\MapLinkTrait
+ * @covers \Fisharebest\Webtrees\Module\ModuleMapLinkTrait
  */
 class MapLinkGoogleModuleTest extends TestCase
 {
diff --git a/tests/app/Module/MapLinkOpenStreetMapModuleTest.php b/tests/app/Module/MapLinkOpenStreetMapModuleTest.php
index 8507538c0c..13af591f72 100644
--- a/tests/app/Module/MapLinkOpenStreetMapModuleTest.php
+++ b/tests/app/Module/MapLinkOpenStreetMapModuleTest.php
@@ -26,7 +26,7 @@ use Fisharebest\Webtrees\TestCase;
 
 /**
  * @covers \Fisharebest\Webtrees\Module\MapLinkOpenStreetMapModule
- * @covers \Fisharebest\Webtrees\Module\MapLinkTrait
+ * @covers \Fisharebest\Webtrees\Module\ModuleMapLinkTrait
  */
 class MapLinkOpenStreetMapModuleTest extends TestCase
 {
diff --git a/tests/feature/RelationshipNamesTest.php b/tests/feature/RelationshipNamesTest.php
index 4e91778174..8e8262854c 100644
--- a/tests/feature/RelationshipNamesTest.php
+++ b/tests/feature/RelationshipNamesTest.php
@@ -30,7 +30,7 @@ use Fisharebest\Webtrees\Services\RelationshipService;
  * @covers \Fisharebest\Webtrees\Relationship
  * @covers \Fisharebest\Webtrees\Services\RelationshipService
  * @covers \Fisharebest\Webtrees\Module\LanguageEnglishGreatBritain
- * @covers \Fisharebest\Webtrees\Module\LanguageModuleTrait
+ * @covers \Fisharebest\Webtrees\Module\ModuleLanguageTrait
  */
 class RelationshipNamesTest extends TestCase
 {