diff options
51 files changed, 545 insertions, 217 deletions
diff --git a/app/Census/AbstractCensus.php b/app/Census/AbstractCensus.php index a195223698..1e0b97ec1e 100644 --- a/app/Census/AbstractCensus.php +++ b/app/Census/AbstractCensus.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ diff --git a/app/Census/CensusColumnBornSameCounty.php b/app/Census/CensusColumnBornSameCounty.php index 16eccd5871..aca0e0e62d 100644 --- a/app/Census/CensusColumnBornSameCounty.php +++ b/app/Census/CensusColumnBornSameCounty.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnChildrenBornAlive.php b/app/Census/CensusColumnChildrenBornAlive.php index b009554c1c..59bd3d5346 100644 --- a/app/Census/CensusColumnChildrenBornAlive.php +++ b/app/Census/CensusColumnChildrenBornAlive.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnChildrenDied.php b/app/Census/CensusColumnChildrenDied.php index 2c4f89f3a8..ad6d88d83f 100644 --- a/app/Census/CensusColumnChildrenDied.php +++ b/app/Census/CensusColumnChildrenDied.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnChildrenLiving.php b/app/Census/CensusColumnChildrenLiving.php index c43ff25038..36bd3a5648 100644 --- a/app/Census/CensusColumnChildrenLiving.php +++ b/app/Census/CensusColumnChildrenLiving.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnCondition.php b/app/Census/CensusColumnCondition.php index e745521cff..9f756e8168 100644 --- a/app/Census/CensusColumnCondition.php +++ b/app/Census/CensusColumnCondition.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnFatherBirthPlace.php b/app/Census/CensusColumnFatherBirthPlace.php index d510f914ad..a3e0c8d813 100644 --- a/app/Census/CensusColumnFatherBirthPlace.php +++ b/app/Census/CensusColumnFatherBirthPlace.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnFatherForeign.php b/app/Census/CensusColumnFatherForeign.php index eaf498f7b9..edcf353e11 100644 --- a/app/Census/CensusColumnFatherForeign.php +++ b/app/Census/CensusColumnFatherForeign.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnMarriedWithinOneYear.php b/app/Census/CensusColumnMarriedWithinOneYear.php index 33bee99256..373cf1cd46 100644 --- a/app/Census/CensusColumnMarriedWithinOneYear.php +++ b/app/Census/CensusColumnMarriedWithinOneYear.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnMonthIfBornWithinYear.php b/app/Census/CensusColumnMonthIfBornWithinYear.php index 458ae25dfd..e37db99922 100644 --- a/app/Census/CensusColumnMonthIfBornWithinYear.php +++ b/app/Census/CensusColumnMonthIfBornWithinYear.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnMonthIfMarriedWithinYear.php b/app/Census/CensusColumnMonthIfMarriedWithinYear.php index 4919e9b65c..0750ba16d9 100644 --- a/app/Census/CensusColumnMonthIfMarriedWithinYear.php +++ b/app/Census/CensusColumnMonthIfMarriedWithinYear.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnMotherBirthPlace.php b/app/Census/CensusColumnMotherBirthPlace.php index 0eb9e8a03b..6eb8151cdd 100644 --- a/app/Census/CensusColumnMotherBirthPlace.php +++ b/app/Census/CensusColumnMotherBirthPlace.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnMotherForeign.php b/app/Census/CensusColumnMotherForeign.php index d10863eb18..7a0a7a64df 100644 --- a/app/Census/CensusColumnMotherForeign.php +++ b/app/Census/CensusColumnMotherForeign.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnNationality.php b/app/Census/CensusColumnNationality.php index d20f973212..a32cc92705 100644 --- a/app/Census/CensusColumnNationality.php +++ b/app/Census/CensusColumnNationality.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnNull.php b/app/Census/CensusColumnNull.php index e9acacb66f..b55b49bebb 100644 --- a/app/Census/CensusColumnNull.php +++ b/app/Census/CensusColumnNull.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnRelationToHead.php b/app/Census/CensusColumnRelationToHead.php index 2d448dbe27..35c3a201fa 100644 --- a/app/Census/CensusColumnRelationToHead.php +++ b/app/Census/CensusColumnRelationToHead.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnSameCounty.php b/app/Census/CensusColumnSameCounty.php index 1350c10e8c..b18bdcfe63 100644 --- a/app/Census/CensusColumnSameCounty.php +++ b/app/Census/CensusColumnSameCounty.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnSexMF.php b/app/Census/CensusColumnSexMF.php index 49979b3326..0fd092bf74 100644 --- a/app/Census/CensusColumnSexMF.php +++ b/app/Census/CensusColumnSexMF.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusColumnYearsMarried.php b/app/Census/CensusColumnYearsMarried.php index 33049275e5..7d6f70030c 100644 --- a/app/Census/CensusColumnYearsMarried.php +++ b/app/Census/CensusColumnYearsMarried.php @@ -15,7 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; use Fisharebest\Webtrees\Individual; /** diff --git a/app/Census/CensusOfEngland1871.php b/app/Census/CensusOfEngland1871.php index 2648895656..efb2b393e2 100644 --- a/app/Census/CensusOfEngland1871.php +++ b/app/Census/CensusOfEngland1871.php @@ -37,14 +37,14 @@ class CensusOfEngland1871 extends CensusOfEngland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), ); } } diff --git a/app/Census/CensusOfEngland1881.php b/app/Census/CensusOfEngland1881.php index 1697e6d3a6..c0b532369b 100644 --- a/app/Census/CensusOfEngland1881.php +++ b/app/Census/CensusOfEngland1881.php @@ -37,14 +37,14 @@ class CensusOfEngland1881 extends CensusOfEngland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), ); } } diff --git a/app/Census/CensusOfEngland1891.php b/app/Census/CensusOfEngland1891.php index e30e5ef0de..a6d610cb36 100644 --- a/app/Census/CensusOfEngland1891.php +++ b/app/Census/CensusOfEngland1891.php @@ -37,17 +37,17 @@ class CensusOfEngland1891 extends CensusOfEngland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Employer. - new CensusColumnNull($this, '', ''), // Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Empl', 'Employer'), + new CensusColumnNull($this, 'Empd', 'Employed'), + new CensusColumnNull($this, 'OAC', 'Own account'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic or imbecile'), ); } } diff --git a/app/Census/CensusOfEngland1901.php b/app/Census/CensusOfEngland1901.php index 75058e9c49..ca93e8c4ef 100644 --- a/app/Census/CensusOfEngland1901.php +++ b/app/Census/CensusOfEngland1901.php @@ -37,16 +37,16 @@ class CensusOfEngland1901 extends CensusOfEngland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Employer/Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), + new CensusColumnNull($this, 'Home', 'Working at home'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded'), ); } } diff --git a/app/Census/CensusOfEngland1911.php b/app/Census/CensusOfEngland1911.php index d700712d04..b2c9deb666 100644 --- a/app/Census/CensusOfEngland1911.php +++ b/app/Census/CensusOfEngland1911.php @@ -15,8 +15,6 @@ */ namespace Fisharebest\Webtrees\Census; -use Fisharebest\Webtrees\Date; - /** * Definitions for a census */ @@ -37,22 +35,22 @@ class CensusOfEngland1911 extends CensusOfEngland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnYearsMarried($this, '', ''), - new CensusColumnChildrenBornAlive($this, '', ''), - new CensusColumnChildrenLiving($this, '', ''), - new CensusColumnChildrenDied($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Industry. - new CensusColumnNull($this, '', ''), // Employer/Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNationality($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnYearsMarried($this, 'YrM', 'Years married'), + new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), + new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), + new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Ind', 'Industry'), + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), + new CensusColumnNull($this, 'Home', 'Working at home'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNationality($this, 'Nat', 'Nationality'), + new CensusColumnNull($this, 'Infirm', 'Infirmity'), ); } } diff --git a/app/Census/CensusOfScotland1861.php b/app/Census/CensusOfScotland1861.php index 4793ad8951..6ac80f5b6a 100644 --- a/app/Census/CensusOfScotland1861.php +++ b/app/Census/CensusOfScotland1861.php @@ -45,8 +45,7 @@ class CensusOfScotland1861 extends CensusOfScotland implements CensusInterface { new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), new CensusColumnNull($this, 'Infirm', 'Whether blind or deaf-and-dumb'), - new CensusColumnNull($this, 'Sch', 'Number of children between 5 and 15 attending school'), - new CensusColumnNull($this, 'Win', 'Number of rooms with one or more windows'), + new CensusColumnNull($this, 'Sch', 'Number of children between 5 and 13 attending school'), ); } } diff --git a/app/Census/CensusOfScotland1871.php b/app/Census/CensusOfScotland1871.php index 1e7af6a15d..6d68b5bae7 100644 --- a/app/Census/CensusOfScotland1871.php +++ b/app/Census/CensusOfScotland1871.php @@ -37,16 +37,15 @@ class CensusOfScotland1871 extends CensusOfScotland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. - new CensusColumnNull($this, '', ''), // Children 5-15 at school. - new CensusColumnNull($this, '', ''), // Rooms with windows. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), + new CensusColumnNull($this, 'Sch', 'Number of children between 5 and 13 attending school or educated at home'), ); } } diff --git a/app/Census/CensusOfScotland1881.php b/app/Census/CensusOfScotland1881.php index ce1bec4e44..3f62b57159 100644 --- a/app/Census/CensusOfScotland1881.php +++ b/app/Census/CensusOfScotland1881.php @@ -37,15 +37,14 @@ class CensusOfScotland1881 extends CensusOfScotland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. - new CensusColumnNull($this, '', ''), // Rooms with windows. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), ); } } diff --git a/app/Census/CensusOfScotland1891.php b/app/Census/CensusOfScotland1891.php index f8645897d0..ac24f2572b 100644 --- a/app/Census/CensusOfScotland1891.php +++ b/app/Census/CensusOfScotland1891.php @@ -37,19 +37,18 @@ class CensusOfScotland1891 extends CensusOfScotland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Employer. - new CensusColumnNull($this, '', ''), // Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Language spoken. - new CensusColumnNull($this, '', ''), // Infirm, etc. - new CensusColumnNull($this, '', ''), // Rooms with windows. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Empl', 'Employer'), + new CensusColumnNull($this, 'Empd', 'Employed'), + new CensusColumnNull($this, 'OAC', 'Own account'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Lang', 'Language spoken'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic or imbecile'), ); } } diff --git a/app/Census/CensusOfScotland1901.php b/app/Census/CensusOfScotland1901.php index 166a59e5d0..5b3a2eda68 100644 --- a/app/Census/CensusOfScotland1901.php +++ b/app/Census/CensusOfScotland1901.php @@ -37,18 +37,17 @@ class CensusOfScotland1901 extends CensusOfScotland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Employer/Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Language spoken. - new CensusColumnNull($this, '', ''), // Infirm, etc. - new CensusColumnNull($this, '', ''), // Rooms with windows. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), + new CensusColumnNull($this, 'Home', 'Working at home'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Lang', 'Language spoken'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded'), ); } } diff --git a/app/Census/CensusOfScotland1911.php b/app/Census/CensusOfScotland1911.php index f188a6043a..33e668b9ea 100644 --- a/app/Census/CensusOfScotland1911.php +++ b/app/Census/CensusOfScotland1911.php @@ -37,22 +37,23 @@ class CensusOfScotland1911 extends CensusOfScotland implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnYearsMarried($this, '', ''), - new CensusColumnChildrenBornAlive($this, '', ''), - new CensusColumnChildrenLiving($this, '', ''), - new CensusColumnChildrenDied($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Industry. - new CensusColumnNull($this, '', ''), // Employer/Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNationality($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnNull($this, 'Lang', 'Language spoken'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnYearsMarried($this, 'YrM', 'Years married'), + new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), + new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), + new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Ind', 'Industry'), + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), + new CensusColumnNull($this, 'Home', 'Working at home'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNationality($this, 'Nat', 'Nationality'), + new CensusColumnNull($this, 'Infirm', 'Infirmity'), ); } } diff --git a/app/Census/CensusOfWales1871.php b/app/Census/CensusOfWales1871.php index 8d991da173..0e2f228455 100644 --- a/app/Census/CensusOfWales1871.php +++ b/app/Census/CensusOfWales1871.php @@ -37,14 +37,14 @@ class CensusOfWales1871 extends CensusOfWales implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), ); } } diff --git a/app/Census/CensusOfWales1881.php b/app/Census/CensusOfWales1881.php index e14d80dc4c..e1f71c2e56 100644 --- a/app/Census/CensusOfWales1881.php +++ b/app/Census/CensusOfWales1881.php @@ -37,14 +37,14 @@ class CensusOfWales1881 extends CensusOfWales implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, imbecile, idiot or lunatic'), ); } } diff --git a/app/Census/CensusOfWales1891.php b/app/Census/CensusOfWales1891.php index f3d479be6a..cfb681b353 100644 --- a/app/Census/CensusOfWales1891.php +++ b/app/Census/CensusOfWales1891.php @@ -37,17 +37,17 @@ class CensusOfWales1891 extends CensusOfWales implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Employer. - new CensusColumnNull($this, '', ''), // Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Empl', 'Employer'), + new CensusColumnNull($this, 'Empd', 'Employed'), + new CensusColumnNull($this, 'OAC', 'Own account'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic or imbecile'), ); } } diff --git a/app/Census/CensusOfWales1901.php b/app/Census/CensusOfWales1901.php index d15ed465a2..c82ef3d4b3 100644 --- a/app/Census/CensusOfWales1901.php +++ b/app/Census/CensusOfWales1901.php @@ -37,17 +37,17 @@ class CensusOfWales1901 extends CensusOfWales implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Employer/Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. - new CensusColumnNull($this, '', ''), // Language spoken. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), + new CensusColumnNull($this, 'Home', 'Working at home'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNull($this, 'Infirm', 'Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded'), + new CensusColumnNull($this, 'Lang', 'Language spoken'), ); } } diff --git a/app/Census/CensusOfWales1911.php b/app/Census/CensusOfWales1911.php index d97dc13ebb..f35de64fad 100644 --- a/app/Census/CensusOfWales1911.php +++ b/app/Census/CensusOfWales1911.php @@ -37,23 +37,23 @@ class CensusOfWales1911 extends CensusOfWales implements CensusInterface { */ public function columns() { return array( - new CensusColumnFullName($this, '', ''), - new CensusColumnRelationToHead($this, '', ''), - new CensusColumnAgeMale($this, '', ''), - new CensusColumnAgeFemale($this, '', ''), - new CensusColumnCondition($this, '', ''), - new CensusColumnYearsMarried($this, '', ''), - new CensusColumnChildrenBornAlive($this, '', ''), - new CensusColumnChildrenLiving($this, '', ''), - new CensusColumnChildrenDied($this, '', ''), - new CensusColumnOccupation($this, '', ''), - new CensusColumnNull($this, '', ''), // Industry. - new CensusColumnNull($this, '', ''), // Employer/Employed. - new CensusColumnNull($this, '', ''), // Own account. - new CensusColumnBirthPlace($this, '', ''), - new CensusColumnNationality($this, '', ''), - new CensusColumnNull($this, '', ''), // Infirm, etc. - new CensusColumnNull($this, '', ''), // Language spoken. + new CensusColumnFullName($this, 'Name', 'Name and surname'), + new CensusColumnRelationToHead($this, 'Relation', 'Relation to head of household'), + new CensusColumnAgeMale($this, 'AgeM', 'Age (males)'), + new CensusColumnAgeFemale($this, 'AgeF', 'Age (females)'), + new CensusColumnCondition($this, 'Condition', 'Condition'), + new CensusColumnYearsMarried($this, 'YrM', 'Years married'), + new CensusColumnChildrenBornAlive($this, 'ChA', 'Children born alive'), + new CensusColumnChildrenLiving($this, 'ChL', 'Children who are still alive'), + new CensusColumnChildrenDied($this, 'ChD', 'Children who have died'), + new CensusColumnOccupation($this, 'Occupation', 'Rank, profession or occupation'), + new CensusColumnNull($this, 'Ind', 'Industry'), + new CensusColumnNull($this, 'Emp', 'Employer, worker or own account'), + new CensusColumnNull($this, 'Home', 'Working at home'), + new CensusColumnBirthPlace($this, 'Birthplace', 'Where born'), + new CensusColumnNationality($this, 'Nat', 'Nationality'), + new CensusColumnNull($this, 'Infirm', 'Infirmity'), + new CensusColumnNull($this, 'Lang', 'Language spoken'), ); } } diff --git a/tests/app/Census/CensusOfEngland1871Test.php b/tests/app/Census/CensusOfEngland1871Test.php index 9b40555d89..49158c1cff 100644 --- a/tests/app/Census/CensusOfEngland1871Test.php +++ b/tests/app/Census/CensusOfEngland1871Test.php @@ -51,5 +51,23 @@ class CensusOfEngland1871Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Birthplace', $columns[6]->abbreviation()); + $this->assertSame('Infirm', $columns[7]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Where born', $columns[6]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title()); } } diff --git a/tests/app/Census/CensusOfEngland1881Test.php b/tests/app/Census/CensusOfEngland1881Test.php index b5638876ab..3db8c4c97d 100644 --- a/tests/app/Census/CensusOfEngland1881Test.php +++ b/tests/app/Census/CensusOfEngland1881Test.php @@ -51,5 +51,23 @@ class CensusOfEngland1881Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Birthplace', $columns[6]->abbreviation()); + $this->assertSame('Infirm', $columns[7]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Where born', $columns[6]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title()); } } diff --git a/tests/app/Census/CensusOfEngland1891Test.php b/tests/app/Census/CensusOfEngland1891Test.php index 80cc04bfe3..061eb7381e 100644 --- a/tests/app/Census/CensusOfEngland1891Test.php +++ b/tests/app/Census/CensusOfEngland1891Test.php @@ -54,5 +54,29 @@ class CensusOfEngland1891Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Empl', $columns[6]->abbreviation()); + $this->assertSame('Empd', $columns[7]->abbreviation()); + $this->assertSame('OAC', $columns[8]->abbreviation()); + $this->assertSame('Birthplace', $columns[9]->abbreviation()); + $this->assertSame('Infirm', $columns[10]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Employer', $columns[6]->title()); + $this->assertSame('Employed', $columns[7]->title()); + $this->assertSame('Own account', $columns[8]->title()); + $this->assertSame('Where born', $columns[9]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, lunatic or imbecile', $columns[10]->title()); } } diff --git a/tests/app/Census/CensusOfEngland1901Test.php b/tests/app/Census/CensusOfEngland1901Test.php index eb5e7fcde1..274ac95e0b 100644 --- a/tests/app/Census/CensusOfEngland1901Test.php +++ b/tests/app/Census/CensusOfEngland1901Test.php @@ -53,5 +53,27 @@ class CensusOfEngland1901Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Emp', $columns[6]->abbreviation()); + $this->assertSame('Home', $columns[7]->abbreviation()); + $this->assertSame('Birthplace', $columns[8]->abbreviation()); + $this->assertSame('Infirm', $columns[9]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Employer, worker or own account', $columns[6]->title()); + $this->assertSame('Working at home', $columns[7]->title()); + $this->assertSame('Where born', $columns[8]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded', $columns[9]->title()); } } diff --git a/tests/app/Census/CensusOfEngland1911Test.php b/tests/app/Census/CensusOfEngland1911Test.php index 90f42e703a..85c044c300 100644 --- a/tests/app/Census/CensusOfEngland1911Test.php +++ b/tests/app/Census/CensusOfEngland1911Test.php @@ -59,5 +59,39 @@ class CensusOfEngland1911Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('AgeM', $columns[2]->abbreviation()); + $this->assertSame('AgeF', $columns[3]->abbreviation()); + $this->assertSame('Condition', $columns[4]->abbreviation()); + $this->assertSame('YrM', $columns[5]->abbreviation()); + $this->assertSame('ChA', $columns[6]->abbreviation()); + $this->assertSame('ChL', $columns[7]->abbreviation()); + $this->assertSame('ChD', $columns[8]->abbreviation()); + $this->assertSame('Occupation', $columns[9]->abbreviation()); + $this->assertSame('Ind', $columns[10]->abbreviation()); + $this->assertSame('Emp', $columns[11]->abbreviation()); + $this->assertSame('Home', $columns[12]->abbreviation()); + $this->assertSame('Birthplace', $columns[13]->abbreviation()); + $this->assertSame('Nat', $columns[14]->abbreviation()); + $this->assertSame('Infirm', $columns[15]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Age (males)', $columns[2]->title()); + $this->assertSame('Age (females)', $columns[3]->title()); + $this->assertSame('Condition', $columns[4]->title()); + $this->assertSame('Years married', $columns[5]->title()); + $this->assertSame('Children born alive', $columns[6]->title()); + $this->assertSame('Children who are still alive', $columns[7]->title()); + $this->assertSame('Children who have died', $columns[8]->title()); + $this->assertSame('Rank, profession or occupation', $columns[9]->title()); + $this->assertSame('Industry', $columns[10]->title()); + $this->assertSame('Employer, worker or own account', $columns[11]->title()); + $this->assertSame('Working at home', $columns[12]->title()); + $this->assertSame('Where born', $columns[13]->title()); + $this->assertSame('Nationality', $columns[14]->title()); + $this->assertSame('Infirmity', $columns[15]->title()); } } diff --git a/tests/app/Census/CensusOfScotland1861Test.php b/tests/app/Census/CensusOfScotland1861Test.php index 4556962152..98d2fdf7e9 100644 --- a/tests/app/Census/CensusOfScotland1861Test.php +++ b/tests/app/Census/CensusOfScotland1861Test.php @@ -42,7 +42,7 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase { $census = new CensusOfScotland1861; $columns = $census->columns(); - $this->assertCount(10, $columns); + $this->assertCount(9, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); @@ -52,7 +52,6 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); $this->assertSame('Name', $columns[0]->abbreviation()); $this->assertSame('Relation', $columns[1]->abbreviation()); @@ -63,7 +62,6 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase { $this->assertSame('Birthplace', $columns[6]->abbreviation()); $this->assertSame('Infirm', $columns[7]->abbreviation()); $this->assertSame('Sch', $columns[8]->abbreviation()); - $this->assertSame('Win', $columns[9]->abbreviation()); $this->assertSame('Name and surname', $columns[0]->title()); $this->assertSame('Relation to head of household', $columns[1]->title()); @@ -73,7 +71,6 @@ class CensusOfScotland1861Test extends \PHPUnit_Framework_TestCase { $this->assertSame('Rank, profession or occupation', $columns[5]->title()); $this->assertSame('Where born', $columns[6]->title()); $this->assertSame('Whether blind or deaf-and-dumb', $columns[7]->title()); - $this->assertSame('Number of children between 5 and 15 attending school', $columns[8]->title()); - $this->assertSame('Number of rooms with one or more windows', $columns[9]->title()); + $this->assertSame('Number of children between 5 and 13 attending school', $columns[8]->title()); } } diff --git a/tests/app/Census/CensusOfScotland1871Test.php b/tests/app/Census/CensusOfScotland1871Test.php index 6e129bc5e6..1ade69f8c3 100644 --- a/tests/app/Census/CensusOfScotland1871Test.php +++ b/tests/app/Census/CensusOfScotland1871Test.php @@ -42,7 +42,7 @@ class CensusOfScotland1871Test extends \PHPUnit_Framework_TestCase { $census = new CensusOfScotland1871; $columns = $census->columns(); - $this->assertCount(10, $columns); + $this->assertCount(9, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); @@ -52,6 +52,25 @@ class CensusOfScotland1871Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[6]); $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); $this->assertInstanceOf(CensusColumnNull::class, $columns[8]); - $this->assertInstanceOf(CensusColumnNull::class, $columns[9]); + + $this->assertSame('Name', $columns[0]->abbreviation()); + $this->assertSame('Relation', $columns[1]->abbreviation()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Birthplace', $columns[6]->abbreviation()); + $this->assertSame('Infirm', $columns[7]->abbreviation()); + $this->assertSame('Sch', $columns[8]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Where born', $columns[6]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title()); + $this->assertSame('Number of children between 5 and 13 attending school or educated at home', $columns[8]->title()); } } diff --git a/tests/app/Census/CensusOfScotland1881Test.php b/tests/app/Census/CensusOfScotland1881Test.php index 5d18068d01..93f164ad43 100644 --- a/tests/app/Census/CensusOfScotland1881Test.php +++ b/tests/app/Census/CensusOfScotland1881Test.php @@ -42,7 +42,7 @@ class CensusOfScotland1881Test extends \PHPUnit_Framework_TestCase { $census = new CensusOfScotland1881; $columns = $census->columns(); - $this->assertCount(9, $columns); + $this->assertCount(8, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); @@ -50,7 +50,24 @@ class CensusOfScotland1881Test extends \PHPUnit_Framework_TestCase { $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->assertInstanceOf(CensusColumnNull::class, $columns[8]); // Rooms with windows. + $this->assertInstanceOf(CensusColumnNull::class, $columns[7]); + + $this->assertSame('Name', $columns[0]->abbreviation()); + $this->assertSame('Relation', $columns[1]->abbreviation()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Birthplace', $columns[6]->abbreviation()); + $this->assertSame('Infirm', $columns[7]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Where born', $columns[6]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title()); } } diff --git a/tests/app/Census/CensusOfScotland1891Test.php b/tests/app/Census/CensusOfScotland1891Test.php index bb565516b7..c3185e7193 100644 --- a/tests/app/Census/CensusOfScotland1891Test.php +++ b/tests/app/Census/CensusOfScotland1891Test.php @@ -42,7 +42,7 @@ class CensusOfScotland1891Test extends \PHPUnit_Framework_TestCase { $census = new CensusOfScotland1891; $columns = $census->columns(); - $this->assertCount(13, $columns); + $this->assertCount(12, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); @@ -55,6 +55,31 @@ class CensusOfScotland1891Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnBirthPlace::class, $columns[9]); $this->assertInstanceOf(CensusColumnNull::class, $columns[10]); $this->assertInstanceOf(CensusColumnNull::class, $columns[11]); - $this->assertInstanceOf(CensusColumnNull::class, $columns[12]); + + $this->assertSame('Name', $columns[0]->abbreviation()); + $this->assertSame('Relation', $columns[1]->abbreviation()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Empl', $columns[6]->abbreviation()); + $this->assertSame('Empd', $columns[7]->abbreviation()); + $this->assertSame('OAC', $columns[8]->abbreviation()); + $this->assertSame('Birthplace', $columns[9]->abbreviation()); + $this->assertSame('Lang', $columns[10]->abbreviation()); + $this->assertSame('Infirm', $columns[11]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Employer', $columns[6]->title()); + $this->assertSame('Employed', $columns[7]->title()); + $this->assertSame('Own account', $columns[8]->title()); + $this->assertSame('Where born', $columns[9]->title()); + $this->assertSame('Language spoken', $columns[10]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, lunatic or imbecile', $columns[11]->title()); } } diff --git a/tests/app/Census/CensusOfScotland1901Test.php b/tests/app/Census/CensusOfScotland1901Test.php index ffec516a71..29b4a65f0e 100644 --- a/tests/app/Census/CensusOfScotland1901Test.php +++ b/tests/app/Census/CensusOfScotland1901Test.php @@ -42,7 +42,7 @@ class CensusOfScotland1901Test extends \PHPUnit_Framework_TestCase { $census = new CensusOfScotland1901; $columns = $census->columns(); - $this->assertCount(12, $columns); + $this->assertCount(11, $columns); $this->assertInstanceOf(CensusColumnFullName::class, $columns[0]); $this->assertInstanceOf(CensusColumnRelationToHead::class, $columns[1]); $this->assertInstanceOf(CensusColumnCondition::class, $columns[2]); @@ -54,6 +54,29 @@ class CensusOfScotland1901Test extends \PHPUnit_Framework_TestCase { $this->assertInstanceOf(CensusColumnBirthPlace::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('Relation', $columns[1]->abbreviation()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Emp', $columns[6]->abbreviation()); + $this->assertSame('Home', $columns[7]->abbreviation()); + $this->assertSame('Birthplace', $columns[8]->abbreviation()); + $this->assertSame('Lang', $columns[9]->abbreviation()); + $this->assertSame('Infirm', $columns[10]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Employer, worker or own account', $columns[6]->title()); + $this->assertSame('Working at home', $columns[7]->title()); + $this->assertSame('Where born', $columns[8]->title()); + $this->assertSame('Language spoken', $columns[9]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded', $columns[10]->title()); } } diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php index b1aaed2a35..06e7710f37 100644 --- a/tests/app/Census/CensusOfScotland1911Test.php +++ b/tests/app/Census/CensusOfScotland1911Test.php @@ -42,22 +42,59 @@ class CensusOfScotland1911Test extends \PHPUnit_Framework_TestCase { $census = new CensusOfScotland1911; $columns = $census->columns(); - $this->assertCount(16, $columns); + $this->assertCount(17, $columns); $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(CensusColumnCondition::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[4]); + $this->assertInstanceOf(CensusColumnCondition::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(CensusColumnBirthPlace::class, $columns[13]); - $this->assertInstanceOf(CensusColumnNationality::class, $columns[14]); - $this->assertInstanceOf(CensusColumnNull::class, $columns[15]); + $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()); + $this->assertSame('AgeM', $columns[2]->abbreviation()); + $this->assertSame('AgeF', $columns[3]->abbreviation()); + $this->assertSame('Lang', $columns[4]->abbreviation()); + $this->assertSame('Condition', $columns[5]->abbreviation()); + $this->assertSame('YrM', $columns[6]->abbreviation()); + $this->assertSame('ChA', $columns[7]->abbreviation()); + $this->assertSame('ChL', $columns[8]->abbreviation()); + $this->assertSame('ChD', $columns[9]->abbreviation()); + $this->assertSame('Occupation', $columns[10]->abbreviation()); + $this->assertSame('Ind', $columns[11]->abbreviation()); + $this->assertSame('Emp', $columns[12]->abbreviation()); + $this->assertSame('Home', $columns[13]->abbreviation()); + $this->assertSame('Birthplace', $columns[14]->abbreviation()); + $this->assertSame('Nat', $columns[15]->abbreviation()); + $this->assertSame('Infirm', $columns[16]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Age (males)', $columns[2]->title()); + $this->assertSame('Age (females)', $columns[3]->title()); + $this->assertSame('Language spoken', $columns[4]->title()); + $this->assertSame('Condition', $columns[5]->title()); + $this->assertSame('Years married', $columns[6]->title()); + $this->assertSame('Children born alive', $columns[7]->title()); + $this->assertSame('Children who are still alive', $columns[8]->title()); + $this->assertSame('Children who have died', $columns[9]->title()); + $this->assertSame('Rank, profession or occupation', $columns[10]->title()); + $this->assertSame('Industry', $columns[11]->title()); + $this->assertSame('Employer, worker or own account', $columns[12]->title()); + $this->assertSame('Working at home', $columns[13]->title()); + $this->assertSame('Where born', $columns[14]->title()); + $this->assertSame('Nationality', $columns[15]->title()); + $this->assertSame('Infirmity', $columns[16]->title()); } } diff --git a/tests/app/Census/CensusOfWales1871Test.php b/tests/app/Census/CensusOfWales1871Test.php index 6f8bc233ac..04e985fad2 100644 --- a/tests/app/Census/CensusOfWales1871Test.php +++ b/tests/app/Census/CensusOfWales1871Test.php @@ -51,5 +51,23 @@ class CensusOfWales1871Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Birthplace', $columns[6]->abbreviation()); + $this->assertSame('Infirm', $columns[7]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Where born', $columns[6]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title()); } } diff --git a/tests/app/Census/CensusOfWales1881Test.php b/tests/app/Census/CensusOfWales1881Test.php index 999c4b4732..837ea93e8d 100644 --- a/tests/app/Census/CensusOfWales1881Test.php +++ b/tests/app/Census/CensusOfWales1881Test.php @@ -51,5 +51,23 @@ class CensusOfWales1881Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Birthplace', $columns[6]->abbreviation()); + $this->assertSame('Infirm', $columns[7]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Where born', $columns[6]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, imbecile, idiot or lunatic', $columns[7]->title()); } } diff --git a/tests/app/Census/CensusOfWales1891Test.php b/tests/app/Census/CensusOfWales1891Test.php index ff0add8209..b230a5509c 100644 --- a/tests/app/Census/CensusOfWales1891Test.php +++ b/tests/app/Census/CensusOfWales1891Test.php @@ -54,5 +54,29 @@ class CensusOfWales1891Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Empl', $columns[6]->abbreviation()); + $this->assertSame('Empd', $columns[7]->abbreviation()); + $this->assertSame('OAC', $columns[8]->abbreviation()); + $this->assertSame('Birthplace', $columns[9]->abbreviation()); + $this->assertSame('Infirm', $columns[10]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Employer', $columns[6]->title()); + $this->assertSame('Employed', $columns[7]->title()); + $this->assertSame('Own account', $columns[8]->title()); + $this->assertSame('Where born', $columns[9]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, lunatic or imbecile', $columns[10]->title()); } } diff --git a/tests/app/Census/CensusOfWales1901Test.php b/tests/app/Census/CensusOfWales1901Test.php index 6862be1ec4..228d8ffa32 100644 --- a/tests/app/Census/CensusOfWales1901Test.php +++ b/tests/app/Census/CensusOfWales1901Test.php @@ -54,5 +54,29 @@ class CensusOfWales1901Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('Condition', $columns[2]->abbreviation()); + $this->assertSame('AgeM', $columns[3]->abbreviation()); + $this->assertSame('AgeF', $columns[4]->abbreviation()); + $this->assertSame('Occupation', $columns[5]->abbreviation()); + $this->assertSame('Emp', $columns[6]->abbreviation()); + $this->assertSame('Home', $columns[7]->abbreviation()); + $this->assertSame('Birthplace', $columns[8]->abbreviation()); + $this->assertSame('Infirm', $columns[9]->abbreviation()); + $this->assertSame('Lang', $columns[10]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Condition', $columns[2]->title()); + $this->assertSame('Age (males)', $columns[3]->title()); + $this->assertSame('Age (females)', $columns[4]->title()); + $this->assertSame('Rank, profession or occupation', $columns[5]->title()); + $this->assertSame('Employer, worker or own account', $columns[6]->title()); + $this->assertSame('Working at home', $columns[7]->title()); + $this->assertSame('Where born', $columns[8]->title()); + $this->assertSame('Whether deaf-and-dumb, blind, lunatic, imbecile, feeble-minded', $columns[9]->title()); + $this->assertSame('Language spoken', $columns[10]->title()); } } diff --git a/tests/app/Census/CensusOfWales1911Test.php b/tests/app/Census/CensusOfWales1911Test.php index 878959cb82..e4e4411875 100644 --- a/tests/app/Census/CensusOfWales1911Test.php +++ b/tests/app/Census/CensusOfWales1911Test.php @@ -60,5 +60,41 @@ class CensusOfWales1911Test extends \PHPUnit_Framework_TestCase { $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()); + $this->assertSame('AgeM', $columns[2]->abbreviation()); + $this->assertSame('AgeF', $columns[3]->abbreviation()); + $this->assertSame('Condition', $columns[4]->abbreviation()); + $this->assertSame('YrM', $columns[5]->abbreviation()); + $this->assertSame('ChA', $columns[6]->abbreviation()); + $this->assertSame('ChL', $columns[7]->abbreviation()); + $this->assertSame('ChD', $columns[8]->abbreviation()); + $this->assertSame('Occupation', $columns[9]->abbreviation()); + $this->assertSame('Ind', $columns[10]->abbreviation()); + $this->assertSame('Emp', $columns[11]->abbreviation()); + $this->assertSame('Home', $columns[12]->abbreviation()); + $this->assertSame('Birthplace', $columns[13]->abbreviation()); + $this->assertSame('Nat', $columns[14]->abbreviation()); + $this->assertSame('Infirm', $columns[15]->abbreviation()); + $this->assertSame('Lang', $columns[16]->abbreviation()); + + $this->assertSame('Name and surname', $columns[0]->title()); + $this->assertSame('Relation to head of household', $columns[1]->title()); + $this->assertSame('Age (males)', $columns[2]->title()); + $this->assertSame('Age (females)', $columns[3]->title()); + $this->assertSame('Condition', $columns[4]->title()); + $this->assertSame('Years married', $columns[5]->title()); + $this->assertSame('Children born alive', $columns[6]->title()); + $this->assertSame('Children who are still alive', $columns[7]->title()); + $this->assertSame('Children who have died', $columns[8]->title()); + $this->assertSame('Rank, profession or occupation', $columns[9]->title()); + $this->assertSame('Industry', $columns[10]->title()); + $this->assertSame('Employer, worker or own account', $columns[11]->title()); + $this->assertSame('Working at home', $columns[12]->title()); + $this->assertSame('Where born', $columns[13]->title()); + $this->assertSame('Nationality', $columns[14]->title()); + $this->assertSame('Infirmity', $columns[15]->title()); + $this->assertSame('Language spoken', $columns[16]->title()); } } |