Updated as per ScotlandsPeople Scottish 1911 census transcription (#3746)

1 files changed, 53 insertions, 50 deletions

diff --git a/tests/app/Census/CensusOfScotland1911Test.php b/tests/app/Census/CensusOfScotland1911Test.php
index c27be0dcfd..6e5f2e9c20 100644
--- a/tests/app/Census/CensusOfScotland1911Test.php
+++ b/tests/app/Census/CensusOfScotland1911Test.php
@@ -54,59 +54,62 @@ class CensusOfScotland1911Test extends TestCase
         $census  = new CensusOfScotland1911();
         $columns = $census->columns();
 
-        self::assertCount(17, $columns);
-        self::assertInstanceOf(CensusColumnFullName::class, $columns[0]);
-        self::assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[1]);
-        self::assertInstanceOf(CensusColumnAgeMale::class, $columns[2]);
-        self::assertInstanceOf(CensusColumnAgeFemale::class, $columns[3]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[4]);
-        self::assertInstanceOf(CensusColumnConditionEnglish::class, $columns[5]);
-        self::assertInstanceOf(CensusColumnYearsMarried::class, $columns[6]);
-        self::assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[7]);
-        self::assertInstanceOf(CensusColumnChildrenLiving::class, $columns[8]);
-        self::assertInstanceOf(CensusColumnChildrenDied::class, $columns[9]);
-        self::assertInstanceOf(CensusColumnOccupation::class, $columns[10]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[11]);
+        self::assertCount(18, $columns);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[0]);
+        self::assertInstanceOf(CensusColumnFullName::class, $columns[1]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[2]);
+        self::assertInstanceOf(CensusColumnRelationToHeadEnglish::class, $columns[3]);
+        self::assertInstanceOf(CensusColumnAgeMale::class, $columns[4]);
+        self::assertInstanceOf(CensusColumnAgeFemale::class, $columns[5]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[6]);
+        self::assertInstanceOf(CensusColumnConditionEnglish::class, $columns[7]);
+        self::assertInstanceOf(CensusColumnYearsMarried::class, $columns[8]);
+        self::assertInstanceOf(CensusColumnChildrenBornAlive::class, $columns[9]);
+        self::assertInstanceOf(CensusColumnChildrenLiving::class, $columns[10]);
+        self::assertInstanceOf(CensusColumnOccupation::class, $columns[11]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[12]);
         self::assertInstanceOf(CensusColumnNull::class, $columns[13]);
-        self::assertInstanceOf(CensusColumnBirthPlace::class, $columns[14]);
-        self::assertInstanceOf(CensusColumnNationality::class, $columns[15]);
-        self::assertInstanceOf(CensusColumnNull::class, $columns[16]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[14]);
+        self::assertInstanceOf(CensusColumnBirthPlace::class, $columns[15]);
+        self::assertInstanceOf(CensusColumnNationality::class, $columns[16]);
+        self::assertInstanceOf(CensusColumnNull::class, $columns[17]);
 
-        self::assertSame('Name', $columns[0]->abbreviation());
-        self::assertSame('Relation', $columns[1]->abbreviation());
-        self::assertSame('AgeM', $columns[2]->abbreviation());
-        self::assertSame('AgeF', $columns[3]->abbreviation());
-        self::assertSame('Lang', $columns[4]->abbreviation());
-        self::assertSame('Condition', $columns[5]->abbreviation());
-        self::assertSame('YrM', $columns[6]->abbreviation());
-        self::assertSame('ChA', $columns[7]->abbreviation());
-        self::assertSame('ChL', $columns[8]->abbreviation());
-        self::assertSame('ChD', $columns[9]->abbreviation());
-        self::assertSame('Occupation', $columns[10]->abbreviation());
-        self::assertSame('Ind', $columns[11]->abbreviation());
-        self::assertSame('Emp', $columns[12]->abbreviation());
-        self::assertSame('Home', $columns[13]->abbreviation());
-        self::assertSame('Birthplace', $columns[14]->abbreviation());
-        self::assertSame('Nat', $columns[15]->abbreviation());
-        self::assertSame('Infirm', $columns[16]->abbreviation());
+        self::assertSame('Rooms', $columns[0]->abbreviation());
+        self::assertSame('Name', $columns[1]->abbreviation());
+        self::assertSame('NoPers', $columns[2]->abbreviation());
+        self::assertSame('Relation', $columns[3]->abbreviation());
+        self::assertSame('AgeM', $columns[4]->abbreviation());
+        self::assertSame('AgeF', $columns[5]->abbreviation());
+        self::assertSame('Lang', $columns[6]->abbreviation());
+        self::assertSame('Condition', $columns[7]->abbreviation());
+        self::assertSame('YrM', $columns[8]->abbreviation());
+        self::assertSame('ChA', $columns[9]->abbreviation());
+        self::assertSame('ChL', $columns[10]->abbreviation());
+        self::assertSame('Occupation', $columns[11]->abbreviation());
+        self::assertSame('Ind', $columns[12]->abbreviation());
+        self::assertSame('Emp', $columns[13]->abbreviation());
+        self::assertSame('Home', $columns[14]->abbreviation());
+        self::assertSame('Birthplace', $columns[15]->abbreviation());
+        self::assertSame('Nat', $columns[16]->abbreviation());
+        self::assertSame('Infirm', $columns[17]->abbreviation());
 
-        self::assertSame('Name and surname', $columns[0]->title());
-        self::assertSame('Relation to head of household', $columns[1]->title());
-        self::assertSame('Age (males)', $columns[2]->title());
-        self::assertSame('Age (females)', $columns[3]->title());
-        self::assertSame('Language spoken', $columns[4]->title());
-        self::assertSame('Condition', $columns[5]->title());
-        self::assertSame('Years married', $columns[6]->title());
-        self::assertSame('Children born alive', $columns[7]->title());
-        self::assertSame('Children who are still alive', $columns[8]->title());
-        self::assertSame('Children who have died', $columns[9]->title());
-        self::assertSame('Rank, profession or occupation', $columns[10]->title());
-        self::assertSame('Industry', $columns[11]->title());
-        self::assertSame('Employer, worker or own account', $columns[12]->title());
-        self::assertSame('Working at home', $columns[13]->title());
-        self::assertSame('Where born', $columns[14]->title());
-        self::assertSame('Nationality', $columns[15]->title());
-        self::assertSame('Infirmity', $columns[16]->title());
+        self::assertSame('Rooms with one or more windows', $columns[0]->title());
+        self::assertSame('Name and surname', $columns[1]->title());
+        self::assertSame('Number of persons in the house', $columns[2]->title());
+        self::assertSame('Relation to head of household', $columns[3]->title());
+        self::assertSame('Age (males)', $columns[4]->title());
+        self::assertSame('Age (females)', $columns[5]->title());
+        self::assertSame('Gaelic or G & E', $columns[6]->title());
+        self::assertSame('Condition', $columns[7]->title());
+        self::assertSame('Years married', $columns[8]->title());
+        self::assertSame('Children born alive', $columns[9]->title());
+        self::assertSame('Children who are still alive', $columns[10]->title());
+        self::assertSame('Rank, profession or occupation', $columns[11]->title());
+        self::assertSame('Industry', $columns[12]->title());
+        self::assertSame('Employer, worker or own account', $columns[13]->title());
+        self::assertSame('Working at home', $columns[14]->title());
+        self::assertSame('Where born', $columns[15]->title());
+        self::assertSame('Nationality', $columns[16]->title());
+        self::assertSame('Infirmity', $columns[17]->title());
     }
 }