diff options
| author | Greg Roach <greg@subaqua.co.uk> | 2020-03-14 12:59:36 +0000 |
|---|---|---|
| committer | Greg Roach <greg@subaqua.co.uk> | 2020-03-14 12:59:36 +0000 |
| commit | d5b0584dbc729158e086571dbfaad5c22f82f0ef (patch) | |
| tree | 4ffb12f533a5a8505ae2380ffca06d67cbd0c9c5 /tests/app/Census | |
| parent | 1f646e4aa6e5c5701b125544c0528ba24547338b (diff) | |
| download | webtrees-d5b0584dbc729158e086571dbfaad5c22f82f0ef.tar.gz webtrees-d5b0584dbc729158e086571dbfaad5c22f82f0ef.tar.bz2 webtrees-d5b0584dbc729158e086571dbfaad5c22f82f0ef.zip | |
#3109 - generate census columns using census language
Diffstat (limited to 'tests/app/Census')
40 files changed, 203 insertions, 29 deletions
diff --git a/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php new file mode 100644 index 0000000000..c9c6f4f22e --- /dev/null +++ b/tests/app/Census/CensusColumnRelationToHeadEnglishTest.php @@ -0,0 +1,47 @@ +<?php + +/** + * webtrees: online genealogy + * Copyright (C) 2019 webtrees development team + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +declare(strict_types=1); + +namespace Fisharebest\Webtrees\Census; + +use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; + +/** + * Test harness for the class CensusColumnRelationToHead + */ +class CensusColumnRelationToHeadEnglishTest extends TestCase +{ + /** + * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHeadEnglish + * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHead + * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn + * + * @return void + */ + public function testNull(): void + { + $individual = $this->createMock(Individual::class); + + $census = $this->createMock(CensusInterface::class); + + $column = new CensusColumnRelationToHeadEnglish($census, '', ''); + + $this->assertSame('head', $column->generate($individual, $individual)); + } +} diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php index dd8c681329..600ec2c722 100644 --- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php @@ -29,6 +29,7 @@ class CensusColumnRelationToHeadGermanTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHeadGerman + * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHead * @covers \Fisharebest\Webtrees\Census\AbstractCensusColumn * * @return void diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php index 9f17d7d25a..1e629511bb 100644 --- a/tests/app/Census/CensusColumnRelationToHeadTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadTest.php @@ -41,6 +41,6 @@ class CensusColumnRelationToHeadTest extends TestCase $column = new CensusColumnRelationToHead($census, '', ''); - $this->assertSame('head', $column->generate($individual, $individual)); + $this->assertSame('-', $column->generate($individual, $individual)); } } diff --git a/tests/app/Census/CensusOfCzechRepublicTest.php b/tests/app/Census/CensusOfCzechRepublicTest.php index 871d08dfa4..54727dae2f 100644 --- a/tests/app/Census/CensusOfCzechRepublicTest.php +++ b/tests/app/Census/CensusOfCzechRepublicTest.php @@ -41,6 +41,20 @@ class CensusOfCzechRepublicTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfCzechRepublic(); + + $this->assertSame('cz', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic diff --git a/tests/app/Census/CensusOfDenmarkTest.php b/tests/app/Census/CensusOfDenmarkTest.php index 377cb94183..50322674a5 100644 --- a/tests/app/Census/CensusOfDenmarkTest.php +++ b/tests/app/Census/CensusOfDenmarkTest.php @@ -41,6 +41,20 @@ class CensusOfDenmarkTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfDenmark(); + + $this->assertSame('da', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfDenmark diff --git a/tests/app/Census/CensusOfDeutschlandTest.php b/tests/app/Census/CensusOfDeutschlandTest.php index 3159e8d1c6..46133e8adf 100644 --- a/tests/app/Census/CensusOfDeutschlandTest.php +++ b/tests/app/Census/CensusOfDeutschlandTest.php @@ -41,6 +41,20 @@ class CensusOfDeutschlandTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfDeutschland(); + + $this->assertSame('de', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfDeutschland diff --git a/tests/app/Census/CensusOfEngland1851Test.php b/tests/app/Census/CensusOfEngland1851Test.php index 30a6eacc3d..352330dbc6 100644 --- a/tests/app/Census/CensusOfEngland1851Test.php +++ b/tests/app/Census/CensusOfEngland1851Test.php @@ -56,7 +56,7 @@ class CensusOfEngland1851Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfEngland1861Test.php b/tests/app/Census/CensusOfEngland1861Test.php index 90c50f21a8..be4cbd40ab 100644 --- a/tests/app/Census/CensusOfEngland1861Test.php +++ b/tests/app/Census/CensusOfEngland1861Test.php @@ -56,7 +56,7 @@ class CensusOfEngland1861Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php index 0e44991739..0e7f6b0896 100644 --- a/tests/app/Census/CensusOfEngland1871Test.php +++ b/tests/app/Census/CensusOfEngland1871Test.php @@ -56,7 +56,7 @@ class CensusOfEngland1871Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php index e60d02e6dc..342df71158 100644 --- a/tests/app/Census/CensusOfEngland1881Test.php +++ b/tests/app/Census/CensusOfEngland1881Test.php @@ -56,7 +56,7 @@ class CensusOfEngland1881Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php index 066a96344e..963aacf90e 100644 --- a/tests/app/Census/CensusOfEngland1891Test.php +++ b/tests/app/Census/CensusOfEngland1891Test.php @@ -56,7 +56,7 @@ class CensusOfEngland1891Test extends TestCase $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php index eaf477ed70..c833c6e3c2 100644 --- a/tests/app/Census/CensusOfEngland1901Test.php +++ b/tests/app/Census/CensusOfEngland1901Test.php @@ -56,7 +56,7 @@ class CensusOfEngland1901Test extends TestCase $this->assertCount(10, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php index d870740ced..c3afc0b5ff 100644 --- a/tests/app/Census/CensusOfEngland1911Test.php +++ b/tests/app/Census/CensusOfEngland1911Test.php @@ -56,7 +56,7 @@ class CensusOfEngland1911Test extends TestCase $this->assertCount(16, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); diff --git a/tests/app/Census/CensusOfEnglandTest.php b/tests/app/Census/CensusOfEnglandTest.php index cd7d78c497..17dde16d8c 100644 --- a/tests/app/Census/CensusOfEnglandTest.php +++ b/tests/app/Census/CensusOfEnglandTest.php @@ -41,6 +41,20 @@ class CensusOfEnglandTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfEngland(); + + $this->assertSame('en-GB', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfEngland diff --git a/tests/app/Census/CensusOfFranceTest.php b/tests/app/Census/CensusOfFranceTest.php index 2db84e4a59..0e905b7e88 100644 --- a/tests/app/Census/CensusOfFranceTest.php +++ b/tests/app/Census/CensusOfFranceTest.php @@ -41,6 +41,20 @@ class CensusOfFranceTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfFrance(); + + $this->assertSame('fr', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfFrance diff --git a/tests/app/Census/CensusOfScotland1851Test.php b/tests/app/Census/CensusOfScotland1851Test.php index e8646b6d6f..4011be0458 100644 --- a/tests/app/Census/CensusOfScotland1851Test.php +++ b/tests/app/Census/CensusOfScotland1851Test.php @@ -56,7 +56,7 @@ class CensusOfScotland1851Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php index 615aefc887..0905be39a0 100644 --- a/tests/app/Census/CensusOfScotland1861Test.php +++ b/tests/app/Census/CensusOfScotland1861Test.php @@ -56,7 +56,7 @@ class CensusOfScotland1861Test extends TestCase $this->assertCount(9, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php index a8bde14f38..96f2875789 100644 --- a/tests/app/Census/CensusOfScotland1871Test.php +++ b/tests/app/Census/CensusOfScotland1871Test.php @@ -56,7 +56,7 @@ class CensusOfScotland1871Test extends TestCase $this->assertCount(9, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php index e932ea2f39..07683ffba1 100644 --- a/tests/app/Census/CensusOfScotland1881Test.php +++ b/tests/app/Census/CensusOfScotland1881Test.php @@ -56,7 +56,7 @@ class CensusOfScotland1881Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php index 4e83ef1413..0ff9a06ebd 100644 --- a/tests/app/Census/CensusOfScotland1891Test.php +++ b/tests/app/Census/CensusOfScotland1891Test.php @@ -56,7 +56,7 @@ class CensusOfScotland1891Test extends TestCase $this->assertCount(12, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php index 16f9e4452c..e8e900d979 100644 --- a/tests/app/Census/CensusOfScotland1901Test.php +++ b/tests/app/Census/CensusOfScotland1901Test.php @@ -56,7 +56,7 @@ class CensusOfScotland1901Test extends TestCase $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php index 91576a5b34..f667b8e9e2 100644 --- a/tests/app/Census/CensusOfScotland1911Test.php +++ b/tests/app/Census/CensusOfScotland1911Test.php @@ -56,7 +56,7 @@ class CensusOfScotland1911Test extends TestCase $this->assertCount(17, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]); $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); diff --git a/tests/app/Census/CensusOfScotlandTest.php b/tests/app/Census/CensusOfScotlandTest.php index 616d94e1d2..67f947b971 100644 --- a/tests/app/Census/CensusOfScotlandTest.php +++ b/tests/app/Census/CensusOfScotlandTest.php @@ -41,6 +41,20 @@ class CensusOfScotlandTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfScotland(); + + $this->assertSame('en-GB', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfScotland diff --git a/tests/app/Census/CensusOfSlovakiaTest.php b/tests/app/Census/CensusOfSlovakiaTest.php index ade6a4d476..ff6b00e3ec 100644 --- a/tests/app/Census/CensusOfSlovakiaTest.php +++ b/tests/app/Census/CensusOfSlovakiaTest.php @@ -41,6 +41,20 @@ class CensusOfSlovakiaTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfSlovakia(); + + $this->assertSame('sk', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfSlovakia diff --git a/tests/app/Census/CensusOfUnitedStates1880Test.php b/tests/app/Census/CensusOfUnitedStates1880Test.php index 007215d436..bf09963e4c 100644 --- a/tests/app/Census/CensusOfUnitedStates1880Test.php +++ b/tests/app/Census/CensusOfUnitedStates1880Test.php @@ -59,7 +59,7 @@ class CensusOfUnitedStates1880Test extends TestCase $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); $this->assertInstanceOf(CensusColumnMonthIfBornWithinYear::class, $columns[3]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[4]); $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); diff --git a/tests/app/Census/CensusOfUnitedStates1890Test.php b/tests/app/Census/CensusOfUnitedStates1890Test.php index ce428193ec..dbbb00d42a 100644 --- a/tests/app/Census/CensusOfUnitedStates1890Test.php +++ b/tests/app/Census/CensusOfUnitedStates1890Test.php @@ -58,7 +58,7 @@ class CensusOfUnitedStates1890Test extends TestCase $this->assertInstanceOf(CensusColumnGivenNameInitial::class, $columns[0]); $this->assertInstanceOf(CensusColumnSurname::class, $columns[1]); $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[3]); $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[5]); $this->assertInstanceOf(CensusColumnAge::class, $columns[6]); diff --git a/tests/app/Census/CensusOfUnitedStates1900Test.php b/tests/app/Census/CensusOfUnitedStates1900Test.php index 2a88abcb55..09135bb4c5 100644 --- a/tests/app/Census/CensusOfUnitedStates1900Test.php +++ b/tests/app/Census/CensusOfUnitedStates1900Test.php @@ -56,7 +56,7 @@ class CensusOfUnitedStates1900Test extends TestCase $this->assertCount(26, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[3]); $this->assertInstanceOf(CensusColumnBirthMonth::class, $columns[4]); diff --git a/tests/app/Census/CensusOfUnitedStates1910Test.php b/tests/app/Census/CensusOfUnitedStates1910Test.php index 170ef8a31e..acaab7037c 100644 --- a/tests/app/Census/CensusOfUnitedStates1910Test.php +++ b/tests/app/Census/CensusOfUnitedStates1910Test.php @@ -56,7 +56,7 @@ class CensusOfUnitedStates1910Test extends TestCase $this->assertCount(29, $columns); $this->assertInstanceOf(CensusColumnSurnameGivenNameInitial::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); $this->assertInstanceOf(CensusColumnAge::class, $columns[4]); diff --git a/tests/app/Census/CensusOfUnitedStates1920Test.php b/tests/app/Census/CensusOfUnitedStates1920Test.php index 8ffc6c9086..bf30b662db 100644 --- a/tests/app/Census/CensusOfUnitedStates1920Test.php +++ b/tests/app/Census/CensusOfUnitedStates1920Test.php @@ -56,7 +56,7 @@ class CensusOfUnitedStates1920Test extends TestCase $this->assertCount(24, $columns); $this->assertInstanceOf(CensusColumnSurnameGivenNameInitial::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); $this->assertInstanceOf(CensusColumnSexMF::class, $columns[4]); diff --git a/tests/app/Census/CensusOfUnitedStates1930Test.php b/tests/app/Census/CensusOfUnitedStates1930Test.php index 4bb91ce8ea..3e2f2d2007 100644 --- a/tests/app/Census/CensusOfUnitedStates1930Test.php +++ b/tests/app/Census/CensusOfUnitedStates1930Test.php @@ -56,7 +56,7 @@ class CensusOfUnitedStates1930Test extends TestCase $this->assertCount(28, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); diff --git a/tests/app/Census/CensusOfUnitedStates1940Test.php b/tests/app/Census/CensusOfUnitedStates1940Test.php index 6984ccd7fc..ace62b9d12 100644 --- a/tests/app/Census/CensusOfUnitedStates1940Test.php +++ b/tests/app/Census/CensusOfUnitedStates1940Test.php @@ -56,7 +56,7 @@ class CensusOfUnitedStates1940Test extends TestCase $this->assertCount(27, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); diff --git a/tests/app/Census/CensusOfUnitedStatesTest.php b/tests/app/Census/CensusOfUnitedStatesTest.php index 8855cca2db..067b3f4d55 100644 --- a/tests/app/Census/CensusOfUnitedStatesTest.php +++ b/tests/app/Census/CensusOfUnitedStatesTest.php @@ -41,6 +41,20 @@ class CensusOfUnitedStatesTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfUnitedStates(); + + $this->assertSame('en-US', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfUnitedStates diff --git a/tests/app/Census/CensusOfWales1851Test.php b/tests/app/Census/CensusOfWales1851Test.php index 33f879154c..79d5a8db67 100644 --- a/tests/app/Census/CensusOfWales1851Test.php +++ b/tests/app/Census/CensusOfWales1851Test.php @@ -56,7 +56,7 @@ class CensusOfWales1851Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfWales1861Test.php b/tests/app/Census/CensusOfWales1861Test.php index dce2a4717d..7a2f6e4054 100644 --- a/tests/app/Census/CensusOfWales1861Test.php +++ b/tests/app/Census/CensusOfWales1861Test.php @@ -56,7 +56,7 @@ class CensusOfWales1861Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php index 1cab89f2e2..7f6f036594 100644 --- a/tests/app/Census/CensusOfWales1871Test.php +++ b/tests/app/Census/CensusOfWales1871Test.php @@ -56,7 +56,7 @@ class CensusOfWales1871Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php index 3b9c1338df..a040758322 100644 --- a/tests/app/Census/CensusOfWales1881Test.php +++ b/tests/app/Census/CensusOfWales1881Test.php @@ -56,7 +56,7 @@ class CensusOfWales1881Test extends TestCase $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php index e0acab672d..230200da6e 100644 --- a/tests/app/Census/CensusOfWales1891Test.php +++ b/tests/app/Census/CensusOfWales1891Test.php @@ -56,7 +56,7 @@ class CensusOfWales1891Test extends TestCase $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php index 8e3e0529db..6dc7f27c50 100644 --- a/tests/app/Census/CensusOfWales1901Test.php +++ b/tests/app/Census/CensusOfWales1901Test.php @@ -56,7 +56,7 @@ class CensusOfWales1901Test extends TestCase $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php index 31bdd0cb2c..1316109728 100644 --- a/tests/app/Census/CensusOfWales1911Test.php +++ b/tests/app/Census/CensusOfWales1911Test.php @@ -56,7 +56,7 @@ class CensusOfWales1911Test extends TestCase $this->assertCount(17, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]); $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]); $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]); $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); diff --git a/tests/app/Census/CensusOfWalesTest.php b/tests/app/Census/CensusOfWalesTest.php index 3c2bf719cc..b76d196cc4 100644 --- a/tests/app/Census/CensusOfWalesTest.php +++ b/tests/app/Census/CensusOfWalesTest.php @@ -41,6 +41,20 @@ class CensusOfWalesTest extends TestCase } /** + * Test the census language + * + * @covers \Fisharebest\Webtrees\Census\CensusOfCzechRepublic + * + * @return void + */ + public function testLanguage(): void + { + $census = new CensusOfWales(); + + $this->assertSame('en-GB', $census->censusLanguage()); + } + + /** * Test the census dates * * @covers \Fisharebest\Webtrees\Census\CensusOfWales |
