diff options
Diffstat (limited to 'tests/app/Census')
159 files changed, 1664 insertions, 1400 deletions
diff --git a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php index 9436b63ee4..ab196b689a 100644 --- a/tests/app/Census/CensusColumnAgeFemale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeFemale5YearsTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAgeFemale5Years */ -class CensusColumnAgeFemale5YearsTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnAgeFemale5YearsTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years diff --git a/tests/app/Census/CensusColumnAgeFemaleTest.php b/tests/app/Census/CensusColumnAgeFemaleTest.php index 7521c9f416..46604c6925 100644 --- a/tests/app/Census/CensusColumnAgeFemaleTest.php +++ b/tests/app/Census/CensusColumnAgeFemaleTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAgeFemale */ -class CensusColumnAgeFemaleTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnAgeFemaleTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeFemale diff --git a/tests/app/Census/CensusColumnAgeMale5YearsTest.php b/tests/app/Census/CensusColumnAgeMale5YearsTest.php index 392392d780..638c902698 100644 --- a/tests/app/Census/CensusColumnAgeMale5YearsTest.php +++ b/tests/app/Census/CensusColumnAgeMale5YearsTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAgeMale5Years5Years */ -class CensusColumnAgeMale5YearsTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnAgeMale5YearsTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years diff --git a/tests/app/Census/CensusColumnAgeMaleTest.php b/tests/app/Census/CensusColumnAgeMaleTest.php index 82e0836f37..1a1575dc43 100644 --- a/tests/app/Census/CensusColumnAgeMaleTest.php +++ b/tests/app/Census/CensusColumnAgeMaleTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAgeMale */ -class CensusColumnAgeMaleTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnAgeMaleTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMale diff --git a/tests/app/Census/CensusColumnAgeMarriedTest.php b/tests/app/Census/CensusColumnAgeMarriedTest.php index aa405881a1..cd92a1d7dc 100644 --- a/tests/app/Census/CensusColumnAgeMarriedTest.php +++ b/tests/app/Census/CensusColumnAgeMarriedTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnAgeMarried */ -class CensusColumnAgeMarriedTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnAgeMarriedTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnAgeMarried diff --git a/tests/app/Census/CensusColumnAgeTest.php b/tests/app/Census/CensusColumnAgeTest.php index e288382244..cf71c15fa3 100644 --- a/tests/app/Census/CensusColumnAgeTest.php +++ b/tests/app/Census/CensusColumnAgeTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAge */ -class CensusColumnAgeTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnAgeTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnAge diff --git a/tests/app/Census/CensusColumnBirthDateTest.php b/tests/app/Census/CensusColumnBirthDateTest.php index bd1c307365..c63143a368 100644 --- a/tests/app/Census/CensusColumnBirthDateTest.php +++ b/tests/app/Census/CensusColumnBirthDateTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAge */ -class CensusColumnBirthDateTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthDateTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDate diff --git a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php index bd84670477..c8b44dfb29 100644 --- a/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php +++ b/tests/app/Census/CensusColumnBirthDayDotMonthYearTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnBirthDayDotMonthYearTest */ -class CensusColumnBirthDayDotMonthYearTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthDayDotMonthYearTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayDotMonthYearTest diff --git a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php index 396313ffaf..24acd203f8 100644 --- a/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php +++ b/tests/app/Census/CensusColumnBirthDayMonthSlashYearTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnBirthDayMonthSlashYearTest */ -class CensusColumnBirthDayMonthSlashYearTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthDayMonthSlashYearTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDayMonthSlashYearTest diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php index 85b4ea9cb0..8e8d0c6baa 100644 --- a/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php +++ b/tests/app/Census/CensusColumnBirthDaySlashMonthTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnBirthDaySlashMonthTest */ -class CensusColumnBirthDaySlashMonthTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthDaySlashMonthTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthTest diff --git a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php index 78deea86b7..3dd8a6a155 100644 --- a/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php +++ b/tests/app/Census/CensusColumnBirthDaySlashMonthYearTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnBirthDaySlashMonthYearTest */ -class CensusColumnBirthDaySlashMonthYearTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthDaySlashMonthYearTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYearTest diff --git a/tests/app/Census/CensusColumnBirthDayTest.php b/tests/app/Census/CensusColumnBirthDayTest.php index 0502c46665..fd9c230eb8 100644 --- a/tests/app/Census/CensusColumnBirthDayTest.php +++ b/tests/app/Census/CensusColumnBirthDayTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAge */ -class CensusColumnBirthDayTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthDayTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthDay diff --git a/tests/app/Census/CensusColumnBirthMonthTest.php b/tests/app/Census/CensusColumnBirthMonthTest.php index cad96a6902..cc9b971928 100644 --- a/tests/app/Census/CensusColumnBirthMonthTest.php +++ b/tests/app/Census/CensusColumnBirthMonthTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAge */ -class CensusColumnBirthMonthTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthMonthTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthMonth diff --git a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php index bec254ae31..979fe325eb 100644 --- a/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnBirthPlaceSimpleTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnBirthPlaceSimple */ -class CensusColumnBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthPlaceSimpleTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnBirthPlaceTest.php b/tests/app/Census/CensusColumnBirthPlaceTest.php index c43a53b1f9..747050dd2b 100644 --- a/tests/app/Census/CensusColumnBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnBirthPlaceTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnBirthPlace */ -class CensusColumnBirthPlaceTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthPlaceTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnBirthYearTest.php b/tests/app/Census/CensusColumnBirthYearTest.php index 89385a1e37..1583b6766a 100644 --- a/tests/app/Census/CensusColumnBirthYearTest.php +++ b/tests/app/Census/CensusColumnBirthYearTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Date\GregorianDate; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnAge */ -class CensusColumnBirthYearTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBirthYearTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnBirthYear diff --git a/tests/app/Census/CensusColumnBornForeignPartsTest.php b/tests/app/Census/CensusColumnBornForeignPartsTest.php index a88a745444..c12f4c7815 100644 --- a/tests/app/Census/CensusColumnBornForeignPartsTest.php +++ b/tests/app/Census/CensusColumnBornForeignPartsTest.php @@ -20,12 +20,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnBornForeignParts */ -class CensusColumnBornForeignPartsTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnBornForeignPartsTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnChildrenBornAliveTest.php b/tests/app/Census/CensusColumnChildrenBornAliveTest.php index 67b7a13d7b..17598c55cc 100644 --- a/tests/app/Census/CensusColumnChildrenBornAliveTest.php +++ b/tests/app/Census/CensusColumnChildrenBornAliveTest.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnChildrenBornAlive */ -class CensusColumnChildrenBornAliveTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnChildrenBornAliveTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive diff --git a/tests/app/Census/CensusColumnChildrenDiedTest.php b/tests/app/Census/CensusColumnChildrenDiedTest.php index c5639f2c0c..f269ad6c96 100644 --- a/tests/app/Census/CensusColumnChildrenDiedTest.php +++ b/tests/app/Census/CensusColumnChildrenDiedTest.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnChildrenDied */ -class CensusColumnChildrenDiedTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnChildrenDiedTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenDied diff --git a/tests/app/Census/CensusColumnChildrenLivingTest.php b/tests/app/Census/CensusColumnChildrenLivingTest.php index 1ee20f71d2..9edbe8071f 100644 --- a/tests/app/Census/CensusColumnChildrenLivingTest.php +++ b/tests/app/Census/CensusColumnChildrenLivingTest.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnChildrenLiving */ -class CensusColumnChildrenLivingTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnChildrenLivingTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnChildrenLiving diff --git a/tests/app/Census/CensusColumnConditionDanishTest.php b/tests/app/Census/CensusColumnConditionDanishTest.php index 6e6a454e40..3026c721dc 100644 --- a/tests/app/Census/CensusColumnConditionDanishTest.php +++ b/tests/app/Census/CensusColumnConditionDanishTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionDanish */ -class CensusColumnConditionDanishTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionDanishTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionDanish diff --git a/tests/app/Census/CensusColumnConditionEnglishTest.php b/tests/app/Census/CensusColumnConditionEnglishTest.php index 1fc31d8ee7..32c9e18ae6 100644 --- a/tests/app/Census/CensusColumnConditionEnglishTest.php +++ b/tests/app/Census/CensusColumnConditionEnglishTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionEnglish */ -class CensusColumnConditionEnglishTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionEnglishTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionEnglish diff --git a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php index 73737c913d..ac7b979b75 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFemmeTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionFrenchFemme */ -class CensusColumnConditionFrenchFemmeTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionFrenchFemmeTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme diff --git a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php index 6223dc28e1..5737b42636 100644 --- a/tests/app/Census/CensusColumnConditionFrenchFilleTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchFilleTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionFrenchFille */ -class CensusColumnConditionFrenchFilleTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionFrenchFilleTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille diff --git a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php index 42c8270251..d8f53ca0d2 100644 --- a/tests/app/Census/CensusColumnConditionFrenchGarconTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchGarconTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionFrenchGarcon */ -class CensusColumnConditionFrenchGarconTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionFrenchGarconTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon diff --git a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php index 9c15cecec4..1deb9088dd 100644 --- a/tests/app/Census/CensusColumnConditionFrenchHommeTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchHommeTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionFrenchHomme */ -class CensusColumnConditionFrenchHommeTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionFrenchHommeTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme diff --git a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php index 1595311f7e..2db5c8e5db 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeufTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeufTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionFrenchVeuf */ -class CensusColumnConditionFrenchVeufTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionFrenchVeufTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf diff --git a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php index 148ba955ae..de12be5816 100644 --- a/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php +++ b/tests/app/Census/CensusColumnConditionFrenchVeuveTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionFrenchVeuve */ -class CensusColumnConditionFrenchVeuveTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionFrenchVeuveTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve diff --git a/tests/app/Census/CensusColumnConditionUsTest.php b/tests/app/Census/CensusColumnConditionUsTest.php index 0a5da07e02..4f5c04d33f 100644 --- a/tests/app/Census/CensusColumnConditionUsTest.php +++ b/tests/app/Census/CensusColumnConditionUsTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnConditionUs */ -class CensusColumnConditionUsTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnConditionUsTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnConditionUs diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php index 34fa4fe068..b6d2f53f7f 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceSimpleTest.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnFatherBirthPlaceSimple */ -class CensusColumnFatherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnFatherBirthPlaceSimpleTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php index d4de447583..5658dbc428 100644 --- a/tests/app/Census/CensusColumnFatherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnFatherBirthPlaceTest.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnFatherBirthPlace */ -class CensusColumnFatherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnFatherBirthPlaceTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnFatherForeignTest.php b/tests/app/Census/CensusColumnFatherForeignTest.php index db49c2b314..95609bd75a 100644 --- a/tests/app/Census/CensusColumnFatherForeignTest.php +++ b/tests/app/Census/CensusColumnFatherForeignTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnFatherForeign */ -class CensusColumnFatherForeignTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnFatherForeignTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnFullNameTest.php b/tests/app/Census/CensusColumnFullNameTest.php index 008ab10548..ba9a01fcb6 100644 --- a/tests/app/Census/CensusColumnFullNameTest.php +++ b/tests/app/Census/CensusColumnFullNameTest.php @@ -19,12 +19,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnFullName */ -class CensusColumnFullNameTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnFullNameTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnFullName diff --git a/tests/app/Census/CensusColumnGivenNameInitialTest.php b/tests/app/Census/CensusColumnGivenNameInitialTest.php index 5637fee55a..d9d3153924 100644 --- a/tests/app/Census/CensusColumnGivenNameInitialTest.php +++ b/tests/app/Census/CensusColumnGivenNameInitialTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnGivenNameInitial */ -class CensusColumnGivenNameInitialTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnGivenNameInitialTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnGivenNameInitial diff --git a/tests/app/Census/CensusColumnGivenNamesTest.php b/tests/app/Census/CensusColumnGivenNamesTest.php index 102ca93341..9369da4e02 100644 --- a/tests/app/Census/CensusColumnGivenNamesTest.php +++ b/tests/app/Census/CensusColumnGivenNamesTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnGivenNames */ -class CensusColumnGivenNamesTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnGivenNamesTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnGivenNames diff --git a/tests/app/Census/CensusColumnMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMarriedWithinYearTest.php index fb437946e8..483cf453f5 100644 --- a/tests/app/Census/CensusColumnMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMarriedWithinYearTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnMarriedWithinYear */ -class CensusColumnMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnMarriedWithinYearTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear diff --git a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php index 7ff79ad3e7..56d7645d46 100644 --- a/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfBornWithinYearTest.php @@ -20,11 +20,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnMonthIfBornWithinYear */ -class CensusColumnMonthIfBornWithinYearTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnMonthIfBornWithinYearTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear diff --git a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php index 504702d7fc..97331a668e 100644 --- a/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php +++ b/tests/app/Census/CensusColumnMonthIfMarriedWithinYearTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnMonthIfMarriedWithinYear */ -class CensusColumnMonthIfMarriedWithinYearTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnMonthIfMarriedWithinYearTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php index 2fe843e94d..fb9907d69c 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceSimpleTest.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnMotherBirthPlaceSimple */ -class CensusColumnMotherBirthPlaceSimpleTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnMotherBirthPlaceSimpleTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php index a70db410f9..47569f88f7 100644 --- a/tests/app/Census/CensusColumnMotherBirthPlaceTest.php +++ b/tests/app/Census/CensusColumnMotherBirthPlaceTest.php @@ -21,12 +21,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnMotherBirthPlace */ -class CensusColumnMotherBirthPlaceTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnMotherBirthPlaceTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnMotherForeignTest.php b/tests/app/Census/CensusColumnMotherForeignTest.php index 69a21e1247..59968b8bb4 100644 --- a/tests/app/Census/CensusColumnMotherForeignTest.php +++ b/tests/app/Census/CensusColumnMotherForeignTest.php @@ -21,11 +21,12 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnMotherForeign */ -class CensusColumnMotherForeignTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnMotherForeignTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnNationalityTest.php b/tests/app/Census/CensusColumnNationalityTest.php index 267ce1f307..14842d1307 100644 --- a/tests/app/Census/CensusColumnNationalityTest.php +++ b/tests/app/Census/CensusColumnNationalityTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Individual; use Fisharebest\Webtrees\Place; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnNationality */ -class CensusColumnNationalityTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnNationalityTest extends TestCase { /** * Get place mock. diff --git a/tests/app/Census/CensusColumnNullTest.php b/tests/app/Census/CensusColumnNullTest.php index ef21bc3502..f46cab3240 100644 --- a/tests/app/Census/CensusColumnNullTest.php +++ b/tests/app/Census/CensusColumnNullTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnNull */ -class CensusColumnNullTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnNullTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnNull diff --git a/tests/app/Census/CensusColumnOccupationTest.php b/tests/app/Census/CensusColumnOccupationTest.php index 6db0611b0b..151e1db1dd 100644 --- a/tests/app/Census/CensusColumnOccupationTest.php +++ b/tests/app/Census/CensusColumnOccupationTest.php @@ -20,12 +20,13 @@ namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnOccupation */ -class CensusColumnOccupationTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnOccupationTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnOccupation diff --git a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php index 93a5244383..d250e36fcf 100644 --- a/tests/app/Census/CensusColumnRelationToHeadGermanTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadGermanTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnRelationToHead */ -class CensusColumnRelationToHeadGermanTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnRelationToHeadGermanTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHeadGerman diff --git a/tests/app/Census/CensusColumnRelationToHeadTest.php b/tests/app/Census/CensusColumnRelationToHeadTest.php index 694cb05ece..e147eab289 100644 --- a/tests/app/Census/CensusColumnRelationToHeadTest.php +++ b/tests/app/Census/CensusColumnRelationToHeadTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnRelationToHead */ -class CensusColumnRelationToHeadTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnRelationToHeadTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnRelationToHead diff --git a/tests/app/Census/CensusColumnReligionTest.php b/tests/app/Census/CensusColumnReligionTest.php index bc95c38683..8b2abfd285 100644 --- a/tests/app/Census/CensusColumnReligionTest.php +++ b/tests/app/Census/CensusColumnReligionTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnReligion */ -class CensusColumnReligionTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnReligionTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnReligion diff --git a/tests/app/Census/CensusColumnSexMFTest.php b/tests/app/Census/CensusColumnSexMFTest.php index 9cbe226c5b..9721bdfe12 100644 --- a/tests/app/Census/CensusColumnSexMFTest.php +++ b/tests/app/Census/CensusColumnSexMFTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnSexMF */ -class CensusColumnSexMFTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnSexMFTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMF diff --git a/tests/app/Census/CensusColumnSexMKTest.php b/tests/app/Census/CensusColumnSexMKTest.php index c1fea01f01..1c3196f237 100644 --- a/tests/app/Census/CensusColumnSexMKTest.php +++ b/tests/app/Census/CensusColumnSexMKTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnSexMK */ -class CensusColumnSexMKTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnSexMKTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMK diff --git a/tests/app/Census/CensusColumnSexMZTest.php b/tests/app/Census/CensusColumnSexMZTest.php index a2e70c1a51..9cc3955ace 100644 --- a/tests/app/Census/CensusColumnSexMZTest.php +++ b/tests/app/Census/CensusColumnSexMZTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnSexMZ */ -class CensusColumnSexMZTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnSexMZTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnSexMZ diff --git a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php index 49dfdd4b0f..26dc618b86 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNameInitialTest.php @@ -19,12 +19,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnSurnameGivenNameInitial */ -class CensusColumnSurnameGivenNameInitialTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnSurnameGivenNameInitialTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial diff --git a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php index 13d942891c..41a556f23b 100644 --- a/tests/app/Census/CensusColumnSurnameGivenNamesTest.php +++ b/tests/app/Census/CensusColumnSurnameGivenNamesTest.php @@ -19,12 +19,13 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnSurnameGivenNames */ -class CensusColumnSurnameGivenNamesTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnSurnameGivenNamesTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames diff --git a/tests/app/Census/CensusColumnSurnameTest.php b/tests/app/Census/CensusColumnSurnameTest.php index 2ba4bd53f0..05357db390 100644 --- a/tests/app/Census/CensusColumnSurnameTest.php +++ b/tests/app/Census/CensusColumnSurnameTest.php @@ -19,11 +19,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; /** * Test harness for the class CensusColumnSurname */ -class CensusColumnSurnameTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnSurnameTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnSurname diff --git a/tests/app/Census/CensusColumnYearsMarriedTest.php b/tests/app/Census/CensusColumnYearsMarriedTest.php index bbec31b1c2..5f6f04deed 100644 --- a/tests/app/Census/CensusColumnYearsMarriedTest.php +++ b/tests/app/Census/CensusColumnYearsMarriedTest.php @@ -22,12 +22,13 @@ use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Fact; use Fisharebest\Webtrees\Family; use Fisharebest\Webtrees\Individual; +use Fisharebest\Webtrees\TestCase; use Illuminate\Support\Collection; /** * Test harness for the class CensusColumnYearsMarried */ -class CensusColumnYearsMarriedTest extends \Fisharebest\Webtrees\TestCase +class CensusColumnYearsMarriedTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\CensusColumnYearsMarried diff --git a/tests/app/Census/CensusOfCzechRepublic1880Test.php b/tests/app/Census/CensusOfCzechRepublic1880Test.php index 4b94e9f68b..c5c1191de2 100644 --- a/tests/app/Census/CensusOfCzechRepublic1880Test.php +++ b/tests/app/Census/CensusOfCzechRepublic1880Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfCzechRepublic1880 */ -class CensusOfCzechRepublic1880Test extends \Fisharebest\Webtrees\TestCase +class CensusOfCzechRepublic1880Test extends TestCase { /** * Test the census place and date diff --git a/tests/app/Census/CensusOfCzechRepublic1890Test.php b/tests/app/Census/CensusOfCzechRepublic1890Test.php index 22c5079351..934c658b2f 100644 --- a/tests/app/Census/CensusOfCzechRepublic1890Test.php +++ b/tests/app/Census/CensusOfCzechRepublic1890Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfCzechRepublic1890 */ -class CensusOfCzechRepublic1890Test extends \Fisharebest\Webtrees\TestCase +class CensusOfCzechRepublic1890Test extends TestCase { /** * Test the census place and date diff --git a/tests/app/Census/CensusOfCzechRepublic1900Test.php b/tests/app/Census/CensusOfCzechRepublic1900Test.php index b554d65b45..661bdcf972 100644 --- a/tests/app/Census/CensusOfCzechRepublic1900Test.php +++ b/tests/app/Census/CensusOfCzechRepublic1900Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfCzechRepublic1900 */ -class CensusOfCzechRepublic1900Test extends \Fisharebest\Webtrees\TestCase +class CensusOfCzechRepublic1900Test extends TestCase { /** * Test the census place and date diff --git a/tests/app/Census/CensusOfCzechRepublic1910Test.php b/tests/app/Census/CensusOfCzechRepublic1910Test.php index ffee07435d..ad375b4ad2 100644 --- a/tests/app/Census/CensusOfCzechRepublic1910Test.php +++ b/tests/app/Census/CensusOfCzechRepublic1910Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfCzechRepublic1910 */ -class CensusOfCzechRepublic1910Test extends \Fisharebest\Webtrees\TestCase +class CensusOfCzechRepublic1910Test extends TestCase { /** * Test the census place and date diff --git a/tests/app/Census/CensusOfCzechRepublic1921Test.php b/tests/app/Census/CensusOfCzechRepublic1921Test.php index d38ec95815..500788b6e6 100644 --- a/tests/app/Census/CensusOfCzechRepublic1921Test.php +++ b/tests/app/Census/CensusOfCzechRepublic1921Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfCzechRepublic1921 */ -class CensusOfCzechRepublic1921Test extends \Fisharebest\Webtrees\TestCase +class CensusOfCzechRepublic1921Test extends TestCase { /** * Test the census place and date diff --git a/tests/app/Census/CensusOfCzechRepublicTest.php b/tests/app/Census/CensusOfCzechRepublicTest.php index f568c00ae6..128094cff8 100644 --- a/tests/app/Census/CensusOfCzechRepublicTest.php +++ b/tests/app/Census/CensusOfCzechRepublicTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfCzechRepublic */ -class CensusOfCzechRepublicTest extends \Fisharebest\Webtrees\TestCase +class CensusOfCzechRepublicTest extends TestCase { /** * Test the census place diff --git a/tests/app/Census/CensusOfDenmark1787Test.php b/tests/app/Census/CensusOfDenmark1787Test.php index e8d90de974..708426f07f 100644 --- a/tests/app/Census/CensusOfDenmark1787Test.php +++ b/tests/app/Census/CensusOfDenmark1787Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1787 */ -class CensusOfDenmark1787Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1787Test extends TestCase { /** * Test the census place and date @@ -53,10 +55,10 @@ class CensusOfDenmark1787Test extends \Fisharebest\Webtrees\TestCase $this->assertCount(5, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Stilling i familien', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1801Test.php b/tests/app/Census/CensusOfDenmark1801Test.php index b6559e47f6..7e54322adb 100644 --- a/tests/app/Census/CensusOfDenmark1801Test.php +++ b/tests/app/Census/CensusOfDenmark1801Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1801 */ -class CensusOfDenmark1801Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1801Test extends TestCase { /** * Test the census place and date @@ -52,11 +54,11 @@ class CensusOfDenmark1801Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(5, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Stilling i familien', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1803Test.php b/tests/app/Census/CensusOfDenmark1803Test.php index ae880fafde..675e427f25 100644 --- a/tests/app/Census/CensusOfDenmark1803Test.php +++ b/tests/app/Census/CensusOfDenmark1803Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1803 */ -class CensusOfDenmark1803Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1803Test extends TestCase { /** * Test the census place and date @@ -52,11 +54,11 @@ class CensusOfDenmark1803Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(5, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Stilling i familien', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1834Test.php b/tests/app/Census/CensusOfDenmark1834Test.php index c0a5b04e08..d2df70c352 100644 --- a/tests/app/Census/CensusOfDenmark1834Test.php +++ b/tests/app/Census/CensusOfDenmark1834Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1834 */ -class CensusOfDenmark1834Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1834Test extends TestCase { /** * Test the census place and date @@ -52,10 +54,10 @@ class CensusOfDenmark1834Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(4, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[3]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Alder', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1835Test.php b/tests/app/Census/CensusOfDenmark1835Test.php index 61560e10b1..ebda785d28 100644 --- a/tests/app/Census/CensusOfDenmark1835Test.php +++ b/tests/app/Census/CensusOfDenmark1835Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1835 */ -class CensusOfDenmark1835Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1835Test extends TestCase { /** * Test the census place and date @@ -52,10 +54,10 @@ class CensusOfDenmark1835Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(4, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[3]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Alder', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1840Test.php b/tests/app/Census/CensusOfDenmark1840Test.php index f17ff41d06..06aecce75b 100644 --- a/tests/app/Census/CensusOfDenmark1840Test.php +++ b/tests/app/Census/CensusOfDenmark1840Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1840 */ -class CensusOfDenmark1840Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1840Test extends TestCase { /** * Test the census place and date @@ -52,10 +54,10 @@ class CensusOfDenmark1840Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(4, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[3]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[3]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Alder', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1845Test.php b/tests/app/Census/CensusOfDenmark1845Test.php index 32b6193e6c..fc7958217d 100644 --- a/tests/app/Census/CensusOfDenmark1845Test.php +++ b/tests/app/Census/CensusOfDenmark1845Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1845 */ -class CensusOfDenmark1845Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1845Test extends TestCase { /** * Test the census place and date @@ -52,13 +54,13 @@ class CensusOfDenmark1845Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(7, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Alder', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1850Test.php b/tests/app/Census/CensusOfDenmark1850Test.php index a365afc39f..233da917c1 100644 --- a/tests/app/Census/CensusOfDenmark1850Test.php +++ b/tests/app/Census/CensusOfDenmark1850Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1850 */ -class CensusOfDenmark1850Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1850Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfDenmark1850Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Alder', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1855Test.php b/tests/app/Census/CensusOfDenmark1855Test.php index e8d6e0a18a..03d57dd7c0 100644 --- a/tests/app/Census/CensusOfDenmark1855Test.php +++ b/tests/app/Census/CensusOfDenmark1855Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1855 */ -class CensusOfDenmark1855Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1855Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfDenmark1855Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Alder', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1860Test.php b/tests/app/Census/CensusOfDenmark1860Test.php index adb6470014..5c8dbce311 100644 --- a/tests/app/Census/CensusOfDenmark1860Test.php +++ b/tests/app/Census/CensusOfDenmark1860Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1860 */ -class CensusOfDenmark1860Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1860Test extends TestCase { /** * Test the census place and date @@ -52,18 +54,18 @@ class CensusOfDenmark1860Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(12, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Alder', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1870Test.php b/tests/app/Census/CensusOfDenmark1870Test.php index 0ee588f960..a149c29eb8 100644 --- a/tests/app/Census/CensusOfDenmark1870Test.php +++ b/tests/app/Census/CensusOfDenmark1870Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1870 */ -class CensusOfDenmark1870Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1870Test extends TestCase { /** * Test the census place and date @@ -52,20 +54,20 @@ class CensusOfDenmark1870Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(14, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1880Test.php b/tests/app/Census/CensusOfDenmark1880Test.php index 3eaec09bdc..3d687e46c0 100644 --- a/tests/app/Census/CensusOfDenmark1880Test.php +++ b/tests/app/Census/CensusOfDenmark1880Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1880 */ -class CensusOfDenmark1880Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1880Test extends TestCase { /** * Test the census place and date @@ -52,19 +54,19 @@ class CensusOfDenmark1880Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(13, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1885Test.php b/tests/app/Census/CensusOfDenmark1885Test.php index 95d2145dd7..6915c41bf0 100644 --- a/tests/app/Census/CensusOfDenmark1885Test.php +++ b/tests/app/Census/CensusOfDenmark1885Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1885 */ -class CensusOfDenmark1885Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1885Test extends TestCase { /** * Test the census place and date @@ -52,19 +54,19 @@ class CensusOfDenmark1885Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(13, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1890Test.php b/tests/app/Census/CensusOfDenmark1890Test.php index a57a80ca38..c192e95f21 100644 --- a/tests/app/Census/CensusOfDenmark1890Test.php +++ b/tests/app/Census/CensusOfDenmark1890Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1890 */ -class CensusOfDenmark1890Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1890Test extends TestCase { /** * Test the census place and date @@ -52,21 +54,21 @@ class CensusOfDenmark1890Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(15, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[6]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1901Test.php b/tests/app/Census/CensusOfDenmark1901Test.php index 1bef9ed8f7..e1c6973610 100644 --- a/tests/app/Census/CensusOfDenmark1901Test.php +++ b/tests/app/Census/CensusOfDenmark1901Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1901 */ -class CensusOfDenmark1901Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1901Test extends TestCase { /** * Test the census place and date @@ -52,23 +54,23 @@ class CensusOfDenmark1901Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(17, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1906Test.php b/tests/app/Census/CensusOfDenmark1906Test.php index 89b637c0e9..f30c1d59ed 100644 --- a/tests/app/Census/CensusOfDenmark1906Test.php +++ b/tests/app/Census/CensusOfDenmark1906Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1906 */ -class CensusOfDenmark1906Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1906Test extends TestCase { /** * Test the census place and date @@ -52,20 +54,20 @@ class CensusOfDenmark1906Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(14, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1911Test.php b/tests/app/Census/CensusOfDenmark1911Test.php index 3a71e2656c..cbd957c6c1 100644 --- a/tests/app/Census/CensusOfDenmark1911Test.php +++ b/tests/app/Census/CensusOfDenmark1911Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1911 */ -class CensusOfDenmark1911Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1911Test extends TestCase { /** * Test the census place and date @@ -52,21 +54,21 @@ class CensusOfDenmark1911Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(15, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1916Test.php b/tests/app/Census/CensusOfDenmark1916Test.php index 3585328e34..7093a453e1 100644 --- a/tests/app/Census/CensusOfDenmark1916Test.php +++ b/tests/app/Census/CensusOfDenmark1916Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1916 */ -class CensusOfDenmark1916Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1916Test extends TestCase { /** * Test the census place and date @@ -52,18 +54,18 @@ class CensusOfDenmark1916Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(12, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[3]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[8]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1921Test.php b/tests/app/Census/CensusOfDenmark1921Test.php index 678b92a1c8..ebd1e00ad0 100644 --- a/tests/app/Census/CensusOfDenmark1921Test.php +++ b/tests/app/Census/CensusOfDenmark1921Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1921 */ -class CensusOfDenmark1921Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1921Test extends TestCase { /** * Test the census place and date @@ -52,20 +54,20 @@ class CensusOfDenmark1921Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(14, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonth::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonth::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[8]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[9]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1925Test.php b/tests/app/Census/CensusOfDenmark1925Test.php index 6b3c5627b4..3fed927a6e 100644 --- a/tests/app/Census/CensusOfDenmark1925Test.php +++ b/tests/app/Census/CensusOfDenmark1925Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1925 */ -class CensusOfDenmark1925Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1925Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfDenmark1925Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonth::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonth::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[3]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[6]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[7]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Køn', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1930Test.php b/tests/app/Census/CensusOfDenmark1930Test.php index aef133f894..455ce54f50 100644 --- a/tests/app/Census/CensusOfDenmark1930Test.php +++ b/tests/app/Census/CensusOfDenmark1930Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1930 */ -class CensusOfDenmark1930Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1930Test extends TestCase { /** * Test the census place and date @@ -52,24 +54,24 @@ class CensusOfDenmark1930Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(18, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonth::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnSurnameGivenNames::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonth::class, $columns[6]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[7]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[10]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[11]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Bopæl', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmark1940Test.php b/tests/app/Census/CensusOfDenmark1940Test.php index 71478e3487..770acd33ed 100644 --- a/tests/app/Census/CensusOfDenmark1940Test.php +++ b/tests/app/Census/CensusOfDenmark1940Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark1930 */ -class CensusOfDenmark1940Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmark1940Test extends TestCase { /** * Test the census place and date @@ -52,21 +54,21 @@ class CensusOfDenmark1940Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(15, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMK::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDaySlashMonth::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionDanish::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnSurnameGivenNames::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnSexMK::class, $columns[3]); + $this->assertInstanceOf(CensusColumnBirthDaySlashMonth::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionDanish::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[10]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); $this->assertSame('Navn', $columns[0]->abbreviation()); $this->assertSame('Nærværende', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDenmarkTest.php b/tests/app/Census/CensusOfDenmarkTest.php index 88e1f871a8..a37067b80d 100644 --- a/tests/app/Census/CensusOfDenmarkTest.php +++ b/tests/app/Census/CensusOfDenmarkTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDenmark */ -class CensusOfDenmarkTest extends \Fisharebest\Webtrees\TestCase +class CensusOfDenmarkTest extends TestCase { /** * Test the census place @@ -51,27 +53,27 @@ class CensusOfDenmarkTest extends \Fisharebest\Webtrees\TestCase $census_dates = $census->allCensusDates(); $this->assertCount(22, $census_dates); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1787::class, $census_dates[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1801::class, $census_dates[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1803::class, $census_dates[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1834::class, $census_dates[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1835::class, $census_dates[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1840::class, $census_dates[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1845::class, $census_dates[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1850::class, $census_dates[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1855::class, $census_dates[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1860::class, $census_dates[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1870::class, $census_dates[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1880::class, $census_dates[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1885::class, $census_dates[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1890::class, $census_dates[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1901::class, $census_dates[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1906::class, $census_dates[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1911::class, $census_dates[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1916::class, $census_dates[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1921::class, $census_dates[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1925::class, $census_dates[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1930::class, $census_dates[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark1940::class, $census_dates[21]); + $this->assertInstanceOf(CensusOfDenmark1787::class, $census_dates[0]); + $this->assertInstanceOf(CensusOfDenmark1801::class, $census_dates[1]); + $this->assertInstanceOf(CensusOfDenmark1803::class, $census_dates[2]); + $this->assertInstanceOf(CensusOfDenmark1834::class, $census_dates[3]); + $this->assertInstanceOf(CensusOfDenmark1835::class, $census_dates[4]); + $this->assertInstanceOf(CensusOfDenmark1840::class, $census_dates[5]); + $this->assertInstanceOf(CensusOfDenmark1845::class, $census_dates[6]); + $this->assertInstanceOf(CensusOfDenmark1850::class, $census_dates[7]); + $this->assertInstanceOf(CensusOfDenmark1855::class, $census_dates[8]); + $this->assertInstanceOf(CensusOfDenmark1860::class, $census_dates[9]); + $this->assertInstanceOf(CensusOfDenmark1870::class, $census_dates[10]); + $this->assertInstanceOf(CensusOfDenmark1880::class, $census_dates[11]); + $this->assertInstanceOf(CensusOfDenmark1885::class, $census_dates[12]); + $this->assertInstanceOf(CensusOfDenmark1890::class, $census_dates[13]); + $this->assertInstanceOf(CensusOfDenmark1901::class, $census_dates[14]); + $this->assertInstanceOf(CensusOfDenmark1906::class, $census_dates[15]); + $this->assertInstanceOf(CensusOfDenmark1911::class, $census_dates[16]); + $this->assertInstanceOf(CensusOfDenmark1916::class, $census_dates[17]); + $this->assertInstanceOf(CensusOfDenmark1921::class, $census_dates[18]); + $this->assertInstanceOf(CensusOfDenmark1925::class, $census_dates[19]); + $this->assertInstanceOf(CensusOfDenmark1930::class, $census_dates[20]); + $this->assertInstanceOf(CensusOfDenmark1940::class, $census_dates[21]); } } diff --git a/tests/app/Census/CensusOfDeutschland1819Test.php b/tests/app/Census/CensusOfDeutschland1819Test.php index b177663b7d..37f29a1798 100644 --- a/tests/app/Census/CensusOfDeutschland1819Test.php +++ b/tests/app/Census/CensusOfDeutschland1819Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDeutschland1819 */ -class CensusOfDeutschland1819Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDeutschland1819Test extends TestCase { /** * Test the census place and date @@ -52,19 +54,19 @@ class CensusOfDeutschland1819Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(13, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[3]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); $this->assertSame('Nr.', $columns[0]->abbreviation()); $this->assertSame('Geschlecht', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDeutschland1867Test.php b/tests/app/Census/CensusOfDeutschland1867Test.php index 0b38fb64ca..17d93cddd0 100644 --- a/tests/app/Census/CensusOfDeutschland1867Test.php +++ b/tests/app/Census/CensusOfDeutschland1867Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDeutschland1867 */ -class CensusOfDeutschland1867Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDeutschland1867Test extends TestCase { /** * Test the census place and date @@ -52,29 +54,29 @@ class CensusOfDeutschland1867Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(23, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHeadGerman::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[5]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnRelationToHeadGerman::class, $columns[11]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); $this->assertSame('1.Nr.', $columns[0]->abbreviation()); $this->assertSame('2.Vorname', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDeutschland1900Test.php b/tests/app/Census/CensusOfDeutschland1900Test.php index 7847b15ee1..73695678ea 100644 --- a/tests/app/Census/CensusOfDeutschland1900Test.php +++ b/tests/app/Census/CensusOfDeutschland1900Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDeutschland1900 */ -class CensusOfDeutschland1900Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDeutschland1900Test extends TestCase { /** * Test the census place and date @@ -52,33 +54,33 @@ class CensusOfDeutschland1900Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(27, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHeadGerman::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDayDotMonthYear::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[26]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[2]); + $this->assertInstanceOf(CensusColumnRelationToHeadGerman::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnBirthDayDotMonthYear::class, $columns[13]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[26]); $this->assertSame('Lfd.Nr.', $columns[0]->abbreviation()); $this->assertSame('Vorname', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDeutschland1919Test.php b/tests/app/Census/CensusOfDeutschland1919Test.php index 8fd41d6029..80563d0d36 100644 --- a/tests/app/Census/CensusOfDeutschland1919Test.php +++ b/tests/app/Census/CensusOfDeutschland1919Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDeutschland1919 */ -class CensusOfDeutschland1919Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDeutschland1919Test extends TestCase { /** * Test the census place and date @@ -52,23 +54,23 @@ class CensusOfDeutschland1919Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(17, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHeadGerman::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDay::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthMonth::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[2]); + $this->assertInstanceOf(CensusColumnRelationToHeadGerman::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnBirthDay::class, $columns[7]); + $this->assertInstanceOf(CensusColumnBirthMonth::class, $columns[8]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[9]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); $this->assertSame('Nummer', $columns[0]->abbreviation()); $this->assertSame('Vorname', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDeutschlandNL1867Test.php b/tests/app/Census/CensusOfDeutschlandNL1867Test.php index c241b1769a..e6a5dafdb6 100644 --- a/tests/app/Census/CensusOfDeutschlandNL1867Test.php +++ b/tests/app/Census/CensusOfDeutschlandNL1867Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDeutschlandNL1867 */ -class CensusOfDeutschlandNL1867Test extends \Fisharebest\Webtrees\TestCase +class CensusOfDeutschlandNL1867Test extends TestCase { /** * Test the census place and date @@ -52,24 +54,24 @@ class CensusOfDeutschlandNL1867Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(18, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnReligion::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[5]); + $this->assertInstanceOf(CensusColumnReligion::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); $this->assertSame('1.Nr.', $columns[0]->abbreviation()); $this->assertSame('2.Vorname', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfDeutschlandTest.php b/tests/app/Census/CensusOfDeutschlandTest.php index dd5db0e9db..afbfce3ac3 100644 --- a/tests/app/Census/CensusOfDeutschlandTest.php +++ b/tests/app/Census/CensusOfDeutschlandTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfDeutschland */ -class CensusOfDeutschlandTest extends \Fisharebest\Webtrees\TestCase +class CensusOfDeutschlandTest extends TestCase { /** * Test the census place @@ -51,10 +53,10 @@ class CensusOfDeutschlandTest extends \Fisharebest\Webtrees\TestCase $census_dates = $census->allCensusDates(); $this->assertCount(5, $census_dates); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDeutschland1819::class, $census_dates[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDeutschland1867::class, $census_dates[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDeutschlandNL1867::class, $census_dates[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDeutschland1900::class, $census_dates[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDeutschland1919::class, $census_dates[4]); + $this->assertInstanceOf(CensusOfDeutschland1819::class, $census_dates[0]); + $this->assertInstanceOf(CensusOfDeutschland1867::class, $census_dates[1]); + $this->assertInstanceOf(CensusOfDeutschlandNL1867::class, $census_dates[2]); + $this->assertInstanceOf(CensusOfDeutschland1900::class, $census_dates[3]); + $this->assertInstanceOf(CensusOfDeutschland1919::class, $census_dates[4]); } } diff --git a/tests/app/Census/CensusOfEngland1841Test.php b/tests/app/Census/CensusOfEngland1841Test.php index a2c1bd83d3..33c241637f 100644 --- a/tests/app/Census/CensusOfEngland1841Test.php +++ b/tests/app/Census/CensusOfEngland1841Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1841 */ -class CensusOfEngland1841Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1841Test extends TestCase { /** * Test the census place and date @@ -52,12 +54,12 @@ class CensusOfEngland1841Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(6, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBornForeignParts::class, $columns[5]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAgeMale5Years::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAgeFemale5Years::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('AgeM', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEngland1851Test.php b/tests/app/Census/CensusOfEngland1851Test.php index ec1aa928a8..fc8c129fba 100644 --- a/tests/app/Census/CensusOfEngland1851Test.php +++ b/tests/app/Census/CensusOfEngland1851Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1851 */ -class CensusOfEngland1851Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1851Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfEngland1851Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEngland1861Test.php b/tests/app/Census/CensusOfEngland1861Test.php index 8855dd1b05..9ad09ea0d5 100644 --- a/tests/app/Census/CensusOfEngland1861Test.php +++ b/tests/app/Census/CensusOfEngland1861Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1861 */ -class CensusOfEngland1861Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1861Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfEngland1861Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php index 9ebab5a2dc..8a039475cd 100644 --- a/tests/app/Census/CensusOfEngland1871Test.php +++ b/tests/app/Census/CensusOfEngland1871Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1871 */ -class CensusOfEngland1871Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1871Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfEngland1871Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php index 2b5adfd11a..2e2c9c250b 100644 --- a/tests/app/Census/CensusOfEngland1881Test.php +++ b/tests/app/Census/CensusOfEngland1881Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1881 */ -class CensusOfEngland1881Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1881Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfEngland1881Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); // Infirm, etc. + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); // Infirm, etc. $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php index d92b86515a..52c7f725e7 100644 --- a/tests/app/Census/CensusOfEngland1891Test.php +++ b/tests/app/Census/CensusOfEngland1891Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1891 */ -class CensusOfEngland1891Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1891Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfEngland1891Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php index 8714beaee4..9bee037cb8 100644 --- a/tests/app/Census/CensusOfEngland1901Test.php +++ b/tests/app/Census/CensusOfEngland1901Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1901 */ -class CensusOfEngland1901Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1901Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfEngland1901Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php index 12694e850f..b644d45ee5 100644 --- a/tests/app/Census/CensusOfEngland1911Test.php +++ b/tests/app/Census/CensusOfEngland1911Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland1911 */ -class CensusOfEngland1911Test extends \Fisharebest\Webtrees\TestCase +class CensusOfEngland1911Test extends TestCase { /** * Test the census place and date @@ -52,22 +54,22 @@ class CensusOfEngland1911Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(16, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnYearsMarried::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenLiving::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenDied::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); + $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[5]); + $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[6]); + $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[7]); + $this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[8]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfEnglandTest.php b/tests/app/Census/CensusOfEnglandTest.php index a7e05b182e..f29f3db453 100644 --- a/tests/app/Census/CensusOfEnglandTest.php +++ b/tests/app/Census/CensusOfEnglandTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfEngland */ -class CensusOfEnglandTest extends \Fisharebest\Webtrees\TestCase +class CensusOfEnglandTest extends TestCase { /** * Test the census place @@ -51,14 +53,14 @@ class CensusOfEnglandTest extends \Fisharebest\Webtrees\TestCase $census_dates = $census->allCensusDates(); $this->assertCount(9, $census_dates); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1841::class, $census_dates[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1851::class, $census_dates[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1861::class, $census_dates[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1871::class, $census_dates[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1881::class, $census_dates[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1891::class, $census_dates[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1901::class, $census_dates[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland1911::class, $census_dates[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\RegisterOfEngland1939::class, $census_dates[8]); + $this->assertInstanceOf(CensusOfEngland1841::class, $census_dates[0]); + $this->assertInstanceOf(CensusOfEngland1851::class, $census_dates[1]); + $this->assertInstanceOf(CensusOfEngland1861::class, $census_dates[2]); + $this->assertInstanceOf(CensusOfEngland1871::class, $census_dates[3]); + $this->assertInstanceOf(CensusOfEngland1881::class, $census_dates[4]); + $this->assertInstanceOf(CensusOfEngland1891::class, $census_dates[5]); + $this->assertInstanceOf(CensusOfEngland1901::class, $census_dates[6]); + $this->assertInstanceOf(CensusOfEngland1911::class, $census_dates[7]); + $this->assertInstanceOf(RegisterOfEngland1939::class, $census_dates[8]); } } diff --git a/tests/app/Census/CensusOfFrance1831Test.php b/tests/app/Census/CensusOfFrance1831Test.php index 9518727c87..e9269d1e57 100644 --- a/tests/app/Census/CensusOfFrance1831Test.php +++ b/tests/app/Census/CensusOfFrance1831Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1836 */ -class CensusOfFrance1831Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1831Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfFrance1831Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1836Test.php b/tests/app/Census/CensusOfFrance1836Test.php index e32be909fb..cbf098182f 100644 --- a/tests/app/Census/CensusOfFrance1836Test.php +++ b/tests/app/Census/CensusOfFrance1836Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1836 */ -class CensusOfFrance1836Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1836Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfFrance1836Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1841Test.php b/tests/app/Census/CensusOfFrance1841Test.php index d8f98223dc..ae9c6aa257 100644 --- a/tests/app/Census/CensusOfFrance1841Test.php +++ b/tests/app/Census/CensusOfFrance1841Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1841 */ -class CensusOfFrance1841Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1841Test extends TestCase { /** * Test the census place and date @@ -52,15 +54,15 @@ class CensusOfFrance1841Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(9, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1846Test.php b/tests/app/Census/CensusOfFrance1846Test.php index ea16eae1bb..6b980f7e7e 100644 --- a/tests/app/Census/CensusOfFrance1846Test.php +++ b/tests/app/Census/CensusOfFrance1846Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1846 */ -class CensusOfFrance1846Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1846Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfFrance1846Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1851Test.php b/tests/app/Census/CensusOfFrance1851Test.php index d2a740e2cd..fbb6120869 100644 --- a/tests/app/Census/CensusOfFrance1851Test.php +++ b/tests/app/Census/CensusOfFrance1851Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1851 */ -class CensusOfFrance1851Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1851Test extends TestCase { /** * Test the census place and date @@ -52,19 +54,19 @@ class CensusOfFrance1851Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(13, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1856Test.php b/tests/app/Census/CensusOfFrance1856Test.php index 06c7e9bd3d..2391c6be95 100644 --- a/tests/app/Census/CensusOfFrance1856Test.php +++ b/tests/app/Census/CensusOfFrance1856Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1856 */ -class CensusOfFrance1856Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1856Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfFrance1856Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1861Test.php b/tests/app/Census/CensusOfFrance1861Test.php index a8443fe9e2..4840135f57 100644 --- a/tests/app/Census/CensusOfFrance1861Test.php +++ b/tests/app/Census/CensusOfFrance1861Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1861 */ -class CensusOfFrance1861Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1861Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfFrance1861Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1866Test.php b/tests/app/Census/CensusOfFrance1866Test.php index 649ebbf82d..c3ab7f9c27 100644 --- a/tests/app/Census/CensusOfFrance1866Test.php +++ b/tests/app/Census/CensusOfFrance1866Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1866 */ -class CensusOfFrance1866Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1866Test extends TestCase { /** * Test the census place and date @@ -52,16 +54,16 @@ class CensusOfFrance1866Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(10, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1872Test.php b/tests/app/Census/CensusOfFrance1872Test.php index 84bd268647..3f9aba1294 100644 --- a/tests/app/Census/CensusOfFrance1872Test.php +++ b/tests/app/Census/CensusOfFrance1872Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1872 */ -class CensusOfFrance1872Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1872Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfFrance1872Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[10]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[10]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1876Test.php b/tests/app/Census/CensusOfFrance1876Test.php index 9f39439a6f..bcdbe9363a 100644 --- a/tests/app/Census/CensusOfFrance1876Test.php +++ b/tests/app/Census/CensusOfFrance1876Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1876 */ -class CensusOfFrance1876Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1876Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfFrance1876Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchGarcon::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchHomme::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuf::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFille::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchFemme::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionFrenchVeuve::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[10]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[2]); + $this->assertInstanceOf(CensusColumnConditionFrenchGarcon::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionFrenchHomme::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuf::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionFrenchFille::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionFrenchFemme::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionFrenchVeuve::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[9]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[10]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1881Test.php b/tests/app/Census/CensusOfFrance1881Test.php index 720644014a..66e41ce3c9 100644 --- a/tests/app/Census/CensusOfFrance1881Test.php +++ b/tests/app/Census/CensusOfFrance1881Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1881 */ -class CensusOfFrance1881Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1881Test extends TestCase { /** * Test the census place and date @@ -52,11 +54,11 @@ class CensusOfFrance1881Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(5, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[4]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1886Test.php b/tests/app/Census/CensusOfFrance1886Test.php index a739689d98..f0c0d52514 100644 --- a/tests/app/Census/CensusOfFrance1886Test.php +++ b/tests/app/Census/CensusOfFrance1886Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1886 */ -class CensusOfFrance1886Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1886Test extends TestCase { /** * Test the census place and date @@ -52,12 +54,12 @@ class CensusOfFrance1886Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(6, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1891Test.php b/tests/app/Census/CensusOfFrance1891Test.php index d611d361a8..ff5fafba20 100644 --- a/tests/app/Census/CensusOfFrance1891Test.php +++ b/tests/app/Census/CensusOfFrance1891Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1891 */ -class CensusOfFrance1891Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1891Test extends TestCase { /** * Test the census place and date @@ -52,12 +54,12 @@ class CensusOfFrance1891Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(6, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1896Test.php b/tests/app/Census/CensusOfFrance1896Test.php index 897dcf79ae..612bfe4475 100644 --- a/tests/app/Census/CensusOfFrance1896Test.php +++ b/tests/app/Census/CensusOfFrance1896Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1896 */ -class CensusOfFrance1896Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1896Test extends TestCase { /** * Test the census place and date @@ -52,12 +54,12 @@ class CensusOfFrance1896Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(6, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1901Test.php b/tests/app/Census/CensusOfFrance1901Test.php index e8e6f757be..1186f8a3ee 100644 --- a/tests/app/Census/CensusOfFrance1901Test.php +++ b/tests/app/Census/CensusOfFrance1901Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1901 */ -class CensusOfFrance1901Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1901Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfFrance1901Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[3]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1906Test.php b/tests/app/Census/CensusOfFrance1906Test.php index a30ba5704e..0c2f937924 100644 --- a/tests/app/Census/CensusOfFrance1906Test.php +++ b/tests/app/Census/CensusOfFrance1906Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1906 */ -class CensusOfFrance1906Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1906Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfFrance1906Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1911Test.php b/tests/app/Census/CensusOfFrance1911Test.php index 0a31e16fd3..6c70e3313c 100644 --- a/tests/app/Census/CensusOfFrance1911Test.php +++ b/tests/app/Census/CensusOfFrance1911Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1911 */ -class CensusOfFrance1911Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1911Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfFrance1911Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1921Test.php b/tests/app/Census/CensusOfFrance1921Test.php index 88256fa178..6ca8b4b1e4 100644 --- a/tests/app/Census/CensusOfFrance1921Test.php +++ b/tests/app/Census/CensusOfFrance1921Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1921 */ -class CensusOfFrance1921Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1921Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfFrance1921Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1926Test.php b/tests/app/Census/CensusOfFrance1926Test.php index d5dbfb373f..f29709e693 100644 --- a/tests/app/Census/CensusOfFrance1926Test.php +++ b/tests/app/Census/CensusOfFrance1926Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1926 */ -class CensusOfFrance1926Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1926Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfFrance1926Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1931Test.php b/tests/app/Census/CensusOfFrance1931Test.php index 5b90e9322a..827eca2302 100644 --- a/tests/app/Census/CensusOfFrance1931Test.php +++ b/tests/app/Census/CensusOfFrance1931Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1931 */ -class CensusOfFrance1931Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1931Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfFrance1931Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1936Test.php b/tests/app/Census/CensusOfFrance1936Test.php index 3ff219d21b..dd9d32663b 100644 --- a/tests/app/Census/CensusOfFrance1936Test.php +++ b/tests/app/Census/CensusOfFrance1936Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1936 */ -class CensusOfFrance1936Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1936Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfFrance1936Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[4]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[5]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Noms', $columns[0]->abbreviation()); $this->assertSame('Prénoms', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFrance1946Test.php b/tests/app/Census/CensusOfFrance1946Test.php index 5fb1f3ad3e..eb4bda7b0b 100644 --- a/tests/app/Census/CensusOfFrance1946Test.php +++ b/tests/app/Census/CensusOfFrance1946Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance1946 */ -class CensusOfFrance1946Test extends \Fisharebest\Webtrees\TestCase +class CensusOfFrance1946Test extends TestCase { /** * Test the census place and date @@ -52,12 +54,12 @@ class CensusOfFrance1946Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(6, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNames::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnSurname::class, $columns[0]); + $this->assertInstanceOf(CensusColumnGivenNames::class, $columns[1]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[2]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); $this->assertSame('Nom', $columns[0]->abbreviation()); $this->assertSame('Prénom', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfFranceTest.php b/tests/app/Census/CensusOfFranceTest.php index 081fa8596f..e81ccd72aa 100644 --- a/tests/app/Census/CensusOfFranceTest.php +++ b/tests/app/Census/CensusOfFranceTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfFrance */ -class CensusOfFranceTest extends \Fisharebest\Webtrees\TestCase +class CensusOfFranceTest extends TestCase { /** * Test the census place @@ -51,27 +53,27 @@ class CensusOfFranceTest extends \Fisharebest\Webtrees\TestCase $census_dates = $census->allCensusDates(); $this->assertCount(22, $census_dates); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1831::class, $census_dates[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1836::class, $census_dates[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1841::class, $census_dates[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1846::class, $census_dates[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1851::class, $census_dates[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1856::class, $census_dates[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1861::class, $census_dates[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1866::class, $census_dates[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1872::class, $census_dates[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1876::class, $census_dates[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1881::class, $census_dates[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1886::class, $census_dates[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1891::class, $census_dates[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1896::class, $census_dates[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1901::class, $census_dates[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1906::class, $census_dates[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1911::class, $census_dates[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1921::class, $census_dates[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1926::class, $census_dates[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1931::class, $census_dates[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1936::class, $census_dates[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance1946::class, $census_dates[21]); + $this->assertInstanceOf(CensusOfFrance1831::class, $census_dates[0]); + $this->assertInstanceOf(CensusOfFrance1836::class, $census_dates[1]); + $this->assertInstanceOf(CensusOfFrance1841::class, $census_dates[2]); + $this->assertInstanceOf(CensusOfFrance1846::class, $census_dates[3]); + $this->assertInstanceOf(CensusOfFrance1851::class, $census_dates[4]); + $this->assertInstanceOf(CensusOfFrance1856::class, $census_dates[5]); + $this->assertInstanceOf(CensusOfFrance1861::class, $census_dates[6]); + $this->assertInstanceOf(CensusOfFrance1866::class, $census_dates[7]); + $this->assertInstanceOf(CensusOfFrance1872::class, $census_dates[8]); + $this->assertInstanceOf(CensusOfFrance1876::class, $census_dates[9]); + $this->assertInstanceOf(CensusOfFrance1881::class, $census_dates[10]); + $this->assertInstanceOf(CensusOfFrance1886::class, $census_dates[11]); + $this->assertInstanceOf(CensusOfFrance1891::class, $census_dates[12]); + $this->assertInstanceOf(CensusOfFrance1896::class, $census_dates[13]); + $this->assertInstanceOf(CensusOfFrance1901::class, $census_dates[14]); + $this->assertInstanceOf(CensusOfFrance1906::class, $census_dates[15]); + $this->assertInstanceOf(CensusOfFrance1911::class, $census_dates[16]); + $this->assertInstanceOf(CensusOfFrance1921::class, $census_dates[17]); + $this->assertInstanceOf(CensusOfFrance1926::class, $census_dates[18]); + $this->assertInstanceOf(CensusOfFrance1931::class, $census_dates[19]); + $this->assertInstanceOf(CensusOfFrance1936::class, $census_dates[20]); + $this->assertInstanceOf(CensusOfFrance1946::class, $census_dates[21]); } } diff --git a/tests/app/Census/CensusOfScotland1841Test.php b/tests/app/Census/CensusOfScotland1841Test.php index 2c52d42d7a..4fc5d58a4a 100644 --- a/tests/app/Census/CensusOfScotland1841Test.php +++ b/tests/app/Census/CensusOfScotland1841Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1841 */ -class CensusOfScotland1841Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1841Test extends TestCase { /** * Test the census place and date @@ -52,12 +54,12 @@ class CensusOfScotland1841Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(6, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBornForeignParts::class, $columns[5]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAgeMale5Years::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAgeFemale5Years::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('AgeM', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotland1851Test.php b/tests/app/Census/CensusOfScotland1851Test.php index 502d02beca..7c0153583c 100644 --- a/tests/app/Census/CensusOfScotland1851Test.php +++ b/tests/app/Census/CensusOfScotland1851Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1851 */ -class CensusOfScotland1851Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1851Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfScotland1851Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php index eb026889ad..ae0218f461 100644 --- a/tests/app/Census/CensusOfScotland1861Test.php +++ b/tests/app/Census/CensusOfScotland1861Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1861 */ -class CensusOfScotland1861Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1861Test extends TestCase { /** * Test the census place and date @@ -52,15 +54,15 @@ class CensusOfScotland1861Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(9, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php index 9262bb544b..39b7217b52 100644 --- a/tests/app/Census/CensusOfScotland1871Test.php +++ b/tests/app/Census/CensusOfScotland1871Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1871 */ -class CensusOfScotland1871Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1871Test extends TestCase { /** * Test the census place and date @@ -52,15 +54,15 @@ class CensusOfScotland1871Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(9, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php index f9ce56445c..48ec0a0444 100644 --- a/tests/app/Census/CensusOfScotland1881Test.php +++ b/tests/app/Census/CensusOfScotland1881Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1881 */ -class CensusOfScotland1881Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1881Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfScotland1881Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php index a75b88cd50..2715515b84 100644 --- a/tests/app/Census/CensusOfScotland1891Test.php +++ b/tests/app/Census/CensusOfScotland1891Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1891 */ -class CensusOfScotland1891Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1891Test extends TestCase { /** * Test the census place and date @@ -52,18 +54,18 @@ class CensusOfScotland1891Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(12, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php index 65ea5e708b..708eecce40 100644 --- a/tests/app/Census/CensusOfScotland1901Test.php +++ b/tests/app/Census/CensusOfScotland1901Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1901 */ -class CensusOfScotland1901Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1901Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfScotland1901Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php index 8f6f59f50f..0d508ebfd1 100644 --- a/tests/app/Census/CensusOfScotland1911Test.php +++ b/tests/app/Census/CensusOfScotland1911Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland1911 */ -class CensusOfScotland1911Test extends \Fisharebest\Webtrees\TestCase +class CensusOfScotland1911Test extends TestCase { /** * Test the census place and date @@ -52,23 +54,23 @@ class CensusOfScotland1911Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(17, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnYearsMarried::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenLiving::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenDied::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[5]); + $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[6]); + $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[7]); + $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[8]); + $this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[9]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfScotlandTest.php b/tests/app/Census/CensusOfScotlandTest.php index be92827f00..1521a750b1 100644 --- a/tests/app/Census/CensusOfScotlandTest.php +++ b/tests/app/Census/CensusOfScotlandTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfScotland */ -class CensusOfScotlandTest extends \Fisharebest\Webtrees\TestCase +class CensusOfScotlandTest extends TestCase { /** * Test the census place @@ -51,13 +53,13 @@ class CensusOfScotlandTest extends \Fisharebest\Webtrees\TestCase $census_dates = $census->allCensusDates(); $this->assertCount(8, $census_dates); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1841::class, $census_dates[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1851::class, $census_dates[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1861::class, $census_dates[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1871::class, $census_dates[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1881::class, $census_dates[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1891::class, $census_dates[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1901::class, $census_dates[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland1911::class, $census_dates[7]); + $this->assertInstanceOf(CensusOfScotland1841::class, $census_dates[0]); + $this->assertInstanceOf(CensusOfScotland1851::class, $census_dates[1]); + $this->assertInstanceOf(CensusOfScotland1861::class, $census_dates[2]); + $this->assertInstanceOf(CensusOfScotland1871::class, $census_dates[3]); + $this->assertInstanceOf(CensusOfScotland1881::class, $census_dates[4]); + $this->assertInstanceOf(CensusOfScotland1891::class, $census_dates[5]); + $this->assertInstanceOf(CensusOfScotland1901::class, $census_dates[6]); + $this->assertInstanceOf(CensusOfScotland1911::class, $census_dates[7]); } } diff --git a/tests/app/Census/CensusOfUnitedStates1790Test.php b/tests/app/Census/CensusOfUnitedStates1790Test.php index e431725ad7..6ade8851e0 100644 --- a/tests/app/Census/CensusOfUnitedStates1790Test.php +++ b/tests/app/Census/CensusOfUnitedStates1790Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1790 */ -class CensusOfUnitedStates1790Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1790Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfUnitedStates1790Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Occupation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1800Test.php b/tests/app/Census/CensusOfUnitedStates1800Test.php index 3aaec10f76..3446d10021 100644 --- a/tests/app/Census/CensusOfUnitedStates1800Test.php +++ b/tests/app/Census/CensusOfUnitedStates1800Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1800 */ -class CensusOfUnitedStates1800Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1800Test extends TestCase { /** * Test the census place and date @@ -52,20 +54,20 @@ class CensusOfUnitedStates1800Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(14, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('M0-10', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1810Test.php b/tests/app/Census/CensusOfUnitedStates1810Test.php index 49f0a9b087..b44e73b252 100644 --- a/tests/app/Census/CensusOfUnitedStates1810Test.php +++ b/tests/app/Census/CensusOfUnitedStates1810Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1810 */ -class CensusOfUnitedStates1810Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1810Test extends TestCase { /** * Test the census place and date @@ -52,20 +54,20 @@ class CensusOfUnitedStates1810Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(14, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('M0-10', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1820Test.php b/tests/app/Census/CensusOfUnitedStates1820Test.php index e200442abb..a8f645e396 100644 --- a/tests/app/Census/CensusOfUnitedStates1820Test.php +++ b/tests/app/Census/CensusOfUnitedStates1820Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1820 */ -class CensusOfUnitedStates1820Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1820Test extends TestCase { /** * Test the census place and date @@ -52,38 +54,38 @@ class CensusOfUnitedStates1820Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(32, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[26]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[27]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[28]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[29]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[30]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[31]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[26]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[27]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[28]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[29]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[30]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[31]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('M0-10', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1830Test.php b/tests/app/Census/CensusOfUnitedStates1830Test.php index 16452678e1..003901b90e 100644 --- a/tests/app/Census/CensusOfUnitedStates1830Test.php +++ b/tests/app/Census/CensusOfUnitedStates1830Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1830 */ -class CensusOfUnitedStates1830Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1830Test extends TestCase { /** * Test the census place and date @@ -52,57 +54,57 @@ class CensusOfUnitedStates1830Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(51, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[26]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[27]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[28]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[29]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[30]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[31]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[32]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[33]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[34]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[35]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[36]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[37]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[38]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[39]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[40]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[41]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[42]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[43]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[44]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[45]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[46]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[47]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[48]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[49]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[50]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[26]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[27]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[28]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[29]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[30]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[31]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[32]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[33]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[34]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[35]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[36]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[37]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[38]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[39]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[40]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[41]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[42]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[43]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[44]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[45]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[46]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[47]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[48]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[49]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[50]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('M0', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1840Test.php b/tests/app/Census/CensusOfUnitedStates1840Test.php index 543eb19bc6..acf1fdec8f 100644 --- a/tests/app/Census/CensusOfUnitedStates1840Test.php +++ b/tests/app/Census/CensusOfUnitedStates1840Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1840 */ -class CensusOfUnitedStates1840Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1840Test extends TestCase { /** * Test the census place and date @@ -52,45 +54,45 @@ class CensusOfUnitedStates1840Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(39, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[26]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[27]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[28]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[29]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[30]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[31]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[32]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[33]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[34]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[35]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[36]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[37]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[38]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[26]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[27]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[28]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[29]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[30]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[31]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[32]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[33]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[34]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[35]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[36]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[37]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[38]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('M0', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1850Test.php b/tests/app/Census/CensusOfUnitedStates1850Test.php index 4e96e9c792..35f77ce225 100644 --- a/tests/app/Census/CensusOfUnitedStates1850Test.php +++ b/tests/app/Census/CensusOfUnitedStates1850Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1850 */ -class CensusOfUnitedStates1850Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1850Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfUnitedStates1850Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnMarriedWithinYear::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Age', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1860Test.php b/tests/app/Census/CensusOfUnitedStates1860Test.php index b31df19dd0..cc80149cb8 100644 --- a/tests/app/Census/CensusOfUnitedStates1860Test.php +++ b/tests/app/Census/CensusOfUnitedStates1860Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1860 */ -class CensusOfUnitedStates1860Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1860Test extends TestCase { /** * Test the census place and date @@ -52,18 +54,18 @@ class CensusOfUnitedStates1860Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(12, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[7]); + $this->assertInstanceOf(CensusColumnMarriedWithinYear::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Age', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1870Test.php b/tests/app/Census/CensusOfUnitedStates1870Test.php index 439282126f..8e3d53f974 100644 --- a/tests/app/Census/CensusOfUnitedStates1870Test.php +++ b/tests/app/Census/CensusOfUnitedStates1870Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1870 */ -class CensusOfUnitedStates1870Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1870Test extends TestCase { /** * Test the census place and date @@ -52,24 +54,24 @@ class CensusOfUnitedStates1870Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(18, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherForeign::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMotherForeign::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFatherForeign::class, $columns[8]); + $this->assertInstanceOf(CensusColumnMotherForeign::class, $columns[9]); + $this->assertInstanceOf(CensusColumnMonthIfBornWithinYear::class, $columns[10]); + $this->assertInstanceOf(CensusColumnMonthIfMarriedWithinYear::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Age', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1880Test.php b/tests/app/Census/CensusOfUnitedStates1880Test.php index 4cd55dd68c..756008651d 100644 --- a/tests/app/Census/CensusOfUnitedStates1880Test.php +++ b/tests/app/Census/CensusOfUnitedStates1880Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1880 */ -class CensusOfUnitedStates1880Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1880Test extends TestCase { /** * Test the census place and date @@ -52,29 +54,29 @@ class CensusOfUnitedStates1880Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(23, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMonthIfBornWithinYear::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMarriedWithinYear::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple::class, $columns[22]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $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(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnMarriedWithinYear::class, $columns[8]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[20]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[21]); + $this->assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[22]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Age', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1890Test.php b/tests/app/Census/CensusOfUnitedStates1890Test.php index 8259309408..636c2d9bba 100644 --- a/tests/app/Census/CensusOfUnitedStates1890Test.php +++ b/tests/app/Census/CensusOfUnitedStates1890Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1890 */ -class CensusOfUnitedStates1890Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1890Test extends TestCase { /** * Test the census place and date @@ -52,30 +54,30 @@ class CensusOfUnitedStates1890Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(24, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnGivenNameInitial::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurname::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionUs::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMonthIfMarriedWithinYear::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); + $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(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[5]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionUs::class, $columns[7]); + $this->assertInstanceOf(CensusColumnMonthIfMarriedWithinYear::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[10]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[11]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Surname', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1900Test.php b/tests/app/Census/CensusOfUnitedStates1900Test.php index 15d5b6b2e1..056431e117 100644 --- a/tests/app/Census/CensusOfUnitedStates1900Test.php +++ b/tests/app/Census/CensusOfUnitedStates1900Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1900 */ -class CensusOfUnitedStates1900Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1900Test extends TestCase { /** * Test the census place and date @@ -52,32 +54,32 @@ class CensusOfUnitedStates1900Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(26, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthMonth::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthYear::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionUs::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnYearsMarried::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenLiving::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[3]); + $this->assertInstanceOf(CensusColumnBirthMonth::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthYear::class, $columns[5]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionUs::class, $columns[7]); + $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[8]); + $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[9]); + $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[10]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[11]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[12]); + $this->assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1910Test.php b/tests/app/Census/CensusOfUnitedStates1910Test.php index 796c34c249..321a665dfc 100644 --- a/tests/app/Census/CensusOfUnitedStates1910Test.php +++ b/tests/app/Census/CensusOfUnitedStates1910Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1910 */ -class CensusOfUnitedStates1910Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1910Test extends TestCase { /** * Test the census place and date @@ -52,35 +54,35 @@ class CensusOfUnitedStates1910Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(29, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionUs::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnYearsMarried::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenLiving::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[26]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[27]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[28]); + $this->assertInstanceOf(CensusColumnSurnameGivenNameInitial::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[4]); + $this->assertInstanceOf(CensusColumnConditionUs::class, $columns[5]); + $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[6]); + $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[7]); + $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[8]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[9]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[10]); + $this->assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[14]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[26]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[27]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[28]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1920Test.php b/tests/app/Census/CensusOfUnitedStates1920Test.php index 5095f7240d..31b5f64d11 100644 --- a/tests/app/Census/CensusOfUnitedStates1920Test.php +++ b/tests/app/Census/CensusOfUnitedStates1920Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1920 */ -class CensusOfUnitedStates1920Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1920Test extends TestCase { /** * Test the census place and date @@ -52,30 +54,30 @@ class CensusOfUnitedStates1920Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(24, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNameInitial::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionUs::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnSurnameGivenNameInitial::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[6]); + $this->assertInstanceOf(CensusColumnConditionUs::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[13]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1930Test.php b/tests/app/Census/CensusOfUnitedStates1930Test.php index da4f0205bf..9715c0e3e1 100644 --- a/tests/app/Census/CensusOfUnitedStates1930Test.php +++ b/tests/app/Census/CensusOfUnitedStates1930Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1930 */ -class CensusOfUnitedStates1930Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1930Test extends TestCase { /** * Test the census place and date @@ -52,34 +54,34 @@ class CensusOfUnitedStates1930Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(28, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionUs::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMarried::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[26]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[27]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[5]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[8]); + $this->assertInstanceOf(CensusColumnConditionUs::class, $columns[9]); + $this->assertInstanceOf(CensusColumnAgeMarried::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[13]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[14]); + $this->assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[19]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[26]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[27]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStates1940Test.php b/tests/app/Census/CensusOfUnitedStates1940Test.php index ea5d878c3e..d605f1ca6f 100644 --- a/tests/app/Census/CensusOfUnitedStates1940Test.php +++ b/tests/app/Census/CensusOfUnitedStates1940Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates1940 */ -class CensusOfUnitedStates1940Test extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStates1940Test extends TestCase { /** * Test the census place and date @@ -52,33 +54,33 @@ class CensusOfUnitedStates1940Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(27, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAge::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionUs::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMarried::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlaceSimple::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFatherBirthPlaceSimple::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnMotherBirthPlaceSimple::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[17]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[18]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[19]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[20]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[21]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[22]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[23]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[24]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[25]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[26]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnAge::class, $columns[7]); + $this->assertInstanceOf(CensusColumnConditionUs::class, $columns[8]); + $this->assertInstanceOf(CensusColumnAgeMarried::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnBirthPlaceSimple::class, $columns[12]); + $this->assertInstanceOf(CensusColumnFatherBirthPlaceSimple::class, $columns[13]); + $this->assertInstanceOf(CensusColumnMotherBirthPlaceSimple::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[17]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[18]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[19]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[20]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[21]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[22]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[23]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[24]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[25]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[26]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfUnitedStatesTest.php b/tests/app/Census/CensusOfUnitedStatesTest.php index 3cd34bbf63..16be8b7661 100644 --- a/tests/app/Census/CensusOfUnitedStatesTest.php +++ b/tests/app/Census/CensusOfUnitedStatesTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfUnitedStates */ -class CensusOfUnitedStatesTest extends \Fisharebest\Webtrees\TestCase +class CensusOfUnitedStatesTest extends TestCase { /** * Test the census place @@ -51,21 +53,21 @@ class CensusOfUnitedStatesTest extends \Fisharebest\Webtrees\TestCase $census_dates = $census->allCensusDates(); $this->assertCount(16, $census_dates); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1790::class, $census_dates[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1800::class, $census_dates[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1810::class, $census_dates[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1820::class, $census_dates[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1830::class, $census_dates[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1840::class, $census_dates[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1850::class, $census_dates[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1860::class, $census_dates[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1870::class, $census_dates[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1880::class, $census_dates[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1890::class, $census_dates[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1900::class, $census_dates[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1910::class, $census_dates[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1920::class, $census_dates[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1930::class, $census_dates[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates1940::class, $census_dates[15]); + $this->assertInstanceOf(CensusOfUnitedStates1790::class, $census_dates[0]); + $this->assertInstanceOf(CensusOfUnitedStates1800::class, $census_dates[1]); + $this->assertInstanceOf(CensusOfUnitedStates1810::class, $census_dates[2]); + $this->assertInstanceOf(CensusOfUnitedStates1820::class, $census_dates[3]); + $this->assertInstanceOf(CensusOfUnitedStates1830::class, $census_dates[4]); + $this->assertInstanceOf(CensusOfUnitedStates1840::class, $census_dates[5]); + $this->assertInstanceOf(CensusOfUnitedStates1850::class, $census_dates[6]); + $this->assertInstanceOf(CensusOfUnitedStates1860::class, $census_dates[7]); + $this->assertInstanceOf(CensusOfUnitedStates1870::class, $census_dates[8]); + $this->assertInstanceOf(CensusOfUnitedStates1880::class, $census_dates[9]); + $this->assertInstanceOf(CensusOfUnitedStates1890::class, $census_dates[10]); + $this->assertInstanceOf(CensusOfUnitedStates1900::class, $census_dates[11]); + $this->assertInstanceOf(CensusOfUnitedStates1910::class, $census_dates[12]); + $this->assertInstanceOf(CensusOfUnitedStates1920::class, $census_dates[13]); + $this->assertInstanceOf(CensusOfUnitedStates1930::class, $census_dates[14]); + $this->assertInstanceOf(CensusOfUnitedStates1940::class, $census_dates[15]); } } diff --git a/tests/app/Census/CensusOfWales1841Test.php b/tests/app/Census/CensusOfWales1841Test.php index b95039c002..182ffc244d 100644 --- a/tests/app/Census/CensusOfWales1841Test.php +++ b/tests/app/Census/CensusOfWales1841Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1841 */ -class CensusOfWales1841Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1841Test extends TestCase { /** * Test the census place and date @@ -52,12 +54,12 @@ class CensusOfWales1841Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(6, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale5Years::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale5Years::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBornForeignParts::class, $columns[5]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnAgeMale5Years::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAgeFemale5Years::class, $columns[2]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[3]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBornForeignParts::class, $columns[5]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('AgeM', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWales1851Test.php b/tests/app/Census/CensusOfWales1851Test.php index 7a29c298e6..54bed676df 100644 --- a/tests/app/Census/CensusOfWales1851Test.php +++ b/tests/app/Census/CensusOfWales1851Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1851 */ -class CensusOfWales1851Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1851Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfWales1851Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWales1861Test.php b/tests/app/Census/CensusOfWales1861Test.php index af666b60ae..ce38e6b726 100644 --- a/tests/app/Census/CensusOfWales1861Test.php +++ b/tests/app/Census/CensusOfWales1861Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1861 */ -class CensusOfWales1861Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1861Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfWales1861Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php index 56e642aeaa..0321180424 100644 --- a/tests/app/Census/CensusOfWales1871Test.php +++ b/tests/app/Census/CensusOfWales1871Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1871 */ -class CensusOfWales1871Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1871Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfWales1871Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php index 9559f1bee6..baab9c212a 100644 --- a/tests/app/Census/CensusOfWales1881Test.php +++ b/tests/app/Census/CensusOfWales1881Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1881 */ -class CensusOfWales1881Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1881Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class CensusOfWales1881Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php index cc1bdd161a..fac1607454 100644 --- a/tests/app/Census/CensusOfWales1891Test.php +++ b/tests/app/Census/CensusOfWales1891Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1891 */ -class CensusOfWales1891Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1891Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfWales1891Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php index f88e530499..b013f05a0c 100644 --- a/tests/app/Census/CensusOfWales1901Test.php +++ b/tests/app/Census/CensusOfWales1901Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1901 */ -class CensusOfWales1901Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1901Test extends TestCase { /** * Test the census place and date @@ -52,17 +54,17 @@ class CensusOfWales1901Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(11, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[4]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[5]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[6]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[8]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php index 8d62298596..31a1bd20fb 100644 --- a/tests/app/Census/CensusOfWales1911Test.php +++ b/tests/app/Census/CensusOfWales1911Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales1911 */ -class CensusOfWales1911Test extends \Fisharebest\Webtrees\TestCase +class CensusOfWales1911Test extends TestCase { /** * Test the census place and date @@ -52,23 +54,23 @@ class CensusOfWales1911Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(17, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnFullName::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnRelationToHead::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeMale::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnAgeFemale::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnYearsMarried::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenBornAlive::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenLiving::class, $columns[7]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnChildrenDied::class, $columns[8]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[9]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[10]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[12]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthPlace::class, $columns[13]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNationality::class, $columns[14]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[15]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[16]); + $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); + $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); + $this->assertInstanceOf(CensusColumnAgeMale::class, $columns[2]); + $this->assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[4]); + $this->assertInstanceOf(CensusColumnYearsMarried::class, $columns[5]); + $this->assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[6]); + $this->assertInstanceOf(CensusColumnChildrenLiving::class, $columns[7]); + $this->assertInstanceOf(CensusColumnChildrenDied::class, $columns[8]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[9]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[13]); + $this->assertInstanceOf(CensusColumnNationality::class, $columns[14]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[16]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); diff --git a/tests/app/Census/CensusOfWalesTest.php b/tests/app/Census/CensusOfWalesTest.php index 66c551d9b0..e2acdbf0e8 100644 --- a/tests/app/Census/CensusOfWalesTest.php +++ b/tests/app/Census/CensusOfWalesTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusOfWales */ -class CensusOfWalesTest extends \Fisharebest\Webtrees\TestCase +class CensusOfWalesTest extends TestCase { /** * Test the census place diff --git a/tests/app/Census/CensusTest.php b/tests/app/Census/CensusTest.php index 10afcb4750..b8593e471e 100644 --- a/tests/app/Census/CensusTest.php +++ b/tests/app/Census/CensusTest.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class CensusColumnAgeFemale5Years */ -class CensusTest extends \Fisharebest\Webtrees\TestCase +class CensusTest extends TestCase { /** * @covers \Fisharebest\Webtrees\Census\Census @@ -33,13 +35,13 @@ class CensusTest extends \Fisharebest\Webtrees\TestCase $censuses = Census::censusPlaces('XX'); $this->assertCount(8, $censuses); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfCzechRepublic::class, $censuses[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDenmark::class, $censuses[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfDeutschland::class, $censuses[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfEngland::class, $censuses[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfFrance::class, $censuses[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfScotland::class, $censuses[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfUnitedStates::class, $censuses[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusOfWales::class, $censuses[7]); + $this->assertInstanceOf(CensusOfCzechRepublic::class, $censuses[0]); + $this->assertInstanceOf(CensusOfDenmark::class, $censuses[1]); + $this->assertInstanceOf(CensusOfDeutschland::class, $censuses[2]); + $this->assertInstanceOf(CensusOfEngland::class, $censuses[3]); + $this->assertInstanceOf(CensusOfFrance::class, $censuses[4]); + $this->assertInstanceOf(CensusOfScotland::class, $censuses[5]); + $this->assertInstanceOf(CensusOfUnitedStates::class, $censuses[6]); + $this->assertInstanceOf(CensusOfWales::class, $censuses[7]); } } diff --git a/tests/app/Census/RegisterOfEngland1939Test.php b/tests/app/Census/RegisterOfEngland1939Test.php index aeb59e6359..3fe9a4bf1e 100644 --- a/tests/app/Census/RegisterOfEngland1939Test.php +++ b/tests/app/Census/RegisterOfEngland1939Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class RegisterOfEngland1939 */ -class RegisterOfEngland1939Test extends \Fisharebest\Webtrees\TestCase +class RegisterOfEngland1939Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class RegisterOfEngland1939Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDayMonthSlashYear::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSurnameGivenNames::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthDayMonthSlashYear::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[6]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]); $this->assertSame('Schedule', $columns[0]->abbreviation()); $this->assertSame('SubNum', $columns[1]->abbreviation()); diff --git a/tests/app/Census/RegisterOfWales1939Test.php b/tests/app/Census/RegisterOfWales1939Test.php index bf73802ffc..d5053e7e2f 100644 --- a/tests/app/Census/RegisterOfWales1939Test.php +++ b/tests/app/Census/RegisterOfWales1939Test.php @@ -18,10 +18,12 @@ declare(strict_types=1); namespace Fisharebest\Webtrees\Census; +use Fisharebest\Webtrees\TestCase; + /** * Test harness for the class RegisterOfWales1939 */ -class RegisterOfWales1939Test extends \Fisharebest\Webtrees\TestCase +class RegisterOfWales1939Test extends TestCase { /** * Test the census place and date @@ -52,14 +54,14 @@ class RegisterOfWales1939Test extends \Fisharebest\Webtrees\TestCase $columns = $census->columns(); $this->assertCount(8, $columns); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[0]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[1]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSurnameGivenNames::class, $columns[2]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnNull::class, $columns[3]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnSexMF::class, $columns[4]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnBirthDayMonthSlashYear::class, $columns[5]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnConditionEnglish::class, $columns[6]); - $this->assertInstanceOf(\Fisharebest\Webtrees\Census\CensusColumnOccupation::class, $columns[7]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[0]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[1]); + $this->assertInstanceOf(CensusColumnSurnameGivenNames::class, $columns[2]); + $this->assertInstanceOf(CensusColumnNull::class, $columns[3]); + $this->assertInstanceOf(CensusColumnSexMF::class, $columns[4]); + $this->assertInstanceOf(CensusColumnBirthDayMonthSlashYear::class, $columns[5]); + $this->assertInstanceOf(CensusColumnConditionEnglish::class, $columns[6]); + $this->assertInstanceOf(CensusColumnOccupation::class, $columns[7]); $this->assertSame('Schedule', $columns[0]->abbreviation()); $this->assertSame('SubNum', $columns[1]->abbreviation()); |