Testing

5 files changed, 241 insertions, 7 deletions

diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php
index 08c9e0e4e0..950579781f 100644
--- a/tests/app/Census/CensusColumnFullNameTest.php
+++ b/tests/app/Census/CensusColumnFullNameTest.php
@@ -19,6 +19,9 @@ declare(strict_types=1);
 
 namespace Fisharebest\Webtrees\Census;
 
+use Fisharebest\Webtrees\Date;
+use Fisharebest\Webtrees\Fact;
+use Fisharebest\Webtrees\Family;
 use Fisharebest\Webtrees\Individual;
 use Fisharebest\Webtrees\TestCase;
 use Illuminate\Support\Collection;
@@ -34,17 +37,60 @@ class CensusColumnFullNameTest extends TestCase
      *
      * @return void
      */
-    public function testFullName(): void
+    public function xxxtestFullName(): void
     {
-        $individual = self::createMock(Individual::class);
+        $individual = self::createStub(Individual::class);
         $individual->method('getAllNames')->willReturn([['full' => 'Joe Bloggs']]);
         $individual->method('spouseFamilies')->willReturn(new Collection());
 
-        $census = self::createMock(CensusInterface::class);
+        $census = self::createStub(CensusInterface::class);
         $census->method('censusDate')->willReturn('');
 
         $column = new CensusColumnFullName($census, '', '');
 
         self::assertSame('Joe Bloggs', $column->generate($individual, $individual));
     }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\CensusColumnFullName
+     * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn
+     *
+     * @return void
+     */
+    public function testMarriedName(): void
+    {
+        $wife_names = [
+            ['type' => 'NAME', 'full' => 'Jane Bloggs'],
+            ['type' => '_MARNM', 'full' => 'Jane Smith', 'surn' => 'SMITH'],
+        ];
+
+        $husband_names = [
+            ['type' => 'NAME', 'full' => 'Joe Smith', 'surn' => 'SMITH'],
+        ];
+
+        $marriage_date = new Date('02 DATE 2019');
+
+        $marriage = self::createStub(Fact::class);
+        $marriage->method('date')->willReturn($marriage_date);
+
+        $spouse = self::createStub(Individual::class);
+        $spouse->method('getAllNames')->willReturn($husband_names);
+
+        $family = self::createStub(Family::class);
+        $family->method('facts')->willReturn(new Collection([$marriage]));
+        $family->method('getMarriageDate')->willReturn($marriage_date);
+        $family->method('spouse')->willReturn($spouse);
+
+        $individual = self::createStub(Individual::class);
+        $individual->method('getAllNames')->willReturn($wife_names);
+        $individual->method('spouseFamilies')->willReturn(new Collection([$family]));
+
+        $census = self::createStub(CensusInterface::class);
+        $census->method('censusDate')->willReturn('01 JAN 2020');
+
+        $column = new CensusColumnFullName($census, '', '');
+
+        self::assertSame('Jane Smith', $column->generate($individual, $individual));
+    }
+
 }
diff --git a/tests/app/Census/CensusOfDeutschlandTest.php b/tests/app/Census/CensusOfDeutschlandTest.php
index 6a02f9a8c2..57b90ace87 100644
--- a/tests/app/Census/CensusOfDeutschlandTest.php
+++ b/tests/app/Census/CensusOfDeutschlandTest.php
@@ -43,7 +43,7 @@ class CensusOfDeutschlandTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland
      *
      * @return void
      */
diff --git a/tests/app/Census/CensusOfSlovakiaTest.php b/tests/app/Census/CensusOfSlovakiaTest.php
index de12e3cb63..9c9d129c72 100644
--- a/tests/app/Census/CensusOfSlovakiaTest.php
+++ b/tests/app/Census/CensusOfSlovakiaTest.php
@@ -43,7 +43,7 @@ class CensusOfSlovakiaTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia
      *
      * @return void
      */
diff --git a/tests/app/Census/CensusOfWalesTest.php b/tests/app/Census/CensusOfWalesTest.php
index 693bce5792..9ed2048de1 100644
--- a/tests/app/Census/CensusOfWalesTest.php
+++ b/tests/app/Census/CensusOfWalesTest.php
@@ -43,7 +43,7 @@ class CensusOfWalesTest extends TestCase
     /**
      * Test the census language
      *
-     * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic
+     * @covers \Fisharebest\Webtrees\Census\CensusOfWales
      *
      * @return void
      */
diff --git a/tests/app/Census/CensusTest.php b/tests/app/Census/CensusTest.php
index 9b970e4c25..010e2ba182 100644
--- a/tests/app/Census/CensusTest.php
+++ b/tests/app/Census/CensusTest.php
@@ -31,7 +31,195 @@ class CensusTest extends TestCase
      *
      * @return void
      */
-    public function testCensusPlaces(): void
+    public function testCensusPlacesCzech(): void
+    {
+        $censuses = Census::censusPlaces('cs');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesDanish(): void
+    {
+        $censuses = Census::censusPlaces('da');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesGerman(): void
+    {
+        $censuses = Census::censusPlaces('de');
+
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesAustralianEnglish(): void
+    {
+        $censuses = Census::censusPlaces('en-AU');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesBritishEnglish(): void
+    {
+        $censuses = Census::censusPlaces('en-GB');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesUSEnglish(): void
+    {
+        $censuses = Census::censusPlaces('en-US');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesFrench(): void
+    {
+        $censuses = Census::censusPlaces('fr');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesCanadianFrench(): void
+    {
+        $censuses = Census::censusPlaces('fr-CA');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesSlovak(): void
+    {
+        $censuses = Census::censusPlaces('sk');
+
+        self::assertCount(9, $censuses);
+        self::assertInstanceOf(CensusOfSlovakia::class, $censuses[0]);
+        self::assertInstanceOf(CensusOfCzechRepublic::class, $censuses[1]);
+        self::assertInstanceOf(CensusOfDenmark::class, $censuses[2]);
+        self::assertInstanceOf(CensusOfDeutschland::class, $censuses[3]);
+        self::assertInstanceOf(CensusOfEngland::class, $censuses[4]);
+        self::assertInstanceOf(CensusOfFrance::class, $censuses[5]);
+        self::assertInstanceOf(CensusOfScotland::class, $censuses[6]);
+        self::assertInstanceOf(CensusOfUnitedStates::class, $censuses[7]);
+        self::assertInstanceOf(CensusOfWales::class, $censuses[8]);
+    }
+
+    /**
+     * @covers \Fisharebest\Webtrees\Census\Census
+     *
+     * @return void
+     */
+    public function testCensusPlacesDefault(): void
     {
         $censuses = Census::censusPlaces('XX');